merge: adds documentation to the mergestate class Document most the new function involved in the new serialisation process (and a few others).

merge: add blank line between mergestate's method This class is now too big to be a single big block of continuous text.

cmdserver: allow to start server without repository Typical use case is to clone repository through command server. Clone may require user interaction, so command-server protocol is beneficial over raw stdio channels.

cmdserver: prepare test for starting server without repository

histedit: move logic for finding child nodes to new function This function will be used in later patches.

histedit: clean up lock imports We are alread importing the release function from lock, no need to actually import the module too.

localrepo: changed revs to use spanset instead of baseset Performance benchmarking: $ time hg log -qf -l1 ... real 0m1.420s user 0m1.249s sys 0m0.167s $ time ~/local/hg/hg log -qf -l1 ... real 0m0.719s user 0m0.614s sys 0m0.103s

extensions: use normpath to allow trailing '\' on Windows (issue4187) Fixes same issue as 5c794e7331e7 but now works on Windows too. With this patch a trailing backward slash won't prevent the extension from being found on Windows, and we continue to support any combination of forward and back slashes within the path.

tests: fix unused imports from inotify removal caught by pyflakes

revset: added ordered generatorset classes with __contains__ method They stop iterating as soon as they go past the value they are looking for, so, for values not in the generator they return faster.

merge: use the right ancestor when both sides copied the same file The tests shows no real changes because of this ... but there must be some weird corner cases where using the right ancestor for the merge planning is better than using the wrong one.

copies: when both sides made the same copy, report it as a copy Not used yet ... but shows up in debug output.

merge: handle create+delete prompts in calculateupdates I would like to move it all the way to the interactive resolve state like merges are ... but this is a first intermediate step.

merge: handle acceptremove of create+delete early in manifest merge

largefiles: override calculateupdates instead of manifestmerge That will give calculateupdates a purpose in life ... and be convenient later.

tests: add systematic test of merge ancestor calculation There is probably some overlap with the existing tests - it is hard to figure out what these tests are doing.

tests: add test case for criss cross merge The test do not fit in any existing test file...

merge with stable

revset: changed generatorset code to remove unnecesary function call Removed _nextitem() method, now __iter__ has that logic and __contains__ uses __iter__ to check for membership.

phase: say "Returns 0" instead of "Return 0" like other command help

dirstate: remove double imports of errno

cmdserver: mask return code of runcommand in the same way as dispatch.run "hg help" does not state that the code for abort is 255, but it's confusing to have different code between hg command and command server. Tests of python-hglib 1.2 passed with this change.

cmdserver: include non-zero return code of runcommand in test output

cmdserver: recreate mq object on runcommand in case queue path was changed repo.mq needs to be recreated after queue path change. Since there is little benefit to keep invalidated mq object, it always delete repo.mq.

cmdserver: reload mq on each runcommand request to avoid corruption If mq was changed by another process, command server should invalidate caches. Otherwise, mq status would go wrong.

localrepo: add hook point to invalidate everything on each command-server run MQ extension will wrap this function to invalidate its state. repo.invalidate cannot be wrapped for this purpose because qpush obtains repo.lock in the middle of the operation, triggering repo.invalidate. Also, it seems wrong to obtain lock earlier because mq data is non-store parts.

paper: overlapping of section title on help pages (issue4051) Now there will be no overlap lines between various section title on help pages. http://selenic.com/repo/hg/help/config

contrib: drop tmplrewrite Needed for the 1.3 transition in 2009, no longer relevant

extensions: mark win32text deprecated Happened a long time ago.

extensions: remove interhg Has been built-in for a few releases.