tests: use $TESTTMP more and use (glob) less This locks down the test output a little more.

hgweb_mod: respond right away if the client specified 100-continue support Clients that send 100-continue should make sure they really support continue intelligently. In a later patch we'll introduce a capability so new clients don't pay a performance penalty talking to old servers.

hgweb: add support for 100-continue as recommended by PEP 333.

subrepo: show the source that git pulls

commands.update() now works properly with a revision of 0 Without this change commands.update() treats an integer 0 as if no revision was passed and updates to the branch head. This fix allows an integer 0 to be detected as a revision number so the working directory is correctly changed to revision 0 rather than the branch head.

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

zsh completion: complete bookmarks where they are accepted This used to work because bookmarks were pseudo-tags, but broke once bookmarks became their own first-class object.

tests: test-mq-subrepo.t Solaris 10 sh compliance Solaris 10 sh do apparently not like temporary environment variable assignment before a function call. There is no problem with commands.

bash_completion: complete bookmarks Since bookmarks moved into core and are no longer merged with the list of tags (d012d95499f7), they don't get completed in bash_completion along with other revision specifiers. This adds a new function to provide the list of bookmarks for completion, and another, _hg_labels(), to list all tags, branches, and bookmarks. It further modifies completion for all commands where '_hg_tags; _hg_branches' was used to use '_hg_labels' instead.

mq: fix qpush recursion in _findtags when status file is wrong (issue2664) test from timeless to guard against regressing this

mq: gracefully handle malformated status file This patch prevent mq to crash when .hg/patches/status contains Malformed lines (without ":"). Blank lines are ignored and other malformed lines issue a warning.

revset: fix typo when assigning weight to reverse and limit

eol: do not abort on parse error Handle parse errors in the .hgeol similarly to how parse errors in the .hgtags file are handled: by issuing a warning. This allows the user to revert the file using 'hg revert' or 'hg update -C'.

eol: fix test typos introduced in 5007ff32f356

eol: test win32text compatible encode/decode filters

eol: be explicit about how to enable hook (issue2661)

eol: stop after first matched rule in hook (issue2660) When matching a file against the rules in .hgeol, the eol extension's hook should stop after the first matching rule is encountered. Otherwise, if this rule is contradicted by other more general rule (for example a catch-all at the end of .hgeol), some files are simply impossible to push. Trivial example: **.bat = CRLF ** = LF If all matching rules were applied, a .bat file would be rejected either because it has LFs (first rule) or because it has CRLFs (second rule).

merge with i18n

i18n-pt_BR: synchronized with 3178aca36b0f

help: document branch template keyword The branch keyword was added in d79fdff55627

merge with i18n

i18n-sv: started translation of mq and patchbomb

i18n-sv: synchronized with 95b0d4c1c9e1

convert.svn: branch name which equals trunk means `default' branch (issue2653) Converting from subversion specifying config.svn.trunk results in storing trunk under branch named as config.svn.trunk, where `default' brunch is expected. Submission contains patch and test.

ui: always report untrusted hgrc files when debug enabled It was suggested in IRC that people disabling the reporting of unstructed hgrc files can masquerade as problems. This makes sure untrusted hgrc files are always reported if --debug is used.

tests: test renaming a file added on two branches (issue2089) The issue was fixed by d100702326d5 .

merge with i18n

i18n-ja: synchronized with 16725043a6fc

i18n-de: translate some bookmark strings

i18n-de: synchronized with 703717eb112c

i18n-da: translate some small strings

i18n-pt_BR: synchronized with 9f2c407caf34

i18n-da: synchronize with 14a699ed774b

i18n: merge with main

i18n-ja: synchronized with 7458b7e0d8d5

i18n-ja: synchronized with ba50f1600131

context: be even more careful about result order in ancestors() (issue2642) The earlier patch could be confused by more complicated topologies.

convert/svn: abort operation when python bindings are not available Subversion python bindings check was not present in svn_sink source class which made it fail while using svn as destination repository. Added a more maintainble svn bindings check for svn_source and svn_sink classes.

convert/svn: handle MissingTool exception from converter_sink class The converter_sink class had no way of handling MissingTool exception. This change makes it to abort when there is a MissingTool exception.

bookmarks: restrict moving a bookmark to its descendants (issue1502) A bookmark can only move to a descendant on commit, pull or unbundle. Bookmarks cannot jump between heads anymore. This fixese issue 1502. We explicitly use new.node(), to emphasise that we are updating the current bookmark to the new node.

id: add bookmarks to id Since bookmarks are no longer merged with repo.tags() as of d012d95499f7, they don't show up in `hg id` as they used to. This adds them back into the summary that `hg id` prints, and adds a -B/--bookmarks flag alongside the -t/--tags and -b/--branch options. Note this introduces a slight backwards-incompatibility: the summary printed by `hg id` now separates bookmarks from tags with a space, as seen below, instead of running it into the tags list. Default summary output: $ hg id db815d6d32e6 tip/tag1 bm1/bm2 Output with --bookmarks: $ hg id --bookmarks bm1 bm2 See also afc84a879ac8 which adds bookmarks back into `hg summary`.