tests: make test-evolve-phase-divergence more descriptive This patch adds description to what each part is doing in test-evolve-phase-divergence.t and some commands which should be used to analyze the divergence before resolving that.

compat: use updateresult API if available The status return is no longer a tuple, we access attribute instead.

compat: provide an explicit default value to the 'odiff' config There is a devel warning about this now.

compat: keep passing arguments as keyword argument Otherwise, This break with new changes in upstream Mercurial.

compat: search for stringmatcher in the new location More of util has been split into sub modules.

rebase: update the rebase wrapping to works with hg 4.6 Mercurial core commit bd0086bd3af4 removed _makeextrafn hence breaking our wrapping. Update the code to wrap rebaseruntime directly in a way that's compatible with hg 4.1+.

compat: call current obsolete.createmarkers(), not one from load time Other extensions may wrap obsolete.createmarkers(). If they do, we should call their wrapped version. However, since f61a23a84dac (compat: add wrapper for obsolete.createmarkers() that accepts "operation" arg, 2018-03-16), we started storing the version of the function as it was when our compat module was loaded. This broke an extension we use internally at Google.

tests: rename test-evolve-bumped to test-evolve-phase-divergence.t While I was here, I added a heading to test mentioning what the test if for.

evolve: replace bumped in function name to phasedivergence bumped was the old name of phasedivergence. Lets replace with its new name so that we can forget the old one.

evolve: drop duplicate import of rewriteutil._bookmarksupdater

obslog: more 4.1 code compatibility drop

template: drop some 4.1 compatibility code Simplify all the things.

checkheads: drop upstreamed code Mercurial 4.2 has all the code that used to live in the evolve extensions so we can drop it now.

obslog: cleanup patch handling after 4.1 compat drop We can remove some of your compatibility code.

packaging: further mark 4.1 support as dropped

branching: merge with stable

tests: extend the globing to the user name Silly me.

branching: close mercurial-4.1 test branch

evolve: kill `--obsolete` and `--old-obsolete` flags for graft Evolve extension used to add the couple of flags to `hg graft` command for reasons I don't know but they were deprecated. For the functionality of `hg graft --old-obsolete`, we have `hg grab` now which can do that. One more reason to kill this is that we have logic to parse the graftstate, whereas in core, we are going to change how state files are read and write. Tweaked the tests a bit to use `hg grab` instead of these flags to make rest of the test output consistent. Replaced an entry of `hg graft -O` in doc by `hg grab`.

compat: drop support for Mercurial 4.1 This version is over 1 year old and we are dropping support for it.

packaging: mark versiond as devel versions This will help prevent confusion when installing a non-tagged version.

packaging: merge stable back into default Version have been released.

packaging: mark version as devel version This will help prevent confusion when installing non-tagged version.

Added tag 7.3.0 for changeset e4ac2e2c2086

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

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

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

test-compat: merge stable into mercurial-4.4

branching: merge future 7.3.0 into stable Release belong to stable

tests: update test output for the stable branch

debian: add version 7.3.0 to changelog

packaging: update version numbers

changelog: prepare release 7.3.0

tests: updated tested with version

__init__: show some internationalization love

evolvecmd: show some internationalization love Some outputs are not internationalized because I doubt that they are gonna stay here for long.

utility: make sure prompt text is internationalized This patch internationlize the prompt text by passing the into mercurial.i18n._

test: do not use revision number This get confused with older version.

compat: use mergetoolopts from commands.py Mercurial <= 4.2 do not have cmdutils.py yet.

branching: merge stable into default Some bugfix that we could use here (also getting ready for a release).

evolve: add a `--stop` flag for `hg evolve` command This patch adds a `--stop` flag for `hg evolve` command. The stop flag lets you stop the evolution from where you are and let you move to other things if you want. This fuctionality is great as user can decide to resolve conflicts later on, stop the command execution, do something else and get back once they has time or care about resolving them. As implementation details, it clears the evolvestate, updates to the parent of working directory clearing the uncommitted changes which also deletes the mergestate. A new test file test-evolve-stop.t is added with tests of the new flag added.

obsexchange: make compatible with some unreleased 4.5 versions We don't generally care to be compatible with unreleased versions of hg, but this is just a one-line change to be compatible with a range of commits before 158d4ecc03c8 (wireprotoserver: move all wire protocol handling logic out of hgweb, 2018-03-08), so hopefull it can be worth it.

compat: make override of createmarkers work on wrapped function If createmarkers() has been wrapped using functools.partial(), the __code__ attribute won't exist. Fix by unwrapping partial functions. I tried to find another attribute to use as proxy for the "__code__.co_argcount < 6", but there were no new functions or similar added in that commit.

previous/next: add -m short form for --merge This matches core's option to `hg update`. This patch also covers `hg next`, but test-check-commit.t only lets me mention one of them.

evolve: handle stabilization of merge changeset with both parents obsoleted This patch adds logic to stabilize an orphan merge changeset having both parents obsoleted. The logic tries to first stabilize the merge changeset on successor of second parent and then stabilize the new changeset formed on the successor of first parent. We are stabilizing on second parent first and then to second parent to preserve the first parent's successor as first parent of the merge changeset. Conflicts can occcur and we can loose processing information, therefore we store a variable in statefile `orphanmerge` which represents whether we are processing a merge changeset with both parents obsoleted. Thanks to Pierre-Yves David for suggesting this way and helping to understand the correctness of this. More rigourous test cases for this will be added in next patch.

state: add __setitem__() for cmdstate class Adding __setitem__() will help us in setting the value of variables stored in state files using `state[key] = value` in our code which is very convenient.

evolve: preserve the order of merge parents in `hg evolve --continue` This patch makes sure we preserves the order of merge parents in case of `hg evolve --continue`.

topics: include "operation" metadata in obsmarkers

grab: include "operation" metadata in obsmarkers

touch: include "operation" metadata in obsmarkers

split: include "operation" metadata in obsmarkers

prune: include "operation" metadata in obsmarkers

metaedit: include "operation" metadata in obsmarkers

fold: include "operation" metadata in obsmarkers

uncommit: include "operation" metadata in obsmarkers

evolve: include "operation" metadata in obsmarkers

amend: include "operation" metadata in obsmarkers This is for the legacy handling support for "hg commit --amend" case. I picked "amend" because it feels more natural than "commit". Besides, and more importantly, that's consistent what core uses.

compat: add wrapper for obsolete.createmarkers() that accepts "operation" arg I want to start passing the operation argument, but hg < 4.3 does not support it, so we need a compat wrapper. For older hg, the operation is simply ignored.

tests: do not glob out fixed dates Perhaps these dates historically have not been fixed, but they seem to be now. I got tired of not being able to use "run-tests.py -i".

evolve: de-duplicate some function calls _cleanup() was called in continueevolve() and evolve() function too. Let's call it at a single place for both the cases. Also call progresscb() outside of conditionals to call it both times.

evolve: move deletion of evolvestate out of continueevolve() function We need to extract some data at evolve() function from evolvestate.

evolve: load evolvestate before passing to continueevolve() This patch moves some code from continueevolve() to evolve() function so that we have a loaded evolvestate present in the evolve() function for post processing.

evolve: move the handling for non-continue part in else conditional This will help us do factor out which operations we want to do for continue, which for non-continue and which operations we want to do for both of them.

evolve: move the logic of continuation handling of `hg evolve` in own fn The function which defines the evolve command is pretty big with all the logic messed up there. It's better to have individual functions for individual uses. The movement of code will help in adding more logic to continue part in clean way. Moreover for implementing `hg continue`, we need all continuation handling in their own functions, so it will help there too.

CHANGELOG: add an entry about next and prev being interactive

prev: show changeset hash in --dry-run instead of rev numbers rev numbers can change, so it's better to show changeset hash.

prev: prompt user to choose parent in case of multiple parents This patch adds functionality to `hg prev` to prompt user to choose one parent to update when multiple parents exist. Surprisingly there were no tests for this case before this patch, I added one with this patch.

next: cleanup logic around return by returning early In the cmdnext function, there are some conditionals which returns early and some which sets a result value to be returned later. Let's return from all the conditionals early. There are if, elif and else involved, so it's sure we will end up in one of the conditional, each conditional will return, so it's guranteed that we are returning the correct value and returning everytime.

next: prompt user to choose child in ambiguity in `hg next --evolve` This patch makes `hg next --evolve` prompt user to choose a child to evolve and update when multiple of them exists. This is improvement over previous behavior where we used to error out saying ambiguous next unstable changeset and told user to manually use `hg evolve -r rev`. While writing this patch, I am personally very happy to have this feature as I have encountered this stage many times and I wanted `next --evolve` to take care of that. It uses the revselectionprompt thing added in earlier patches.

next: move logic to evolve the children to it's own function This patch moves the logic which evolves the children and updates to it in `hg next --evolve` to it's own function as we want to use that again.

next: prompt user to choose a children in case of ambiguity This patch adds functionality to prompt user and ask the children to which next should move to incase of multiple childrens. This is a very nice UI because otherwise user has to lookup changeset hash, and then manually do `hg update` to that. In this case we show hash and description so user can choose which one to update easily. It is using the interactive revision choosing functionality added in a previous patch.

next: show changeset hash in `--dry-run` instead of rev numbers Rev numbers can change, hence we should show rev hash instead of rev numbers in dry-run.

evolve: make sure we consider all cases in if-else The part of code which is touched decides on evolution of merge changeset. We need proper handling of each case there, so before adding logic, let's add conditional for each case so that upcoming patches are easy to understand.

tests: add more cases about stabilization of an orphaned merge commit This patch adds three more cases related to stabilization of orphaned merge commits.

evolve: fix missing negation Spotted by Pulkit Goyal.

evolve: clarify message for ambiguous destination from split Message is a bit long, but should be less scary.

evolve: prompt user to select destination for stabilization in case of split This patch adds functionality to prompt user to select a revision when there exists multiple stabilization destination because of split on multiple branches. Test are also added for the feature. I am not sure whether this is the best message which we can show, if people have suggestions I will like to improve the messages shown in prompt.

tests: remove some tests which are moved to dedicated files The tests in test-unstable.t files are now moved to their dedicated file with all the cases to that in that file. Let's delete them from here.

next: factor out the logic to update to changeset in another function This patch moves the logic to update to children changeset during `hg next` in a separate function because we want to re-use the logic when we will prompt user to choose a changeset in case of multiple childrens.

utility: add a function to prompt user to choose a revision This patch adds a utility function to interactively prompt user to choose a revision to proceed in cases when there are multiple revisions which are candidates. The function will be used in `hg evolve`, `hg next`, `hg prev` etc. If user feedback will be good, I plan to move it to core and use it at more possible places.

tests: add a test about evolve stabilizing orphan caused by splits There are some similar tests lying around in the test suite but they are not well arranged. I wanted the test suite to be a goto reference for all the behaviors till the time we get all of them documented.

test: fix output after rev-branch-cache has been merged Mercurial core 2090044a288d added a new revbranchcache part which changed some exchange-related outputs. Glob them to ease merging with old Mercurial versions branches.

cleanup: remove duplicate import of "obsolete"

previous: fix behavior on obsolete cset when topic is involved (issue5708) This patch fixes the behavior of `hg previous` when done on an obsolete changeset having a successor of different topic. The underlying code is bit messed up, I wanted to split the topic handling to topic extension but I have postponed it to next bug.

previous: add test case when it's broken on obsolete cset This patch adds couple of tests showing `hg previous` is broken on obsolete changeset when the successor has different topic. Upcoming patch will fix this.

prev: fix the breakage of `hg previous` from obsolete cset This patch fix the breakage of `hg prev` from obsolete changeset when topic is involved. We get the topicidx of it's succesor and proceed.

prev: add a test case which shows traceback when doing prev on obsolete cset This patch adds a test which shows how `hg prev` is borken when called from a obsolete changeset and there is an active topic. The next patch will fix that.

tests: add more tests related to stabilization of orphaned merge commit This patch more tests related to stabilization of orphaned merge commit. Stabilization of a merge changeset with both the parents is not supported right now and prints a message on how to do that. Maybe we should do that internally as a part of `hg evolve` but I need to think about this.

evolve: fix stabilization of orphan merge changesets in case of conflicts As demonstrated by tests added in previous patch, if one of the parent of a merge changeset has a new version and merge changeset gets, running `hg evolve` to stabilize that if results in conflicts will lead to lose of other parent of that merge changeset when we resolve conflicts and do `hg evolve --continue`. This patch fixes the behavior, by checking whether we are continuing evolving a merge changeset and if yes, setting the dirstate parents according to that.

tests: add a test file of resolving orphaness of merge changesets This patch adds a new test file named test-evolve-orphan-merge.t which contains test cases when `hg evolve` try to stabilize a merge changeset which was orphan. This file contains 20-30% of all the cases as we have got something to fix before we add tests for rest of the cases. Going by this approach will make sure we don't live unfixed cases in the test file and the test files does not become a pile of hacks which are used to get in state when we fix the bugs.

grab: gracefully handle the case when we try to grab parent of wdir Before this patch, we go all the way down to obsmarker creation logic and gets an error saying that changeset cannot obsolete itself. We should be more smart here and error out early saying we cannot grab that changeset.

grab: move the initialization of pctx variable outside of if-else The pctx variable is used outside of the if-else but it was initialized under the conditional statements. Added test for the case when the initialization inside the if-else broke `hg grab --continue`.

compat: drop hack around http request handling for 4.6 The approach we used in 4.5 works again :-)

obsdiscovery: add compatibility layer to register wireproto command Mercurial core 0b18604db95e changed the way permissions are registered.

compat: pass all hgweb dispatch argument to the orig function This make use compatible with whatever changes on this side.

grab: add short version for continue and abort

obsdiscovery: include units in ui.progress() calls (issue5773)

tests: commit tests changes missing in the previous changeset (guess who forgot to amend)...

obslog: add the operation to the Obslog output The operation is helpful when debugging a case where we don't know how we ended up in this case while effect-flag are useful to understand what semantic changes happens to a changeset. Add the operation when displaying an obs-marker in the following form: `rewritten as X using amend` The other proposal is interesting but seems harder to internationalize and might requires update each time we introduce new operation: `Amended as X` Let's use the first proposal right now.

serverminitopic: attempt to fix assertion for repoview in branchmap This seems fine since we topic never impact public only caches.

compat: register a version of 'obsfatedata' template that works with 4.6 Since showlist is deprecated, let us use compatlist.

compat: register a version of 'troubles' template that works with 4.6 API Since showlist is deprecated, let us use compatlist.

exthelper: add support for "requires" argument for template keyword This will help use to support the new template API.

compat: add compat layer for date related functions

branching: merge with stable

compat: more straight forward alias for old template names The template registration have significantly changed in core:7b74afec6772. We take simpler approach to define the alias in a way that works for all versions.

serverminitopic: fix wrong object being passed to phase

legacy: respect explicit config for server.bundle1 Unconditionally disabling bundle1 is a problem for larger hosting website. We adopt a less aggressive approach and only disable it the default would be used.

branching: merge with stable

compat: only wrap wireprotoserver function if they exist Older version does not need the wrapping so everything should be fine.

pure: make sure what we expect to be list are list In the pure version, some of these object would be generator.

evolve: update code for not implicitly converting ctx to revision Mercurial core 38f480502043 removed the capacity to implicitly convert contexts to revisions using `int(ctx)`. Update Evolve code to explicitly call rev instead.

legacy-push: fix the code forbidding legacy obsmarkers pulling changeset e69e65b2b4a9 in code remove a key try/except. We reintroduce it for compatibility.

updatecaches: handle any new parameters to the method

evolvecmd: fix broken `evolve --continue` ran after `next --evolve` Recent series broke `evolve --continue`in cases when run after `hg next --evolve`. The previous patch adds test demonstarting the broken behaviour, this patch fixes that by storing the command which leads us to evolve --continue in the evolvestate.

tests: add test showing `evolve --continue` after `next --evolve` is broken Recent series fixing `hg evolve --continue` break the continue functionality after a conflicting `hg next --evolve`. This patch adds a test to demonstrate that. It will be fixed in the upcoming patch.

color: add some colors to evolve command itself

wireproto: fix *_capabilities for change of API types Mercurial commit 2f7290555c96 introduced new types for *_capabilities, update the code to use them.

obsfate: fix changeset description diff computing Mercurial core 8b6dd3922f70 changed the mdiff.unidiff API. Add a new compat method for all supported Mercurial versions.

evolve: add comptability to read old evolvestate files When a user runs `hg evolve` with old evolve where we used to write evolvestate the old ways i.e. without using cbor, and faces conflicts, the evolve is interrupted. If the user updates evolve before completing the evolve, that can result in traceback as the new evolve cannot read the old evolvestate file. The previous patch added function to read old evolvestate file and this patch uses that when we encounter the above mentioned case.

state: bring back the function to read old evolvestate files Before introduction of this nice cmdstate file wrapper, we had individual methods to write data to evolvestate file. Let's bring back the function which used to read data from the old evolvestae file so that we can use it in next patch for BC purposes.

evolve: add entry in CHANGELOG about fixed behavior of `hg evolve --continue`

evolve: store the skippedrevs in evolvestate While doing `hg evolve`, there are some revs which are skipped as they can't be evolved. Before this patch, we did not store this information in evolvestate and neither they were evolved, so `hg evolve --continue` will again try to stabilize those revisions. As much time as we run `hg evolve --continue`, this will happen which is not a good behavior. This patch adds a skippedrevs list to evolvestate where we store such revisions so that we don't try to stabilize them again.

evolve: show the updated working directory after `hg evolve --continue` `hg evolve` shows a nice message about the new working directory when the evolve ends but if the evolve is interrupted by conflicts and you continue the evolve resolving the conflicts, that nice message is lost. Let's have that in case of `--continue` too.

evolve: make `hg evolve --continue` respect `--confirm` Previous patch added capability to `hg evolve --continue` to continue the rest of the stack, not just the current revision but that was missing respecting the `--confirm` flag which user passed earlier. This patch makes sure we respect the `--confirm` flag.

evolve: make `--continue` continue evolving all remaining revisions This patch makes `hg evolve --continue` to continue all remaining revisions instead of just the current conflicted one. There are some still improvements required to this behavior after which the CHANGELOG entry will be added.

tests: add more tests to test-evolve-continue.t This patch adds more tests for `hg evolve --continue`. The tests demonstrates how the continuation handling of hg evolve is broken and the later patches fixes that handling.

evolve: handle case when newnode can be None while continuing evolve There can be case when `hg evolve --continue` is run, when working directory is clean and there is nothing to be included in the new commit. Let's make sure we handle such cases correctly and obsolete the node which is evolved with parent of wdir as successor. This is same as what rebase does.

tests: add tests for `hg evolve --continue` This patch adds a new test file containing tests for `hg evolve --continue`. The test file still does not contains all the tests related to `hg evolve --continue` as one of the case is broken which needs to be fixed first. The case is when resolving a conflicting evolve results in empty wdir. Next patch will fix the traceback and then a later patch will add more tests.

merge with stable

CHANGELOG: add an entry about resolve showing how to continue evolve

test: explicitly run HGEDITOR shell command with `sh` Otherwise Windows pops up the "What program do you want to use to open this?" dialog.

test: conditionalize blackbox output for Windows

branching: merge with stable

compat: add wrapper for logcmdutil functions These classes and functions were bulk-renamed at hg c8e2d6ed1f9e.

evolve: store the revs to be processed in the evolvestate This will help us in getting a full functional `hg evolve` where `hg evolve --continue` does not only continue one changeset.

evolve: store the replacements in the evolvestate This will greatly help when we will be implementing `hg evolve --abort`.

evolve: store the target category in evolvestate

evolvecmd: use the evolvestate object passed as argument in _solveunstable Earlier if get a merge conflict, we used to initialize a new evolvestate object and used to save it. Let's start using the state object which we get in as argument as that will contain more data about the state.

evolvecmd: pass evolvestate object to _solve* functions This patchs adds an argument evolvestate to _solve* functions. This will help us in having one evolvestate object which we can pass around various functions and keep storing what's going on.

evolve: create a state object in all case Let's create a state object even when we are not in the continue mode. This will help us passing the state object to rest of the functions.

branching: merge with stable

grab: preserve phase of the grabbed changeset This patch fixes the wrong behavior of loosing secret phase of the grabbed changeset.

tests: add a test showing grabbing of secret changeset turn it into draft This patch adds a test showing wrong behavior of `hg grab` command which looses the secret phase while grabbing a secret changeset.

grab: add grab info to cmdutil.afterresolvedstates This will help us in showing how to continue the grab when user resolves all the conflicts.

evolve: add evolve info to cmdutil.afterresolvedstates Adding evolve info to cmdutil.afterresolvedstate will improve the ui when we run into merge conflicts while evolving. Once we resolve all the conflicts using `hg resolve`, this will show a message saying "continue: hg evolve --continue". Other extensions like rebase and shelve also use it and it's very helpful.

doc: add link to roadmap Add a link to the Evolution roadmap in the main page of the documentation.

evolve: move the evolve command to evolvecmd.py This patch moves finishes the code movement by moving the evolve command to evolvecmd.py.

evolve: move _orderrevs() function evolvecmd.py _orderrevs() is a function which is used to order the revs in which the instability needs to be solved if we have multiple revisions to resolve.

evolve: move builddependencies() and _singlesuccessor() to utility module The builddependencies() and _singlesuccessor() function are very useful functions and can be used at a lot of places. They are also used in topic extension also, so let's move them to utility. However moving them to utility won't help anything in the topic extension.

utility: move MultipleSuccessorsError from __init__.py The MultipleSuccessorsError is required in multiple modules in upcoming patches, so let's move it to utility first.

evolvecmd: move more core from __init__.py to evolvecmd.py We are done with moving helper code, we will now be moving the evolve command in the new module.

evolvecmd: move code from __init__.py to evolvecmd.py

evolvecmd: move more code from __init__.py to evolvecmd.py We are now very close to have most of the evolve related code in evolvecmd.py.

evolvecmd: move more chunks of code from __init__.py to evolvecmd.py

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.

obslog: colorize the patch shown using `hg obslog -p` This patch adds color support to the patch shown in obslog command.

topic: suggest using topic when user creates a new head on branch This patch adds a message to use topics when user creates a new head on a branch.

changelog: update changelog with some of the benefit from the new format

evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.

tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.

evolve: remove the old functions for writing evolvestate Previous patch made all the users of these functions to use the evolvestate class and now they are not required. Let's remove them.

evolve: use the new evolvestate class in place of old methods Earlier we had three methods, which used to handle all the storage around the evolvestate but in previous patch we have introduced an evolvestate class wrapper which can serve for all our needs. This patch replaces the existing usage of the evolvestate with the new class introduced. Upcoming patches will start using the class at more places.

evolvestate: add a class to wrap the state of `hg evolve` command This patch adds a new file which contains a class which will act as a wrapper for the data to be stored or used during the `hg evolve` command. This patch just introduces the file and does not use it at the moment. The upcoming patches will start using it.

evolve: start vendoring third party package cbor This patch adds a third party package named cbor. cbor is a data serialization format and this library provides API to convert Python Objects into cbor formatted data. To know more about cbor, hop onto cbor.io The files are copied from it's official bitbucket repository which is at https://bitbucket.org/bodhisnarkva/cbor/src/113f42203c941470c98f7174065ba9b384cff727/ cbor.py can be found at https://bitbucket.org/bodhisnarkva/cbor/src/113f42203c941470c98f7174065ba9b384cff727/py/cbor/cbor.py # no-check-commit as we are importing a third party package Modified test-check-flake8.t to not lint on thirdparty packages.

uncommit: add a new flag `--revert` to discard wdir changes after uncommit This patch adds a new flag to `hg uncommit` using which one can discard the wdir changes which are left after the operation. Both the changes, the ones which were before the uncommit and the ones which were added to wdir as a result of uncommit as cleared out.

evolve: use phases.new-commit config to retain phase information (issue5720) Since the previous patches replaced the use of graftstate with evolvestate and we don't graft anymore on evolve --continue, we have now the capability to fix underlying bugs. This patch makes sure we use the phases.new-commit config to make a new commit of the same phase as that of the predecessor. Tests added in the previous patch shows the bug being fixed.

tests: add a test demonstarting lose of phase in `hg evolve` This patch adds a new test file which demonstrates the lose of phase information when hg evolve command runs into conflict. This is algo bug5720. The upcoming patch will fix it. A new test file is added as existing test files serve their own purpose and are already cluttered.

evolve: add a utility fn to check validity of opts passed to `hg evolve`

evolve: don't use graftstate for continuing `hg evolve` Before this patch, if user runs `hg evolve`, we read the evolve state, write a graftstate from that information and run graft command. This patch replaces that logic with new logic which does not depends on the graft state. The new logic is very filtered part of logic from graft command. We did not require a lot of opts checking and filtering revs logic from the graft command as our use case is fixed. This is the start of series/work which will make `hg evolve` better and have a good statefile for itself.

topics: add a new templatekeyword `topic` This patch adds a new templatekeyword topic which can be used to list the topic of the changeset when using commands which supports templating.

packaging: update MANIFEST.in to include new tutorial files I forget to update the MANIFEST.in file when important the new tutorial files. This commit fix that.

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

test: add a test to reproduce issue 5720

test: add missing cycle test Also fix precursors to break on obs markers cycles.

Small typos fixing in the topic tutorial

doc: import the training support Import the training support which was stored in a private-repository before.

branching: merge with stable

evolve: use new trouble names in commit messages There is case when we add trouble to the commit message while using `hg evolve`. This match makes sure, we use the new trouble names. The hash changed because it depends on commit messages.

evolve: use compat.TROUBLES to show troubles in user interface compat.TROUBLES is a dict which contains the trouble name for each trouble according to the hg version user is using. All of the replacements are related to `hg evolve` command.

topics: list only topic names in quiet mode This will be helpful in bash completion.

topics: take logic to parse username to a separate function In next patch we will be adding support to `hg stack` to show users, and this logic will be required there too. So let's take it out in a separate function.

changelog: fix a typo in the changelog There is probably many others but that one is fixed now.

caches: switch to 'auto' warming by default This options seems good let us make it the default.

caches: add a 'auto' option for obshashrange cache warming This option will only warm the cache when used as a server.

caches: extract some config reading in 'shouldwarmcache'

caches: pass the transaction to the "shouldwarncache" logic This will allow to have smarter mode about cache warming (eg: only warm them for server transaction.

caches: record 'desc' attribute on transaction This is useful to know if a transaction if server side or not.

caches: protect against missing connection If the connection cannot be established, we should not try to use it.

evolve: don't show working directory obsolete message if we were on it This patch tweaks showing wc obsolete message functionality to not show the message if the operation led us to the same changeset we were on before and it didn't obsoleted it. This make failed updates, update on current changeset and a pull with no change omit showing the message. This has some cons like if you are on rev 1 which is obsolete and you do `hg up <revset>` where revset is some revset which resolves to the rev 1, we won't show the warning as shown earlier.

prev: jump to parent's successor if parent is obsolete and topic is involved `hg stack` shows a linear chain of commits even when they are not linear chain and some changesets are obsoleted and have successors as separate head. This is very nice to have a post evolution view of the stack. However when `hg prev` is run on an unstable changeset whose parent is obsolete and does not topic but parents successor has the topic, it shows no parent on the topic. This patch makes `hg prev` update to parent's successor and make things follow the stack order.

tests: add a test showing wrong behaviour doing `hg prev` on orphan cset If there is an unstable changeset in the topic stack, whose parent is not a part of stack but has a successor which is part of stack, hg stack does shows them in linear order, but `hg prev` on that orphan changset says no parent on that topic. However it should update to the successor of the changeset. It will be fixed in the next patch.

test: update output to 02fdb8c018aa Now that we have directaccess in core, we get a new warning message when updating to a hidden changeset. Update the tests. CORE-TEST-OUTPUT-UPDATE: 02fdb8c018aa

test: update output to 9b3f95d9783d The unstable graph nodes are now shown with the character "*", update the test outputs. CORE-TEST-OUTPUT-UPDATE: 9b3f95d9783d

stablesort: use parent filtering in a place we forgot to Freak merge striked again.

obshashrange: add a progressbar to upgrade This section is the slowest, have some progress idea would be useful.

stablerange: add an sql index on subranges id too This should speed up query that find super ranges.

obshashrange: less brutal reset when receiving markers on existing node We now target the affected ranges only. The implementation is still slow but that should be better than what we had before.

obshashrange: update the cache updating logic Use the more modern option when available. (Same as the other caches).

stablerange: cleanup the update logic

stablesort: cleanup the update logic

firstmergecache: cleanup the update logic

depthcache: cleanup the update logic

changelog: add an entry about the obshashrange changes

stablerange: be more cautious when deleting the sql connection This triggered some crash in further development. This also match what is done elsewhere with this attribute.

stablerange: clarify sql transaction logic This should help concurrent access.

stablerange: use mergepoint based algorithm for the official stable range Changing the official stable range will impact all users of the infrastructure. We update version number of the cache file and discovery methods to clarify this. We do no keep compatibility with the old method over the wire. The new algorithm is much better and keeping compat is more work than we have time for right now.

stablerange: explicitly create a stablerange entry for branchpoint method We are about to change the default.

stablerange: have a mergepoint based sql backed class Everything is so generic that getting a class is 3 line of codes.

stablerange: introduce a sql backed version of the generic on disk cache This is getting use close to actually using the new sorting and algorithm for real.

stablerange: add a base class for on disk stored stablerange class

stablesort: use on disk cache for test

caches: factorise the cache warming check The old conditional was duplicated and hard to read. We factorise everything into the `utility` module.

stablerange: use repo-carried stablesortcache That one is common to all and disk persisted

stablesort: expose the cache through the repository Let have a unique instance, keep it warm and accessible.

stablesort: implement an ondisk cache Persisting the cache on disk will be important for large repositories.

stablesort: realign a misaligned continue We should make a better use of the jump cache now.

stablesort: remove some dead code This closure is no longer in use.

stablesort: abstract all cache access This prepare an on disk version of the cache

stablerange: use first merge cache to skip over linear section If we are to skip over a large section of the range, skipping everything until the first merge seems like a good idea.

stablerange: add a new 'firstmerge' cache This cache store the first merge ancestors of a changesets. This is useful to avoid iteration over the changelog when building stablerange.

stablerange: drop unused `until` utility We no longer needs this function.

stablerange: use cached size data instead of walking the graph Less iteration is better.

stablesort: record previous segment size in the jump That was, we can skip over a full jump without walking it. We'll make use of this in the next changeset.

stablesort: move jump recording inside the exclusive function This will allow use to record to cache size of segment in a later changeset. If the exclusive set is empty, we need to record it outside that function.

stablerange: compute jump size after jump retrieval only This prepares the caching of jump sizes.

stablesort: warm jump cache more efficiently We no longer for a full depth iteration for all request: - we exit early for non-merge, - for merge, we only iterate over the exclusive area.

stablesort: use a regular dict for jumps This will help knowing what revision we have already queried or not.

stablerange: use the jump information for faster iteration Instead of doing a full iteration over the exclusive set, we compare the jump information instead. This perform the same kind of logic than before but will allow for much faster iteration once all the caches are in place.

stablesort: expose the jumps sequence to other code The stable range needs it to build exclusive subrange efficiently.

stablesort: use 'depth' in mergepoint tie breaker The parents with the most depth will is considered lower. It has a couple of advantages. 1) the more shallow parent probably have less exclusive revision, 2) it makes Oedipus merge behave like close to the linear case,

stablesort: rework jump gathering The old code was buggy in some case, the new code give the same result as the 'headstart' version.

stablesort: stop recording jump type There are no mature user of this "jump type" data and the current implementation is known to be buggy. So we drop the logic for now. This will make on disk storage simpler. The data will be reintroduced later

stablesort: pass a jump recording function instead of a list This seems cleaner to abstract the underlying storage to the lower level. This also makes use more flexible about jump detection.

stablesort: minor indent fix

stablesort: clarify subcall to the exclusive side Before doing deeper rework of this logic, we tackle the simplest parts.

docgraph: update test output with new output

stablesort: record, cache and reuse jump Iterating below a merge means two things: 1) iterate over the part exclusive to the higher parents, 2) iterate from the lower parents. While iterating on the exclusive part, there will be case were we just go the next natural parent, and case were we'll have to "jump" to another revision. If we record all point this "jump" happens and their target, we can easily reproduce the iteration in the future. With that information we can iterate over the exclusive part of the merge without having to compute it entirely. In addition we store the reason of the jump. This will help the stable range processing later.

stablesort: fix head start computation The recursion was wrong and provided wrong result. As a side effect, this seems to hint that `stablesort_mergepoint_bounded` is not giving the right result for complex set.

stablesort: avoid attempting to sort a tuple This seems silly.

stablerange: use the filterparents utility

stablesort: use the filtered parents utility

depthcache: use parents filter in depth cache

parents: add a utility to filter parents There is various strange case of merge out there that needs to be handled. We add an utility function to handle them all.

stablerange: abstract the bit able to store cache into sql The part about actually storing the range is independent of the algorithm, so we should extract this before using it for the next iteration.

stablerange: split pure algorithm part from the on disk cache The stable cache file is getting long, we split the logic about keeping data on disk into a dedicated file.

stablerange: add an assert to detect buggy range Nothing can be negative in there, we add an assert to make sure it is so.

stablerange: warn cache for all relevant ancestors range Warming cache in the right order will prevent recursion to happens and unlock usage on large repository.

stablesort: move parent range computation into its own method Now that we have running code, we'll need to avoid too deep recursion. We extract the piece dealing with the parent range before we write more code to warm it.

stablerange: drop the basic inheritance from the 'mergepoint' version All necessary bits are implemented now (except for warmup which we explicitly bypass for now).

stablerange: cache known subrange at the stablerangecached level That way, the 'stablerange_mergepoint' class also benefit from it.

stablerange: use sort cache to build 'mergepoint' information Using the walk cache gives use a better complexity we need to scale. There are further improvement we could make, but this is a good first step.

stablesort: make the iteration from head available to all This will be useful for the stablerange code to work properly.

depth: fix compare mode for `debugdepth` The compare mode was broken for silly reasons.

memfilectx: changectx argument is not mandatory As changectx argument is now mandatory for memfilectx, add a compatibility layer to pass it when necessary. The commit that made the parament mandatory in core is 8a0cac20a1ad

branching: merge stable into default

amend: fix a typo in amend help text related to the extract option s/extra/extract/

topic: fix compatibility with 4.3 A compatibility fixes ended up being overlooked, we are bringing it back into the main branch.

branching: merge stable back into default New version has been released, hooray.

packaging: mark stable change as bugfix dev version This help reduce confusion when installing non-tagged changeset.

Added tag 7.1.0 for changeset 06a3cb594956

packaging: prepare release 7.1.0

branching: revert "stable" change into default The expected output for "default" is still the same.

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

test: backed out test change from changeset a18ca224e812 The related mercurial changeset, ad5f2b923b0d, is not in the stable branch yet.

test: backed out output change from 85ab7d2d9fd6 Mercurial core default branch does not have the related changeset yet (a7e49a5b3e6f).

branching: merge with stable

obsnote: warn if user try to store a note in obsmarker on an older hg Support to store a note in obsmarker is from hg>=4.4. We have added notes support to all the evolve commands but we do support versions which don't support storing note in obsmarker. Warn if user tries to store a note in older hg.

topic: use 'hookargs' over 'tr.changes' for flow control The 'tr.changes' attribute do not exists until 4.2.

topic: move function wrapping from reposetup to uisetup Having the function un reposetup means they get wrapped over and over again for long lived process.

test: publish the root of the repo in flow reject-untopiced The lack of default branch confuses older version

genericcaches: handle the lack of util.timer in 4.1 We do the same trick as usual.

topics: fix `hg stack` in case of split This patch fixes the behaviour of hg stack which throws an error in some cases when there are multiple successors. The case of divergence is not handled yet.

tests: add a test showing traceback on `hg stack` in case of split The traceback will be fixed in the next patch.

branching: merge stable into default

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

changelog: add an entry for the split+branch fix The world needs to know.

branching: merge with stable

split: force the branch to fix the split bug Also restore it after the split

split: add a test demonstrating that split doesn't take the right branch Also add a test to check that the dirstate is in the right state in case the user abort the split.

stablerange: compute the subrange closure on an unfiltered repository This avoid various overhead from filtering.

stablesort: write a flat version of the algorithm This new version never needs to iterate over the full repository even when merge are encountered. Having the algorithm flat also prepare caching works since the iteration sequence can we expressed with a couple of flat loop.

stablesort: simplify processing of non-merge changesets As long as a changeset as only one parent, the next element in the sort (starting from the head) has to be that parent. We detect and take advantage of that shortcut in the non-merge case.

stablesort: extract a '_revsfrom' method Walking from the revision is usually simple unless the revision is a merge. Having this walking logic isolated will help us refine it.

stablerange: use the new cache object in the 'mergepoint' version Every improvement to the cache should reflect on the stable range from there. Since we no longer use the basic sort function, we can simplify the inheritance by dropping one layer.

stablesort: introduce a cache object The object is not caching anything yet, but the API are getting into place.

stablesort: start implementing more advanced version of headstart sorting Now that we can validate the sort with a basic implementation, we can start implementing a version that will support caching and other goodies.

stablerange: make use of the limit argument in 'mergepoint' This will eventually avoid doing full iteration on ancestors of the head when retrieving the range content.

stablerange: introduce a smarte version of stablerange for 'mergepoint' This implementation will using caching and smarter algorithm based on these cache. For now it inherit most of it code from the dummy version for convenience. The inheritance to the dummy version should be dropped eventually.

stablerange: introduce an intermediary abstract class for caching The 'branchpoint' and 'mergepoint' based stablerange class will need similar cache, we introduce an abstract class to take care of that first.

stablerange: introduce a basic-mergepoint method This method use the new 'mergepoint' based stable sorting. It is expected to be eventually better than branch point to stable range: more stable, easier to cache, etc. Having a basic implementation will allow use to validate more advanced implementation.

stablesort: add a new test to check for fully independant branches Apparently, this was not covered.

stablesort: add a --limit argument This will be useful when using stable sort within stable range.

stablesort: introduce a mergepoint based method focused on head The things we needs for stable range is head centric. So we simplify the issue by focussing on head.

stablesort: introduce a "mergepoint" method The mergepoint method decide order from merge. This allow to directly reuse a the full sort of one of the parent, and should simplify caching.

stablerange: fallback to a more naive approach to find subrange As suspected, using "bheads" was bit good enough in some case and we have to fall back to the approach used in "basic". On the evolve repo (about 3K changeset) this approach is about 60% slower than the previous (wrong) code.

stablebranch: avoid overlap between subrange Subrange overlap make things more complicated and less efficient. We fix the computation done in the "cached" version of the stablerange cache. This bring things in line with the result produced by the basic version. Since we already bumped the format version since the last release, I don't things we need to do anything else.

stablerange: introduce an 'basicstablerange' This class hold all the basic of stable range but the part specific to the sorting. This allow to clearly express what is expected from each method and to generate tests output to be validated against the more complex implementation. While writing this, we spotted a bug in the current stable range implementation. Fix coming.

stablerange: extract the core API into a 'stablerangecore' class To clarify what the code is doing without all the caching and algorithmic improvement, we extract a core class that highlight the basic API expected from the class.

stable-branch: setup tests to use a specific method by default This will make future test simpler.

stablerange: rework the debug command to allow for multiple method Similar to what we did for the other debug command related to sorting, we prepare for the arrival of multiple method to produce the result (including simple implementation that are easy to read but do not scale).

deptcache: make sure we warm the dept cache before warming the obsdiscovery The depthcache need to a warmed a bit more agressively

stablesort: add a 'method' argument to the debugstablesort command Let start experimenting with other way to do stable sorting.

stablesort: rename function to stablesort_branchpoint We are about to test different approach to stable sorting. We clarify that the existing method is sorting from branch points.

stablerange: update the filename to avoid cache confusion The schema validation seems to not work as well as intended, we update the file name to make sure there will be no confusion.

stablesort: extract in its own module We are going to introduce variants, cache and more complex logic, we move that in its own repository beforehand.

compat: in depth cache, only use cachevfs when available We support older version without the new vfs.

depthcache: issue a progress bar when loading the depth cache The operation can be in the minute order of magnitude of some larger repository. We better keep the user entertain when he wait.

depthcache: move to a dedicated object and storage The SQL cache was overkill and fragile. We move to a dedicated storage using the new generic class.

cache: adds debug details about what the content of the update Having more data in debug is good, we add a small method to help providing them. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

cache: introduce a changelogsourcebase class This abstract class will help code that need a cache tracking the changelog content (eg: the branchmap cache). The cache key used is the same as what the branchmap uses. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

cache: introduce an abstract class for cache we can upgrade incrementally Right now each class implements their own mechanism for validation, and update. We start introducing abstract class to ultimately allow more unification of the cache code. The end goal of this series is to introduce a cache for some obsolescence property, not to actually implement the cache. However, taking advantage of adding a new cache to introduce the abstract class seems like a win. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.

depth: basic debugdepth implementation and test This will come very handy to validate more advanced implementation later.

topics: add a config to reject draft changeset without topic on a server This patch adds a new config option experimental.topic-mode.server which if sets to True, the server won't accept any draft changeset without topic on it. In case both `experimental.topic-mode.server` and `experimental.topic.publish-bare-branch` are set to True, the enforce-topic one is respected. Tests are added for it. The CHANGELOG file is also updated mentioning about the config option.

test: update output to ad5f2b923b0d A new bundle2 capabilities have been added (related to bookmark). So we have to update the test output. CORE-TEST-OUTPUT-UPDATE: ad5f2b923b0d

touch: shorten touch's docstring to make it fit into a one line This make it show completely (untruncated) in `hg help -e evolve`. This follows up on fed946edc293 where the docstring got unwrap for that purpose and thus made the line length exceed 80 columns.

branching: merge with stable

help: promote "amend" to important command Recent change to what command we advertise as "basic". It turn out "amend" was not part of one of them. Since "amend" is one of the core command of a rewriting workflow, we promote it to "basic command".

help: fix output for `hg help -e evolve` wrt 'touch' command Currently, when running `hg help -e evolve`, the output looks like this on my screen: touch create successors that are identical to their predecessors except With this change, it looks like this: touch create successors that are identical to their predecessors except for the changeset ID

help: remove a few commands from `hg` (no args) command list According to `hg help -e evolve`, the following commands come from the evolve extension: amend evolve fold metaedit next obslog pdiff previous prune pstatus split touch uncommit If one runs `hg` without arguments, commands that are prefixed with a ^ character are shown. From the previous list, this includes: evolve fold metaedit next previous prune split touch uncommit It feels several of these commands are not "basic commands" that someone who has never used hg before might care about. They probably also do not come close to passing the "toothbrush test": things that users are likely to use every day. This commit removes these items from the list: metaedit, touch, uncommit This means the following are kept: evolve fold next previous prune split

typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.

topic: use more protective code to access current topic There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.

topic: use more protective code to access publishing code There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.

typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.

tests: add a test for newline in obsnote

obsnote: don't add '' to note while showing it in obslog

obsnote: add an entry in CHANGELOG about it

amend: add support for storing a note in obsmarker

uncommit: add support for storing a note in obsmarker

fold: add support for storing a note in obsmarker

metaedit: add support for storing a note in obsmarker

prune: add support for storing a note in obsmarker

split: add support for storing a note in obsmarker

touch: add support for storing a note in obsmarker

obslog: add initial support for showing note in obslog This add a very basic and initial support for showing the note stored in the obsmarker in obslog to test the upcoming changes which adds support. The UI is not finalised and will be improved in the patches after support is added and we have tests with the current output.

cmdrewrite: add a utility function to make sure note is of valid format Upcoming patches will add support to store a note on various evolution related commands by storing that in obsmarker. Since the obsmarker metadata field can't store things above 255 bytes, this patch introduces a function which will be used to make sure note is under 255 bytes and does not contain newlines. We don't want notes to be multilines.

branching: merge with stable

test: remove dangling --config in test-metaedit.t

tests: fix previously accidentally matching regexes in test-touch.t Before Mercurial commit 6d5718e39657 (run-tests: make "| foo (re)" not match everything, 2017-11-29), regexes like "| foo", which are common in graphlog output, would incorrectly match anything. After that commit, they match as they should, meaning that either "" or " foo" would match, but not a "| foo". This commit fixes the test by replacing the "|" by "." rather than escaping with "\|" since that would make the graph harder to read.

test: update test-discovery-obshashrange.t

test: remove dangling --config in test-metaedit.t

serverminitopic: also avoid reading Avoiding to write cache for filter where topic applies is a good step, but we need to also avoid reading it. Existing branchmap cache might exists before the turned the feature on.

topic: introduce a minimal extensions to enable topic on the server This small extensions simply expose topic in the branch. This should help getting minimal support for topic from various hosting solution (eg: bitbucket maybe ?) See extensions help for details.

branching: merge stable into default

pusoperation: wrap pushoperation __init__ directly This is how remote names does it. Using the same method should helps with compatibility when mixing the two extensions.

hgignore: fix .err matching patterns We don't want to ignore .err file outside of the 'tests/' directory.

changelog: fix 7.0.0 release date We date was the same as 6.8.0 for some unkown reason. We now use the date of the tag.

changelog: mention the improved verbosity handling

branching: merge with stable

changelog: update missing release date

summaryhook: respect -q flag There's no test coverage, but it seems pretty obvious and I don't care enough to write a test.

summaryhook: remove unused function

evolve: make prev/next respect --quiet flag (issue5742)

packaging: merge 7.0.1 into default

packaging: mark version as development version. This helps reduce confusion when installing non tagged version.

Added tag 7.0.1 for changeset e7a2a6158077

packaging: prepare version 7.0.1

packaging: update tested-with version Mercurial 4.4.1 is out.

changelog: mention the --publish bugfix

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

compat: fix comp ability of the new phase logic for Mercurial < 4.4

config: clarify that config is only enabled on the repository is it setup for This changeset change nothing but clarify a few thing. The ui passed to 'reposetup' is the same as 'repo.ui'. However we would like to clarify things a bit.

branching: merge with an old and strange head

branching: default into stable It is time for a new release

topic: fix new head detection when using --publish on a topic I suspected a bug lurking around there and I found one.

effect-flag: fix obsfate verb hooking Mercurial core commit b81ad5b78a81 renamed a the function we hooked on and update its signature. Update the code to detect that, which fixes tests errors.

test: update test output for effect flag by default Now that effect flag is in core and turned on by default, this affect topic test that did not had the evolve extension turned on all the time. CORE-TEST-OUTPUT-UPDATE: a7e49a5b3e6f

tests: add more testing of pulling with various setting We checks for client/server with various combination: * extensions enabled, * extensions enabled but exchange disabled, * extensions disabled,

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 into default

changelog: add details about the pushkey related fix

wireproto: gracefully fail on http when trying to use older pushkey method Previously the HTTP server would return a 500. It now returns a 410.

wireproto: avoid exposing pushkey abort for server without evolution Client with evolution enabled will query the 'obsolete' pushley namespace if no other way to request obsmarkers have been found. They will do this unconditionally as long as no other obsolescence related capabilities have been advertised by the server. The call is "harmless" since the namespace will be empty if obsmarkers exchange is disabled. However, since we forbid the use of pushkey for obsmarkers this lead to unexpected crash report for up to date client talking to a server with the evolve extensions but exchange disabled. We fix the issue by serving the expected empty namespace in this case. We keep forbidding the query if obsmarker exchange is enabled since new client should have picked another more effective was to fetch the data first. We also add some tests for this logic.

obsdiscovery: enforce the config on the server too Right now, setting 'experimental.evolution.obsdiscovery=no' disable obsolescence markers discovery on client only. The server still advertise discovery related capabilities. We now also honor the config on the server side.

packaging: mark default branch as development version This help avoid confusion when installing version from the repository.

branching: merge back stable back into default

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: mark as development version This help avoid confusion when installing non tagged version.

Added tag 7.0.0 for changeset c56c028f3802

packaging: prepare version 7.0.0

debian: drop outdate part of the description

debian: update Mercurial version dependencies The debian package now reflect the actual requirement of the extension in its current version.

branching: merge with stable to prepare version 7.0.0

push: add a --publish flag The new flag turns all element in the push to public changeset. This will help experiment with diverse publishing workflow.

topic: add an option to automatically publish topic-less changeset This new option will help playing with merge based workflow.

topic: add an option to enforce a single head per name in a repository

revset: clean up some messy logic

evolve: rename --phasedivergent flag to --phase-divergent This makes the whole things easier to read.

evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.

pushkey: forbid usage of pushley to exchange markers The pushkey based protocol lacks many important feature and is very slow. We disable it to prevent any usage by mistake.

changelog: add an entry for 7.0.0 with recent change

compat: drop compat code for smartrevs.first The 'first' method have been around for years.

compat: drop compatibility dance around configoverride This was introduced in hg-4.1 and we do no longer support lower versions.

compat: drop support for older exchange protocol Their have been better alternative for years. In addition they have been officially deprecated for quite some time. So we official stop support them to ease the maintainance.

compat: drop compatibility for 'streamres' prior to 4.1 We no longer support these version.

compat: drop the directaccess hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop the inhibit hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop 'lru.get' work-around for 3.9 We no longer support this version.

compat: stop working around 3.8 file cache limitation We no longer support this version.

compat: simply the wrapping of '_destmergebranch' All the version we support now use the same interface.

compat: drop support for 3.8's '_destrebase' function We no longer support this version.

compat: mark version 4.1 as the minimum version required We dropped compatibility for version 3.8, 3.9 and 4.0.

compat: drop compatibility for Mercurial <= 4.0 We are dropping compatibility with older mercurial version. This will help us to clean up the code base.

packaging: mark as development version This helps avoid confusion.

branching: merge with stable Prepare the 7.0.0 line.

packaging: mark version as development version This helps to avoid confusion.

branching: close mercurial-4.0 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.9 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.8 branch We are dropping support for older Mercurial version.

util: add a small script to help with the merging of branches We have multiple test-compat branches merging them can be a bit tedious. We add a nice script doing so for us.

test-compat: merge mercurial-3.9 into mercurial-3.8

test-compat: merge mercurial-4.0 into mercurial-3.9

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

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

Added tag 6.8.0 for changeset ec0bbf26ce7f

packaging: prepare version 6.8.0

flake8: rename some ambiguous identifier Apparently, pyflakes declared war on 'l'.

topic: instroduce a fast path when computing stack We do some stack related computation during transaction now. The current inefficiency of the revset is hurting us too much. We pre-compute a subset using native set operation to speed things up.

branching: merge stable back into default

test-compat: merge future 6.7.0 in mercurial-3.8 branch

test-compat: merge future 6.7.0 in mercurial-3.9 branch

test-compat: merge future 6.7.0 in mercurial-4.0 branch

test-compat: merge future 6.7.0 in mercurial-4.1 branch

test-compat: merge future 6.7.0 in mercurial-4.2 branch

test-compat: merge future 6.7.0 in mercurial-4.3 branch

obsfate: re-enables operation display in obsfate Now that the compatibility checks are in a good shape we can re-enable more noise in it.

changelog: update to reflect latest change

test-compat: merge with mercurial-3.9 branch

test-compat: merge with mercurial-4.0 branch

compat-test: remove topic related tests for 3.9 The extension is no longer supported for 3.9

test-compat: merge with mercurial-4.1 branch

test-compat: merge with mercurial-4.2 branch

test-compat: merge with mercurial-4.3 branch

branching: merge with mercurial-4.3 branch creation The other changeset marks the point were 'stable' is no longer about Mercurial version 4.3.

test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.

test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.

test-compat: revert ouput change to blackbox This backed out changeset 86be70ae38b9.

test-compat: revert ouput related to operation This effectively backs out 4b951a9a6895.

test-compat: revert output change in rebase This backed out changeset d12c82fd1143 and a couple of other changes. The change are not relevant in Mercurial < 4.4/

test-compat: revert output change from bundle2 capability This backout changeset dd3eda2f7a89 not relevant for verison < 4.4.

test-compat: revert output change on pull report The revert the changeset from 8feb2cae7eae. Not relevant for verison < 4.4.

test-compat: revert output change from 'phase' part The output change were introduced in changeset from 87e349f617f9 and it not relevant for version lower than 4.4.

test-compat: revert output change from using core obsfate The output update arrives in e91ca8b5ecf7. This output is only relevant for Mercurial 4.4

topic: do to check to topic while amending Right know the 'topic-mode' mess with amend. Especially in case of amending merge where the merge is not properly detected.

topic-mode: add missing end line in topic-mode warning

compat: work around the lack of configoverride in mercurial 4.0 The phase preservation will stay broken on 4.0 and below

compat: add an abstraction for 'scmutil.cleanupnodes' The usage of the function was added in 103244e34a9c but is not compatible with Mercurial <= 4.2.

compat: conditionally access config item Version 4.2 and below do not have config items support. So the extensions helper do not register anything.

compat: handle version where obsutil is not available Version older than 4.3 is do not have the obsutil option. We need to handle that.

test: use node instead of rev in topic push tests This makes the test more stable when revision number changes.

test: use node instead of rev in uncommit -i test This makes the test more stable when revision number changes.

branching: create the mercurial-4.3 test compatibility branch This branch will contains the expected test output with 4.3.

branch: merge with stable to prepare 6.7 release In addition, Mercurial 4.4-rc is out, so we need to update the expected output.

changeloge: add details about topic-mode

effect-flag: remove wrapping of createmarkers for Mercurial 4.4 Now that effect-flag has landed in Mercurial 4.4, we don't need to wrap createmarkers for this version anymore.

stack: order the adjective of changeset The new order give more interesting result: * base current * base unstable * current unstable It seems more harmonious this way. Base seems the most core and immutable adjective describing the element. Then current is a volatile but important one. Finally, unstable is less information than current, so it goes last.

stack: show current and unstable also for t0 and bases

obsfate: use core version of obsfate if available Let us use the upstream version whenever available. The operation display is currently disabled to ease with the test changes.

topic: register config items There is a couple more hoops to jump through but all config items used are now registered.

directaccess: register config item if possible Mercurial 4.4 warns about unregistered config.

evolve: registed configitems if available The config are registered as 'dynamicdefault' because we still need to explicitly pass the config option for older version of Mercurial. (4.2 and before).

inhibit: compatibility with 4.4-rc

branching: merge with stable Merge with the inhibit fix.

inhibit: respect '--keep' when handling rebase clean up

test: adapt to change from 537de0b14030 If we use phase for pull/push this impact some debug output. CORE-TEST-OUTPUT-UPDATE: 537de0b14030

test: adapt to output change from eb586ed5d8ce Core have a more verbose output on pull. We have to update tests with it. CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce

compat: fix compatibility with new duplicatecopies Changeset 754b5117622f updated the signature of 'copies.duplicatecopies'. We can now handle the multiple version of that code for compatiblity.

topic: remove 'ass' from the random animal list As much as I love donkey… this generate inappropriate names.

config: stop passing useless default value to config

branching: merge with stable

changelog: add about fixed bookmark and phase handling while changing topics

changelog: add about pager support

pager: add support to `hg evolve --list`

pager: add support to `hg obslog`

pager: add support to `hg topic`

pager: add support to `hg stack`

pager: add a function in compats to start pager This will help us enabling pager when ui.pager API exists. Also we can try plugging in the old pager API in this function and we won't have to change anything.

metadata: cleanup metadata file I'm not sure how this conflict marker survived the pre-publish test run...

branching: merge with stable

topic: remove a silly duplicate in a revset Spotted by Pulkit Goyal. More performance win seems to exists here, but we starts with the obvious.

topics: show changesetcount, troubledcount and headscount by default

topics: use stack.stack() instead of stack.stackdata() stack.stackdata() also calls stack.stack() internally. Moreover if we just want to calculate changesetcount, troubled count, it will be cheap to calculate using stack.stack rather than stackdata().

packaging: mark version as bugfix dev version This avoid confusion when installing non tagged version.

branching: merge with stable

Added tag 6.7.1 for changeset 430ad68292d7

obslog: remove the word "yet" from "No patch available yet" "yet" was a bit confusing as it let me think that patch is currently not available but can be available sometimes later. This is true for cases when it says "context not local" but we have more messages like "no successors", "too many successors", "changesets rebased" where we can't have a patch.

obslog: spell out successor completely If the successor is not known locally, obslog says `succ is unknown locally` which is not a good message. This patch makes sure succ is spelled out completely as successor.

readme: update readme with latest fix (also more the stack one in the right location).

obsfate: make the user list more readable Separate each user in the obsfate user list by a space for readability.

obsfate: fix user filtering in obsfate-printer Only hide current user only if it's the only one that create obs-markers.

obsfate: add a test with user both current and other This will help highlight change in the next changesets.

obsfate: update test The obsfate templatekw and the obsfateprinter behavior was different when displaying or not the current user in obsfate users. Update the test to makes the behavior fix more visible.

packaging: prepare version 6.7.1 The are an important fix on evolve and another important fix for topic performance, let us make a release.

readme: add changelog for topic 0.3.1

add mention of the topic 0.3.0 version

readme: fix evolve 6.7.1 entry

topic: reorder revset for faster evaluation When running the revset on unfiltered repository, the mutable set can get huge. So removing the obsolete changeset first provide a large speedup. This resolve the performance regression we were seeing since the 6.7.0 release.

topics: use stack rather than stackdata when one only wants the changeset count There might be a significant performance impact. Might resolve #309.

log: update obsfate output order Always display successors after the verb. So instead of "rewritten by boris as X", display "rewritten as X by boris". 07b9fcf8b6d3 did update template-based obsfate but forget to update obsfatelineprinter.

test: remove bashism in test-topic-change.t The test was broken on various machine using shell not supporting the `{start..end}` construct.

topics: handle phase correctly while changing topics

tests: add test showing change of phase while changing topic on secret commit

topics: use scmutil.cleanupnodes to create markers while changing topics Earlier if we change topics on changesets with bookmark, the bookmark is not moved to the new changeset as we didn't add that logic and we were creating obsmarkers directly. This patch calls scmutil.cleanupnodes to create obsmarkes which also handles the bookmark movement.

tests: add a new test for testing changing or clearing topics test-topic.t is getting bigger and bigger. This patch introduces a new test which includes test for clearing and changing topics. Since the tests are moved to a new file, this patch, removes those tests from test-topic.t also.

obscache: do not check of argument count of wrapped function After talking with the original author of this check, it appears that it never worked properly, since _readmarkers was always wrapped with @util.nogc.

legacy: rename lookup_errors to not be in all caps (flake8 warning) flake8 has a plugin, pep8-naming, which is not installed by default, but is used if available, no extra config required. This plugin checks names of variables, classes, functions and so on against PEP-8, and it complained about this variable: N806 variable in function should be lowercase Since this isn't a module-level constant, but just a helper variable used only in one function, it's fine to just rename it. With this error gone, flake8 output (used plugins: mccabe, naming, pycodestyle, pyflakes) is totally clean.

randomname: fix the header of the file

topics: move README-topic as hgext3rd/topic/README Before improving the docs about topics, lets move them into the topics folder.

README: move CHANGELOG to a new file

test: small cleanup in test-topic-mode.t remove the mention of "new" (this won't be new soon) and use the official config name.

test: add support for random-all topic mode The 'random' mode no longer generate a random topic for merge.

test: rename test-topicmode to test-topic-mode This is easier to read.

topicmode: add 'random' topic mode That mode will generate a random topic name when the user is about to commit an untopiced changeset.

topic: update the topic-mode hint The hint is now shorter and reference the documentation. That should provide more concise output with more details for user who seeks it.

topic: rename the 'topic-mode' help subtopic This will help making reference to it in warning.

topic: add a 'enforce-all' mode The mode abort for all commit without a topic, even merges.

topicmode: 'enforce' topic mode, no longer warn about untopiced merge merging a topic back in a branch is common case, it seems sensible to not pester the user about it.

topicmode: add new warning topicmode

topic: add documentation for the 'topic-mode' option This should help people to discover it.

test: update tests to use topic-mode enforce

topic: migrate experimental.enforce-topic to experimental.topic-mode

test: adapt to output change from 10e162bb9bf5 The changeset 10e162bb9bf5 in code extend the list of capabilities to include "phases=['heads']" this has a minor impact on test output CORE-TEST-OUTPUT-UPDATE: 10e162bb9bf5

merge with stable

stack: handle basic case of splitting with crash hg stack used to crash horribly whenever a split was encountered. This is no longer the case. If the result of the split (or there successors) produce a sensible linear result with on final head, we can just assume that head is the evolution destination.

tests: update test output with commit 4f969b9e0cf5 in core

tests: update test output with commit ecc96506c49d in core

packaging: update version to match development version This helps avoid confusion when installing from source.

packaging: merge stable back into default 6.7.0 has been released.

packaging: mark stable branch as dev bugfix version This help avoiding confusion when installing evolve from sources.

Added tag 6.7.0 for changeset 3a4f75c6619c

packaging: update debian changelog

packaging: update version number and testedwith version

packaging: mark version 6.7.0 in the source Version ready to be released.

packaging: update compatible version This has been tested with 4.3 too.

readme: prepare readme The feature that only work with 4.3+ are flagged as such.

compat-test: merge future 6.7.0 into 3.8 compat branch (merging through 3.9 compat branch)

compat-test: merge future 6.7.0 into 3.9 compat branch (merging through 4.0 compat branch)

compat-test: merge future 6.7.0 into 4.0 compat branch (merging through 4.1 compat branch)

compat-test: merge future 6.7.0 into 4.1 compat branch (mergeing through 4.2 compat branch)

compat-test: merge future 6.7.0 into 4.2 compat branch Couple feature to disable and other various test impact.

branching: merge future 6.7.0 in the stable branch We are getting ready to release a new version.

topic: fix topic message for mercurial 4.2 and below

README: mention that --age also shows the user While I was here, I fixed the a spelling mistake in previous commit.

topic: try to clarify the "branch" part in stack The idea is to clarify the meaning of "behind" with using the "target" word.

readme: mention the message update

topics: make sure user don't pass both the age option and a topic name

topics: spell out topics completely in help

topics: show the user who last touched the topic in --age This patch adds support for showing the user who last touched the topic in the age option to `hg topics`.

topics: initialize variable with default value instead of assigning later

topics: improve the function signature by accepting arguments as **opts

topic: merge with strip related fix

topic: skip topic movement message during strip During strip transaction the repository is not in a great state. It is simpler to skip the computation entirely.

topics/ui: detect and signal when an empty changeset becomes non-empty

topics/transaction: return immediately if we are in the middle of a transaction

topics/ui: signal when an operation entails voiding a topic Typical situations may include: * publish * push (to publishing server) * pull * fold

topics/ui: signal when the topics command creates a new (empty) topic

topics: signal to the end user when a topic has been forgotten Situation is: * we're updating outside an empty topic. * we've cleared topics

topic: add a --topic option to "outgoing" command By symmetry with "push" in the previous changeset.

topic: add a --topic option to "push" command This is symmetrical with --bookmark or --branch; it selects changesets in specified topic as revisions to push.

test-compat: adapt to core change in b90bd9a98c8b Blackbox just got a little more chatty.

readme: update about obslog update and documentation refresh

topic/tuto: be more precise in the top introduction about the publishing server Indeed there is a chapter with a non-publishing one.

topics/tuto: prefer rebase over merge and remove the weird merge attempt

topics/tuto: typo fix and s/multiple/two

topics/tuto: be more complete over the de-orphaning action within a topic

topics/tuto: try to be more precise on why `hg log` output is hairy

topics/tuto: attempt to have a slightly more clear wording

topics/tuto: try to be more clear when explaining previous/next

test: fix the enforce-topic configuration There have been an error while updating this patch.

topics/tuto: clarification on the scope of the tutorial Also we try to remain the reader that push -> publish.

topics/tuto: slightly more verbose explanation of what we are seeing

topics/tuto: spell out `hg topics` entirely

topics/tuto: activate the `enforce-topic` option This really help users to stick within topics.

topics/tuto: highlight the behaviour on publish + update And the fact that empty topics vanish if we update out of them.

topics/tuto: fix title underline type introduced earlier

doc: update graph with latest version of doc-graph

flake8 docs/conf.py

doc: disable generating command documentation when mercurial is not up-to-date

doc: add documentation for evolve commands By using a sphinx directive that call `hg help`.

doc: clarify undocumented features

test2rst: ignore the #if/#endif line in the output They are not useful for the rest.

doc: integrate graphviz graphs in tutorials Use the mercurial-docgraph extension (https://pypi.python.org/pypi/hg- docgraph/) in tutorials in order to have some dot graphs in the tutorials .t files. Then generate the doc as usual, the sphinx-graphviz extension (http://www .sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should handle the generation of the graphs. Please be aware that you need the dot binary installed in your system. Please refer to the extension documentation for more configuration.

doc: add a special flag for content to ignore in the rst The testfile to rest document convertion has a new way to ignore some commands.

obslog: simplify formatter keys The formatter field keys are all prefixed with `debugobshistory.'. This is annoyingly useless as they are already in the `debughistory` topic. This patch simplify these keys. For examle, on this repository `hg obslog -Tdebug -r 31cbace4c0f1` : ``` debugobshistory = [ { 'node':'31cbace4c0f1', 'shortdescription':'topics: make sure we have some restrictions on topic names', 'rev':2904, 'markers':[ ] }, { 'node':'d439a6087434', 'markers':[ { 'date':(1504176329.83902, -7200 ), 'verb':'rewritten', 'succnodes':[ '31cbace4c0f1' ], 'effect':[ 'parent' ], 'user':'Pierre-Yves David <pierre-yves.david@octobus.net>' } ] }, { 'node':'1e1f651704d4', 'markers':[ { 'date':(1504175088.811924, -7200 ), 'verb':'rewritten', 'succnodes':[ 'd439a6087434' ], 'effect':[ 'parent' ], 'user':'Pierre-Yves David <pierre-yves.david@octobus.net>' } ] }, { 'node':'eb6495cf6cb1', 'markers':[ { 'date':(1504015275.001643, -19800 ), 'verb':'rewritten', 'succnodes':[ '1e1f651704d4' ], 'effect':[ 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'761e446e0112', 'markers':[ { 'date':(1504015201.780276, -19800 ), 'verb':'rewritten', 'succnodes':[ 'eb6495cf6cb1' ], 'effect':[ 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'531a626950bd', 'markers':[ { 'date':(1504015017.897054, -19800 ), 'verb':'rewritten', 'succnodes':[ '761e446e0112' ], 'effect':[ 'meta', 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'c2f9ba7329ea', 'markers':[ { 'date':(1504014136.876537, -19800 ), 'verb':'rewritten', 'succnodes':[ '531a626950bd' ], 'effect':[ 'meta' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, ] ``` We now able to ask `hg obslog -r 78debdfb3e4d -T '{label("log.summary", shortdescription)}\n{if(markers, markers % " {date|age} {user|person}\n")}'` ``` doc: simplify the reference to in-core features 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Philippe Pepiot 9 days ago Philippe Pepiot ```

obslog: fix `--template` with `--graph` option The `template` option was not propagated.

obslog: uniformize `_debugobshistoryrevs` and `_debugobshistorygraph` arguments `_debugobshistoryrevs` and `_debugobshistorygraph` perform quite the same action, the latter simply add graph support. Consequently, it looks better for them to have the same argument list.

obslog: fix --patch with --no-graph options The repo given to _debughistorydisplaymarker which computes the diff was filtered when graph mode is disabled.

commands: upgrade pdiff and pstatus to full commands Doing so make them appears in the documentation, improving their discoverability.

gup/gdown: properly mark these commands as deprecated They are no longer displayed in the documentation.

Backed out changeset 1b4c92621e23 This got published by mistake.

doc: integrate graphviz graphs in tutorials Use the mercurial-graphviz extension (https://bitbucket.org/octobus/mercurial_graphviz) in tutorials in order to have some dot graphs in the tutorials .t files. In order to run the tests, export the GRAPHVIZ_EXTENSION variable which points to your copy of the extension. Please be aware that pygraphviz should be installed in your environment. That should be sufficient for generating dot graphs in text format. Then generate the doc as usual, the sphinx-graphviz extension (http://www .sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should handle the generation of the graphs. Please be aware that you need the dot binary installed in your system. Please refer to the extension documentation for more configuration.

amend: lift the --interactive constraint on `--extract` The uncommit logic now supports interactive selection.

readme: mention the topic output cleanup

readme: mention the new --interactive mode for uncommit

uncommit: minor comment cleanup in the test Fix some of the sectionning and fix on comments.

uncommit: small cleanup of the interactive test setup

tests: add tests for interactively uncommitting by mentioning files

uncommit: fix the dirstate handling in `uncommit -i` This patch fixes the dirstate handling after `hg uncommit --interactive`. This patch is bit verbose about the logic and efforts are not put to plug the logic into existing logic as it's easier to understand like this. Plugging this into non-interactive logic deserves a separate patch.

uncommit: pre-indent a block in if-True The block will be moved in if-else in next patch.

uncommit: add an interactive option to uncommit This patchs adds an interactive flag to uncommit command which lets you choose hunks interactively. The implementation is as follows: 1) prompt user to select hunks to uncommit interactively 2) make a temporary commit of the hunks user selected 3) calculate the diff of temporary commit and changeset to be uncommitted 4) commit that diff which results in the changeset which should be there after uncommiting 5) create obsmarkers as required, phases and bookmarks handling 6) reroute the working directory

uncommit: pre-indent a block in if-True for the next patch

topic: provide more information when behind count cannot be computed The behind count has been confusing for various user and the associated error message is even worth. We try to clarify it to see if that helps.

topic: show the t0 even if topic is not yet touched

topics: improve the description if topic is not touched Instead of an empty stack in `hg stack` when topic does not contain any changeset, we show `not yet touched`.

topics: show working directory branch when topic is empty

topics: add tests for cases when a topic is empty

readme: mention compatibility with future 4.4

topic: update the message used with --age for empty topic This clarify things when a topic got emptied by publishing.

sharing: edit pass

user-guide: edit pass

topic: stabilise the output of --age when date ties We just needed to introduce sort to stabilize the output order.

tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.

topic: setup 'topic' value for working ctx The way amend work in core change in e8a7c1a0565a. The intermediate commit disappear and we can no longer rely on it to carry the topic value to amend. To fix this, we ensure the current topic value can be retrieved through the `workingctx.extra()` value. Since there is no way to carry a "missing" key information in a way that survives and "dict.update" call. We also has to introduce hacking behavior about a special empty value for topic.

tests: abstract version number for test-topic-stack.t Using explicite version number always bring trouble, this is why we have unique description that can select changesets.

evolve: use registrar.templatekeyword to register template keyword functions Now, using registrar.templatekeyword of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too. BTW, this also fixes an issue of "hg help templates" output that template keywords "precursors" and "successors" are not displayed as same as others, because they do not have ":KEYWORD:" prefix in their docstring.

evolve: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too.

topic: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in topic extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for topic extension is 4.0. This patch also removes modsetup() in topic/revset.py, because it is useless. BTW, this patch fixes an issue of "hg help revsets" output that custom revset predicates are not displayed as same as others, because they are not "inline literal" in reST syntax (``NAME``).

doc: make paragraphs before example code end with "::" for reST syntax This prevents lines in an example code from being treated as a part of normal paragraph. For issue example, lines are folded into one paragraph.

topic: centralize compatibility logic between hg versions into compat module This patch can delay loading obsutil and obsolete modules until they are actually used at "hg topics" or so, if demandimport of Mercurial is enabled.

readme: mention the improvement to stack in the readme

test: issue a clarifying graph print in tests/test-stack-branch.t

stack: properly order stack when gaps existing inside it We transitively search for the next "stack" ancestors, of changeset in the stack not based on other revision of the stack. This should help having a consistent display when topic are interleaved.

stack: display both parent with displaying merge This will help understanding merge in the stack. More test involving merge are adding in the next changeset.

tests: add tests for showing stack when merge is involved This patch adds tests of showing stack when merges are involved. This will help us in changing the behaviour and realising that in later patches.

stack: move data computation on the object We gather multiple data about the stack on the object. Let us move this on the object and keep it cached there.

stack: replace 'getstack' with direct call to 'stack' The dedicated function do not add any value. We can update all the callers.

stack: introduce a rich stack object The logic around stack object become more and more complex. We great and object to gather and abstract it.