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