test-compat: backed out changeset ba1e83c841f2 Preparing the branch for 4.8.

test-compat: backed out changeset b0084d599112 Preparing the branch for 4.8.

test-compat: backed out changeset e2d083cc447e Preparing the branch for 4.8.

test-compat: backed out changeset ccbfbeee6cf3 Preparing the branch for 4.8.

test-compat: backed out changeset 7091f7215651 Preparing the branch for 4.8.

test-compat: backed out changeset 8eec9422bd8e Preparing the branch for 4.8.

branching: merge stable into default

branching: start test compatibility branch for Mercurial 4.7 Mercurial 4.8-rc0 have been released

topic: add the changelog argument to branchinfo() 47c03042cd1d in core added a changelog argument to revbranchcache.branchinfo() and we wrap that function in topic extension. So let's add this optional argument in topic extension too.

evolve: adapt for changed @command decorator Core changed the hacky "^command" syntax to be a proper decorator option in fa88170c10bb (help: adding a proper declaration for shortlist/basic commands (API), 2018-10-12). This patch makes evolve compatible with that.

topicidx: stop assigning index number to obsolete changesets Obsolete changeset are no longer part of the stack, the old logic tried to assigns them the index of their successors but this is flacky and error prone. So we stop doing so.

stack-index: add some test featuring content diversion This will be useful to display various issues.

pullbundle: drop erroneous flagging of the command as basic This is a debug command, not a basic part of the UI.

topic: add the changelog argument to branchinfo() 47c03042cd1d in core added a changelog argument to revbranchcache.branchinfo() and we wrap that function in topic extension. So let's add this optional argument in topic extension too.

topics: "prairie" is a not an animal (AFAIK, anyway)

tests: remove a"| head -n 2" that just hides an error code The output from core used to be longer and it made sense, but no longer does. CORE-TEST-OUTPUT-UPDATE: 5199c5b6fd29

evolve: adapt for changed @command decorator Core changed the hacky "^command" syntax to be a proper decorator option in fa88170c10bb (help: adding a proper declaration for shortlist/basic commands (API), 2018-10-12). This patch makes evolve compatible with that.

commands: adjust metavariables as appropriate Apart from looking better in hg help command, these strings are also helpful when generating shell completions programmatically.

branching: merge with default

branching: preserve the expected output on default

evolvecmd: use modern vocabulary in help text for evolve

evolvecmd: mark flags with old instability names as deprecated

packaging: mark as development version

Added tag 8.3.0 for changeset 45d4b49d81d9

packaging: prepare release 8.3.0

pullbundle: document working version and update changelog to mention it

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

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

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge stable into mercurial-4.6

topic: fix '{topicidx}' keyword registration for mercurial <= 4.5

branching: prepare release 8.3.0

test: other harmless output change These are new test that need adjustment for 4.7 output.

changelog: mention the fix of cache warming on hg strip

test: backed out output changes from changeset 6f391c2a773b

test: backed out test output changes from changeset ef22eef37ecc

test: backed out output changes from changeset 0171a7ceb574

test: backed out output changes from changeset dfa69b5ece87

test: backed out output changes from changeset 01ad46551d7c

prev: also use stack shortcut in output when possible This mirror what `hg evolve` is doing since cc3a0b13ae57.

next: also use stack shortcut in output when possible This mirror what `hg evolve` is doing since cc3a0b13ae57.

branching: merge stable into default

rewind: alias the command to undo This is a step in unifiying rewind and undo and not talk about them as different commands or concepts. If there exists rewind command, that should be an alias of undo and the vice versa. The exact implmentation detail and how the command works etc. is a different thing but there should be just one command.

changelog: add a line about the usage of s# in evolve

caches: no longer warm the cache on strip in "auto" mode Before this patch, a strip would trigger a full and blind cache load that would include the stablerange cache. In repository like Mozilla this was a bit painful. The default "auto" mode now behave has intended.

evolve: use stack alias s# in `hg evolve` msgs As repository grows revision number lose their usefulness. To make it a little better than now, after this patch we will be using short stack aliases introduced by the topic extension (as displayed by `hg stack`). These stack aliases s# will be used only when user has enabled topic extension and his repo's current active topic is same as the revs to be evolved. For now, this patch doesn't cover `continue` case. I will discuss about this with Pierre-Yves David. Maybe we have to store the info in evolvestate that "we were using stack aliases".

evolve: extract displayer to _solveone() I extracted this displayer method to _solveone() so that it would be easy to pass a different template to show evolve msgs. In upcoming patches we will be using stacktemplate in some cases where we want to include stack alias s# in evolve msgs.

utility: add a template alias that will be used in evolve msgs This template use stack alias s# instead of rev number in messages printed when we run `hg evolve`. For example, this template's msgs will look like this: move:[s3] add aaa atop:[s2] add bbb move:[s4] add ccc I will be using this template in upcoming patches.

topic: add topicidx template keyword This keyword will be useful where we want to see the index of the changeset in the stack when we run `hg stack`.

changelog: fix version number

tests: update the test-topic.t with changes in core mercurial Yuya stabilized the -T option and now it's in help by default. CORE-TEST-OUTPUT-UPDATE: 0d703063d0c8

pullbundle: fix style warning

pullbundle: improves management of multiple branch while dealing with a head There were still case where a range was issued too early.

pullbundle: deal with head in a predicable order We use node order to make this repeatable from one clone to another. This is an arbitrary pick.

pullbundle: deal with another special case introduced by arbitrary ranges previous, we dealt with the case where the tippest subrange of the stable parent was too long. Now, we need to deal with the case where it is too small.

pullbundle: compat with Mercurial 4.7