evolvecmd: move more functions from __init__.py to evolvecmd.py If things are looking ugly, hold on.

evolvecmd: introduce a new module to handle `hg evolve` related code __init__.py is to cluttered with wrapping and all, it's better to move code related to evolve command to new a module which will help us in great refactoring and introducing nice and better flow of data through functions. There is a temporary import cycle is introduced which will be fixed in the series.

evolve: remove not required calls to phases.retractboundary() To make sure phases are preserved during evolve, we started using the phases.new-commit config option. Now we don't need to call phases.retractboundary(). Let's remove the redundant code.

evolve: store the replacements occurred during `hg evolve` at top level This patch starts storing the replacements made during the `hg evolve` command. The current dictionary is not used anywhere but will be used in future as we want to introduce abort functionality, so we want to delay writing of obsmarkers, storing these exchanges in statefile etc.

evolve: make the _solve* functions return a tuple This patch makes _solve* functions return a tuple which will contain information about whether we were able to solve the instability and if yes, then what was the newnode. For more details about tuple, look the fn docs added. There was some refactoring required in next command because of change in return values. This also leds to omitting the wdir update message in case of dry-run which is good.

evolvestate: rename the file to state.py and class name to cmdstate The evolvestate.py and the evolvestate class in it were introduced to help `hg evolve` grow continue and abort options. But the class and it's API can be easily used to store state information for other state files like we stored the information for grab state in the previous commit. Let's rename the the file and class.

branching: merge with stable

update: show "use 'hg evolve' to..." hint iff evolve command enabled Before this patch, one had to enable *all* commands (by including "allnewcommands" in the experimental.evolution config) for the hint to be shown.

obslog: drop period from summary line in accordance with convention

grab: add a command to grab a commit and update to it This patch adds anew command `hg grab` which will pick a commit and put it on the top of the working directory parent and updates to it. Earlier grab was an alias for `hg rebase -r <rev> -d .` which is now deleted to make sure `hg grab` resolves to the grab command and that alias. Continuing interrupted grab functionality is also there using the evolvestate class. Tests are also added for the new introduced command.

amend: query the wdir parent after taking lock (issue5266) If we query wdir parent without taking a lock, that can lead to bugs because the wdir parent can change is another process has changed the wdir parent. One such example of this was issue 5266. When a user is running amend and that amend is waiting for commit message, the user runs another amend which waits for lock. The second amend is waiting for lock, but has already read the description from the parent of working directory to use. Once the first amend completes the wdir parent changes but we still have the description from an old wdir parent. This patch fixes the bug by querying the description after taking lock. Attempts were made to add test for this but the results were unstable because they depend on time in which lock is released.

fold: make sure we move bookmarks after folding (issue5772) The rewriteutil.rewrite() API currently only handles moving bookmark from a old node to new node. In case on fold, we have multiple old nodes, from where a bookmark move is possible. The rewriteutil.rewrite() API is used by another commands also and it's not good to plug in some logic there. This patch handles bookmark movement from all the old nodes to the new node.

tests: add a test showing bookmark not moving in-case of `hg fold` This patch adds a test showing that bookmark is not moved when doing `hg fold`. This test represents issue 5772.

branching: merge stable back into default

test: update test output ot reply caps size change CORE-TEST-OUTPUT-UPDATE: 2e703ed1c713

branching: merge default test output into stable Mercurial 4.5 has been merged, we update the expected test output.

branching: open Mercurial 4.4 compatibility branch

branching: merge release 7.2.1 into default

packaging: mark source as development version This help avoiding consusion

Added tag 7.2.1 for changeset 6c772398eb4e

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

packaging: prepare version 7.2.1

branching: merge with tutorial output update

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

tutorial: docgraph output seems to have been dedented Update the outputs following latest version of docgrpah and its dependencies.

test: update output for more verbose blackbox CORE-TEST-OUTPUT-UPDATE: 853bf7d90804

test: update with new 'update' hint about obsfate CORE-TEST-OUTPUT-UPDATE: 35a0f6f31eef

evolve: update output for wider reporting of troubled changesets CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a

test: update output for new `merge --abort` message Core have updated its command to cancel a failed merge, update the test output to match it. CORE-TEST-OUTPUT-UPDATE: 41ef02ba329b

branching: merge with stable

changelog: mention 4.5 compatibility

trouble-reports: yield to in code reporting of new troubles Mercurial 4.5 has the feature in core, let core do the reporting in this case.

caches: fix automatic warming trigger The caches were supposed to get warmed when we receive a push. However the transaction created when we -issue- a push use a similar name and was confusing the detection. We now properly detect the case.

changelog: mention the packaging bugfix

packaging: properly install the evolve.thirdparty module It is properly added to the Manifest.in but that is not enough. We need to find another tool capable of catching things.

branching: merge release tags into default

packaging: mark source as development version This help avoiding consusion

Added tag 7.2.0 for changeset bf6b859807ba

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

branching: merge stable back into default The test change has to be reverted.

branching: merge further compat change into stable

branching: merge further compat change into stable

branching: merge more compatibility fix into stable

packaging: merge 7.2.0 into stable

tests: update test output to match 4.4 The stable branch is sitll 4.4.

branching: backed out test output changes from core-1905aac253f0 This backs out evolve-ae6fddf39933

branching: backed out test output changes from core-02fdb8c018aa This backs out evolve-1905aac253f0.

compat: fix argument check for marker reading The previous check was broken for 4.2

cachevfs: use a compatibility later for all access

diff: drop default argument value This argument use the default value for an argument not available in earlier version. So we just stop passing the argument.

test: use hash in test-evolve-topic.t This helps testing compat with older version.

packaging: prepare version 7.2.0

changelog: prepare for coming release

stablerange: add missing licence and copyright header

obshistory: pass the csets description in getmarkerdescriptionpatch Previous patches removed any use of ctx in the function and we now just need the cset description in the function. Let's pass that only. This will save couple of calls of repo[node].

obshistory: remove the unused function The function is not used anymore.

obslog: add header to the changeset description diff This patch adds `diff -r <hash> -r <hash> <filename>` header to the output of the changeset description diff which is shown using the --patch flag of obslog command. This fixes the label/color issue for description diff also.

obslog: colorize the description diff shown in obslog -p This patch colorizes the description diff shown in `hg obslog -p`. The labels for the header are different from that of the patch as the main header which says `diff -r <somehash> -r <somehash> <filename>`. Next patch will hack to add that.