setup: cleanup old left-over code

localrepo: mark commit message template for translation

util: initialize md5 and sha1 without using extra global variables This lets the functions skip the "if _sha1 is None" test on each call.

util: always use subprocess

commands: describe --debug in showconfig help

color: look for mq with extensions.find

write options in "-r/--rev" style in help texts

i18n-da: translated various short messages

i18n-da: removed fuzzy translations

i18n-da: synchronized with hg.pot

Makefile: fixed comment

Makefile: add more meta data to hg.pot

Add committer tag only when needed in git conversion Convert from a git repo added a committer: tag in the log message even if the committer and the author were the same person.

Merge with crew-stable

simplemerge: use ui.warn() for warnings

test-glog: Remove sed hack - '...$HGTMP...' isn't expanded anyway

test-convert-baz: hide GNU tar deprecation warning

rebase: fix bug where --keepbranches could leave wrong branch in dirstate Report and original fix by Augie Fackler <durin42@gmail.com>

config: add parse interface

zeroconf: guess ip for Zeroconf Zeroconf() is actually pretty dumb in guessing IPs and in case of socket.gaierror will not guess right IP.

config: allow spaces in key portion of items

localrepo: use set for requirements

dirstate: use propertycache

localrepo: use propertycache

ui: replace regexp pattern with sequence of choices Use ampersands (&) to delineate the response char in each choice. ui.prompt() responses are now explicitly case insensitive. GUIs that subclass ui can generate dialogs from the full choice names.

run-tests.py: ensure that hgpkg is always visible

Fix missing import from e68e149f4d44 merge

Merge with crew-stable

util.rename: use temporary file name for rename-targets on windows Use a temporary file name as target for a forced rename on Windows. The target file name is not opened at any time; just renamed into and then unlinked. Using a temporary instead of a static name is necessary since otherwise a hg crash can leave the file lying around, blocking future attempts at renaming.

churn: use .hgchurn in repo root as default map file

win32text: add copyright header

patchbomb: add copyright and license header

highlight: add copyright and license header

convert: add copyright and license headers to back-ends

Reproduce crash where synthetic revs break merge detection (issue1578). (The fix for this was committed as 9bbcfa898cd3.) Slightly edited by Patrick Mezard <pmezard@gmail.com>

convert/svn: ignore composite tags Tools like cvs2svn generate tags made of files coming from different revisions from different branches. This is not supported by Mercurial, and it slows down the conversion a lot. Ignore them. See bacula@4082 for a sample.

Merge with crew-stable

convert/svn: keep latest and not oldest tag value

Don't use sed -r; instead use old-style regexp Rev d895158fe8af introduced some sed -r tests, but -r is only available on GNU sed, while BSD sed uses -E. Better to use old-style regular expressions, that way the tests work on all sed variants.

localrepo: Refactor var names in filecommit to improve readability.

merge with crew-stable I pushed the dd1b47e17d7e to crew before realizing that it would also be suitable for crew-stable, hence the double changeset.

Fix typeerror when specifying both --rebase and --pull

Fix typeerror when specifying both --rebase and --pull

coal, paper: omit unneeded #l1 anchor in links

localrepo: corrected outdated comment

localrepo: fixed typos in comments

help: document nonempty template filter.

webcommands: move nonempty logic from JavaScript to Python This avoids hard-coding the '(none)' string in the JavaScript for each style and avoids the {nonexisting|nonempty} hack which only works since the template system don't complain about undefined variables.