highlight: bail out if file is binary

highlight: support annotate, and reduce layering violations.

Introduce templateopts and logopts to reduce duplicate option definitions.

Add option -l/--limit to hg incoming and hg outgoing.

Move finding/checking the log limit to cmdutil

Make hg debugancestor accept -R by making it an optionalrepo command.

debugancestor: use *args instead of *opts, to not confuse with option dicts.

mq: Cleanup: update outdated file header.

convert: Clean up authormap key=value splitting. Introduces a subtle parsing difference: dstauthor can now contain '=' characters.

convert: Avoid redundant newline on authormap errors. The extra rstrip is necessary in case the file has uses different line terminators (i.e. CRLF).

convert: Ignore empty lines in authormap file.

Add config option to disable putting .hg_archival.txt inside archives.

add a blame alias for annotate The original cvs command was called blame. SVN has both, and other VC systems typically also have this as an alias. Makes things easier for converts.

warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.

commands: lock() the repo while unbundling (issue1004)

patch: fix iterhunks() with trailing binary file removal Like some renames or copy operations, binary file removal does not generate any "file" or "hunk" action, but was not tagged as such and let iterhunk() assume no hunk was applied for the deleted file.

debugancestor: make the index argument optional, defaulting to 00changelog.i

Renamed "manifest" to "files" in web templates. manifest.tmpl is still used, so people having their own templates don't have to change them. "cmd=manifest" still works, new style URLs are not affected, because they already used "/file/".

Removed old-style hgweb templates

add explicit extension disabling syntax to hgrc.5

Permit XML entities to be escaped in template output. Useful for creating XML documents directly from Hg logging. Can also be used for HTML. For use in content, will escape '&', '<', and for completeness '>' (although it is not strictly necessary). For use in attributes, will also escape ' and ". Will also replace nonprinting (ASCII) control characters with spaces, since these are illegal in XML.

convert: add shallow, single branch svn conversions via svn.startrev

convert: allow svn trunk/branches/tags detection to be skipped - eluding convert.svn.branches defaults to "branches" - convert.svn.branches= disables branches detection - convert.svn.branches=/ is equivalent to former convert.svn.branches=

Add --all option to bundle command

Fix test-convert.out after 55455556f921

convert: improve subversion source documentation

hgweb: fix parameter mixup (issue1001)

tests: easier hg serve error diagnosis

util: make walkrepos() return .hg/patches if present

Allow "file://localhost/" in addition to "file:///" (issue728) file://localhost/ URLs are generated by Mac OS X API calls like [NSURL fileURLWithPath:]. Imported patch from Paul Bx.

mq: make qclone ask remote source repo for qbase using lookup protocol

Document log date ranges and mention 'hg help dates' for all commands (issue998)

Add test case for backout on named branches (issue665)

Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout

tests: hide the name of the branch cache file

test-mq-pull-from-bundle: don't print the contents of $HGRCPATH

repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.

keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list.

test-glog: pass the list of files to commit test-glog uses debugsetparents instead of update+merge to create some funky DAGs, and so the dirstate contents won't be consistent with the checked out revision. Passing an explicit list of files to commit reduces a bit the dependency on the dirstate. Using a non-deprecated rawcommit might be better here.

hgweb: no i18n in protocol responses

improve changegroup.readbundle(), use it in hgweb

Also search for .hgrc if mercurial.ini not found on windows

hgweb: use bundletypes from mercurial.changegroup

Merge with crew

Infer a --repository argument from command arguments when reasonable. In particular: if invoked without -R from a CWD not inside a repo, having been passed one or more file paths as command arguments, where the nearest enclosing repo of all of those paths is the same, quietly infer a -R option for that repo. Otherwise abort with an error message as before.

hgweb: separate protocol calls from interface calls (issue996) The protocol functions are already pretty careful about not raising exceptions to the caller, and have their own error handling. We can formalize this a little bit to make it clearer (before, the exception handlers for a limited number of exceptions coming from the interface bits would blow up because some variables aren't instantiated for the protocol calls).

update output of test-convert

repair.py: rewrite a loop, making it cleaner and faster

Speed up hg grep by avoiding useless manifest parsing In the kernel repo (tip = 2b89f7111b96), a "hg grep mpm MAINTAINERS" goes from ~165s to 0.7s. This could get even a bit faster if we broke out of the loop after the first match, but I'm not sure how that would interact with the --follow code. This is obviously an extreme example, but other cases should also benefit from this patch.

cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0' This avoids a possibly expensive tag lookup.

revlog.revision: avoid opening the datafile without need. If there's no inline data, revlog.revision opens the data file every time it's called. This is useful if we're going to call chunk many times, but, if we're going to call it only once, it's better to let chunk open the file - if we're lucky, all the data we're going to need is already cached and we won't need to even look at the file.

convert: document splicemap, allow setting of multiple parents

merge backout

Backed out changeset b913d3aacddc (see issue971/msg5317)

Simplify utils.walkrepos().

Fix bad behaviour when specifying an invalid date (issue700) commit (aborts _after_ typing in a commit message) backout (aborted after the initial revert) tag (edited .hgtags and couldn't commit) import (patch applied, then commit fails) qnew (aborts on bad dates, but writes any valid date into the # Date header) qrefresh (like qnew) sign (like tag) fetch (merge, merge, merge, merge, abort)

Report filenames with disallowed characters as suggested by Mika Eloranta (see issue671)

hgweb: Quote filenames when downloading raw files.

hgweb: Pass only filename instead of full path when downloading raw files. Before this patch "filename=foo/bar" was sent and e.g. Firefox offered to save the file as "foo-bar" instead of just "bar".

merge with crew