cmdutil: templating keywords latesttag and latesttagdistance This can be used for referring to revisions in a reasonable meaningful, stable and monotonically increasing way, suitable for releases or builds directly from a repository. The latest tag is found by searching through untagged ancestors and finding the latest tagged ancestor based on tag date. The distance is found from the length of the longest path to the tagged revision. For example: hg log -l1 --template '{latesttag}+{latesttagdistance}\n' can return 1.3.1+197 This is mostly work by Gilles Moris <gilles.moris@free.fr>

merge with mpm

bdiff: gradually enable the popularity hack Patch from Jason Orendorff The lower the threshold, the stronger the popularity hack's influence. So at 3999 lines, the hack is disabled; and at 4000 lines, the hack is enabled at maximum strength (t=4). No source file in mercurial/crew is over 4000 lines. But there are, oh, a few such files in Mozilla. I can testify that this hack causes hg to generate some correct but eyebrow-raising patches. I think the hack should phase in gradually. The threshold should be high for small files where we don't need it so much. Like this: t = (bn < 31000) ? 1000000 / bn : bn / 1000; That would leave the popularity hack disabled for small files, then gradually phase it in: bn < 1000 -- t > bn (popularity hack is completely disabled) bn == 1000 -- t = 1000 (still effectively disabled) bn == 2000 -- t = 500 (only hits unusual files) bn == 10000 -- t = 100 (only hits especially common lines) bn == 31000 -- t = 31 (hack is at maximum power) bn == 32000 -- t = 32 (hack could backfire, ease off)

Merge with -crew-stable

convert/hg: handle bogus copy records (issue1843)

convert/hg: make parents() return changectx, not nodes

Merge with -crew-stable

util.rename: do not abort if os.unlink fails (issue1840)

convert: make mapfile handle LF and CRLF shamap (issue1846)

convert/darcs: handle directory renaming

convert/darcs: fix file renaming (issue1853)

Fix failing darcs test

Fix for issue1848

Merge with -stable

notify: update test

Fix issue 1782 don't do url2pathname conversion for urls And only replace os-dependent path separators when necessary

color: allow multiple args to ui.write()

extdiff: fix defaulting to "diff" if no --program is given

dirstate: add/improve method docstrings. - add doc to __init__(), _map(), status() - enhance for __getitem__() - fix inaccurate doc for walk() (described wrong return type)

util.system: Use subprocess instead of os.system subprocess allows the environment and working directory to be specified directly, so the hacks for making temporary changes while forking is no longer necessary. This also fixes failures on solaris where the temporary changes can't be undone because there is no unsetenv.

notify: permit suppression of merge changeset notification In some environments merges occur regularly but with no conflicts, and committers find merge notifications more of a bother than a help. By setting merge=False in [notify], merge notifications are suppressed. This works both for incoming and for changegroup hooks.

Add script to rewrite revlog to workaround lack of parent deltas. Defaults to rewriting the manifest in the current repository. Based on a patch to rewrite-log by Benoit Boissinot that I found here: http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908

inotify: use cmdutil.service instead of local daemonizing code

cmdutil: service: add an optional runargs argument to pass the command to run This would be necessary for inotify launching its server: the initial command is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'

extdiff: add 3-way diff for merge changesets This adds 3-way diff for merge changesets (using -c) and for diffing the working directory context against two parents. To enable it, use the new magic value '$parent2' in the argument line. In order to work, your differ must support that the second parent argument is left out; this will happen in 2-way mode. Default arguments are as before, without enabling 3-way mode, ensuring backwards compatibility. This also fixes a problem when diffing a merge changeset with a single file change. Extdiff would sometimes do the wrong thing in that situation.

bash_completion: add completions for shelve extension

doc: clarify license footers Mercurial is licensed under version 2 of the GPL

dirstate: kill dirstate.granularity config option The dirstate.granularity configuration parameter was never documented, it only adds code complexity and it is unneeded. Adding comments describing forced 'unset' entries.

Merge with -stable

subrepo: add auto-pull for merge

streamclone: partially encode filename over the wire, not for local read (issue1847) (Fixes issue1847, which was introduced by 810387f59696: stream clone of a repo with directory named *.d failed: server raises exception "IOError: [Errno 2] No such file or directory: /tmp/test/.hg/store/data/foo.d.hg.hg/foo".)

Merge with i18n-stable

i18n-da: random small strings, only 499 strings left

Merge with main

commands: tweak help for 'heads'. - prefer "changeset" over "revision" for internal consistency - clarify explanation of branch heads - add a line break - tighten some wording

i18n-da: translate addremove, branch, and cat

i18n-da: synchronized with 744cb8e93936

i18n-pt_BR: synchronized with f4f17d5695d2

Merge with stable

i18n: merge with pt_BR

i18n-pt_BR: synchronized with 73bec717b825

ui: guard against UnicodeDecodeErrors in ui.wrap

keyword: uppercase short option for kwfiles --all, like hg status -A Deprecate kwfiles -a.

keyword: make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.

keyword: make kwfiles --all show unknown files too More consistent and similar to hg status.

keyword: kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.

convert: unbreak non-svn engines

zeroconf: read actual description for repos in hgwebdir

zeroconf: code cleanup, fixing variable names to be meaningful

Merge with crew

notify: make it possible to pass extra info into templates

test-gendoc: add tests for all languages This ensures that we catch errors in the reST syntax early and for all languages. The only change needed in gendoc.py was to correct the computation of section underlines for Asian languages.

gendoc: do not wrap encoded string - it breaks multi-byte characters - it is not needed since Docutils will take care of wrapping the strings as necessary

test-encoding: make test output easier to follow

Merge with crew-stable

test-extension: update test output to match a4f6e4427b65

util: do not corrupt multi-byte characters in wrap

push: fix subtle bug in prepush logic A test case demonstrating the bug has been added. Contributed by Henrik Stuart and Sune Foldager.

color: mark --no-color as deprecated (--color=never has the same effect) This should've been marked deprecated when --color was first introduced, but it was something I overlooked.

mention overlay bundle file in global --repository option see http://mercurial.selenic.com/wiki/LookingIntoBundles Drop mentioning symbolic path names for the sake of brevity. This is a common feature of path options anyway.