merge with stable

mergetools: add alternate registry keys for 32bit apps on 64bit O/S Not all applications needed the workarounds, so I did not add alternate keys for every Windows merge application.

filemerge: introduce a 'regkeyalt' merge tool variable This allows us to provide alternate search keys for 64bit operating systems that may have 32bit merge tools installed. Presumably it may find other uses.

merge with stable

wix: drop bin/ folder from MSI installers (issue 2673) Also fixes issue 2658.

zsh completion: remove computed default values from help texts The default encoding and encoding mode are computed at runtime and can vary from system to system. The two remaining default values in the completion help texts (number of directories to strip on import and default bundle name) are fixed in the source code.

merge: remove last traces of fastforward merging bbc97d419b16 introduced fast-forward branch merging. 66ed92ed115a partly removed it again. The fastforward variable would always be false if branchmerge was false, so the fastforward variable makes no difference and we can remove it completely.

merge with stable

subrepo: backout 67fbe566eff1, --force requires svn >= 1.5

merge with stable

merge with i18n

i18n-de: improve translation for "unmerged branches" This translation issue was pointed out by Georg Brandl.

httprepo: order URL query string fields for readability - cmd is always first, since the other fields are arguments to that command. - The other fields are in alphabetical order, rather than random order. example "hg serve" output BEFORE 127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 - AFTER 127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -

ancestor: improve description

subrepo: don't crash when git repo is missing

ancestor: rewrite to deal with crossed linkrevs (issue2682) This version is about 10% slower, possibly because it visits some revisions in a different topological order than what's in the revlog.

hgcia: accept "queued." xmlrpc return as success

merge: back out single-parent fast-forward merge This backs out changeset: 13158:9e7e24052745 user: Mads Kiilerich <mads@kiilerich.com> date: Tue Dec 07 03:29:21 2010 +0100 summary: merge: fast-forward merge with descendant Before named branches, the invariants were: a) "merges" always have two parents b) p1 is not linearly related to p2 Adding named branches made (b) problematic, so the above patch was introduced, which fixed (b) but broke (a). After discussion, we decided that the invariants should be: a) "merges" always have two parents b) p1 is not linearly related to p2 OR p1 and p2 are on different branches

merge: drop resolve state for mergers with identical contents (issue2680)

merge with stable

hgweb: fix filelog rss links generation

hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)

merge with stable

cacert: improve error report when web.cacert file does not exist

tests: improve hghave error reporting for missing Py OpenSSL

Merge with stable

Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>

tests: convert test-serve to new format

run-tests: handle mixed comment lines in blacklists

test-doctest: handle unix/windows path discrepancies

test-rename-merge1: make it easier to review, windows friendly - Reuse the coding style of the previous tests, both are very similar - Do not play with case changes, it does not work on Windows

merge: drop resolve state for mergers with identical contents (issue2680)

merge with stable

match: ignore "" patterns The following command would visit every changeset in repo/ rather than the last 10: hg log -l 10 repo/

statichttprepo: abort if opener mode is 'r+' or 'rb+' The old version of the check failed to catch modifying modes 'r+' and 'rb+'.

Merge with stable

subrepo: handle svn tracked/unknown directory collisions This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant but it is much simpler than rewriting our own purge command for subversion.

convert/svn: stop using svn bindings when pushing to svn

convert/svn: read trunk name once, use None for default

mq: mention qfinish in qimport help

merge with stable

bookmark: fix invalidation of localrepo._bookmarkcurrent

subrepo: show the source that git clones

check-code: catch "echo > $HGRCPATH" too Make error message consistent with the other error messages.

merge with stable

check-code: better check for overwriting $HGRCPATH Suggested by Mads Kiilerich on IRC.

test-eol-*: remove unused config settings

mq: forbid commit of merge involving mq patches

tests: don't overwrite HGRCPATH Overwriting instead of appending to the file removes the [defaults] section put into the file by run-tests.py. It also defeats the --inotify option to run-tests.py. (Nothing was broken yet, but the lack of -d "0 0" cause changeset hashes to change unexpectedly in a test case I was editing.)

merge with stable

Added signature for changeset 2616325766e3

Added tag 1.8 for changeset 2616325766e3

contrib: update tcsh_completion for Mercurial 1.8 Added the following commands: bookmarks debugignore. Fix the tcsh parse script for the current help text layout.

merge with i18n

i18n-ja: synchronized with 0a6bca3d5273

i18n-pt_BR: synchronized with 9b617c56eb65