branching: start branch for test compat with Mercurial 4.8

test-compat: reverse test change from 9bce7e6c18b3 This change are 4.9 only

test-compat: reverse test change from db87432df8de This change are 4.9 only

test-compat: reverse test change from ac39cfb5bddd This change are 4.9 only

branching: merge stable into default prior to new version

branching: merge wit stable

obsdiscovery: use consistent filtering during discovery If we computed revision using an unfiltered repository, we should run the discovery unfiltered too.

evolve: make sure we don't stop after evolution of obsparent (issue5881) Before this patch, we were not handling the case when revset given by user also contain wdir parent which is obsolete. We were explicitly checking if wdir parent is obsolete, then update to its successor and return; without checking if we still have some revisions to be evolved. This patch make sure that after it update to the successor of obsolete parent it doesn't stop and continue to evolve other remaining revisions. Changes in tests/test-evolve-issue5881.t reflect the fixed behaviour.

evolve: extract "update" code into its own function This patch moves the code to a function which handles the case when wdir parent is obsolete and evolve will just update to its successor. And extraction of this to a function will also help us to fix the issue5881.

evolve: add test case for issue 5881

evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)

evolve: cover the orphanmerge part missed by lastsolved Let's cover the orphanmerge part also as it was missed at the time when we introduced "lastsolved". Chagnes in test-evolve.t reflect the fixed behaviour.

evolve: add test which shows orphan-merge resolution can result to crash It happens when there are still some revisions to evolve after evoluiton of a orphan-merge. And the reason behind crash is that `lastsolved` is not being updated and contain a wrong value which is now hidden. Next patch will fix this problem.

next: populate stacktemplate to the missed _nextevolve function

evolve: adapt for deprecated ui.progress() This makes a wrapper that has an interface like ui.progress() even though that's the old interface that will eventually go away. That's because it's a lot easier to convert from the ui.progress() to the ui.makeprogress() interface than the other way around. Once we no longer support hg<4.7, we can migrate our callers to ui.makeprogress() and drop the wrapper.

fold: sort concatenated commit messages in topological order It seems better to have the proposed commit message look the same whether the user ran `hg fold --exact -r . -r .^` or `hg fold --exact -r .^ -r .`.

topic: make revsets like 'foo#topic[0]' work Essentially, 'topic' relation subscript function is the same as 'generations', but is limited to revisions marked with one particular topic.

changelog: add an entry about the revset stack indexing

test: adapt output to minor behavior change CORE-TEST-OUTPUT-UPDATE: bad05a6afdc8

tests: remove unused variable and needless subshell in testlib/pythonpath.sh

branching: merge with stable

tests: conditionalize some output for Windows A couple of these were already present, but out of place.

test-pyflakes: use '/' when printing the files to check If paths are printed with '\', `xargs` sees the parts allsmooshedtogether, and pyflakes errors out.

tests: fix PYTHONPATH manipulation on Windows Without the semicolon separator and quotes, the variables ends up like this: c:\Users\Matt\projects\hg-evolve:c:\Users\Matt\projects\hg-evolve: c:\Users\Matt\projects\hg;c:\Users\Matt\projects\hg-evolve\tests; c:\Users\Matt\projects\hg\tests That in turn makes the local evolve code unreachable, and the system installed code is tested instead. I'm testing against `uname` instead of a trivial python script printing os.name because maybe one day tests will run on WSL.

exthelper: update documentation with some examples for using registrar aliases

exthelper: simplify the ability to register filesets Same mechanism as revsets earlier in this series.

exthelper: simplify the ability to register templates Same mechanism as revsets earlier in this series.

exthelper: simplify the ability to register revsets I think this is what Yuya and Boris agreed on.[1] This happens *after* the extsetup phase now (and after the _aftercallback notifications). But this is trivial, mergeable between exthelper instances, and doesn't need to have the extension name supplied when registering. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-December/125888.html

exthelper: support the option argument when registering a command Largefiles uses this 5th argument with push and pull, so this will be tested in the next commit. I assume the reason for unrolling and reforming the tuple in each finalxxxsetup() is to validate that something proper was passed in when registering. But it's better to explode when decorating than during the delayed actual registration.

exthelper: simplify configitem registration

exthelper: avoid a [] default arg to wrapcommand()

configitems: move the default values to the registrar decorator The exthelper refactoring of configitems stopped registering dynamicdefault for everything, which in turn causes a lot of warnings about mismatched defaults. There are a few stragglers- I didn't fix topic-mode because I wasn't sure what the default should be, and the alias for odiff was explicitly given a default for compatibility.

topic: make revsets like foo#stack[-1] work too We remove base commit when n < 0 because it's confusing to see base (which technically isn't a commit inside the stack) at both 0 and -n.

topic: make revsets like 'foo#stack[0]' work 'stack' relation subscript function is another way to refer to s0, s1, etc. But instead of aborting in many cases it will simply return an empty set.

exthelper: remove '_' in final_xxx() function names to conform to hg style

branching: merge with stable

packaging: mark as development version This avoid confusion when installing from source.

Added tag 8.3.3 for changeset 97b18934d6db

packaging: prepare version 8.3.3

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 mercurial-4.7 into mercurial-4.6

test-compat: merge stable into mercurial-4.7

evolve: detect unresolved conflict during evolve --continue (issue5966) Evolve --continue was ignoring unresolved conflict, proceeding with its operation without any check. This is now fixed. This test case was built and formalized by Matt Harbison and Anton Shestakov.

tests: filter out uninteresting log events Core has new ui.log() calls added (for tracking extension loading and performance, for example), but in test-discovery-obshashrange.t it produces a bunch of lines that are unrelated to the test. So we filter them out to not touch test output. This is inspired by 1de3364320af in core.

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 mercurial-4.7 into mercurial-4.6

test-compat: merge stable into mercurial-4.7

linter: silence rightful complains about unused variable

topic: merge _showlasttouched logic into _listtopics Makes --age work with --verbose.

topic: simplify _showlasttouched and _getlasttouched (and its data structure)

branching: merge with stable

split: add a --interactive flag While the interactive mode is useful for end-users, there are some cases where they don't need the interactivity overhead. Moreover, this allow the split command to be used in automated scripts.

split: take file patterns to limit selection on matching file patterns When splitting a big changeset, the user often wants to extract specific files from the changeset while leaving the others files intact. The split command can now be called with multiple file patterns. Only files that match one of the patterns will be shown in the interactive selection. The user will be able to create one or more commits with those files. When the user finishes splitting the matching files, a last commit will be made with the remaining of the files.

split: only accept explicit revision through the `-r` option We are about to introduce new non-optionnal arguments to defines files patterns. To avoid confusion and to be closer to the standard options, only accepts revisions with the `-r` option.

issue-6028: resolves 6028 - return (False, ".") instead of (False, '') Since 4.8, repo[] no longer takes an empty string, so we update to a valid with similar semantic. This value is strange and we should probably use an actual node ID here, however, this is an independent issue.

branching: merge with stable

tests: add sparserevlog cap since hg now has sparse revlogs by default CORE-TEST-OUTPUT-UPDATE: 3764330f76a6

split: rework the prompt to be more standard We dropped the initial capital and moved to a positive question.

split: add a option to discard remaining change during split This is useful to drop unwanted remaining change spotted during the split.

split: add a way to abort a split from the prompt This prompt is asking the user about the next step. Offering to abort there make sense.

split: add a help entry to the final prompt We are about to add more option in this prompt. Adding a way to document then seems like a good first step.

topic: make revset argument messages be similar to such messages in core

tests: don't forget to add hg serve pid to DAEMON_PIDS in test-wireproto.t Otherwise it leaves a process running after each run-tests.py launch.

test: adapt to change output change on default We now have a `wcache` directory in `.hg`.

safeguard: don't reimplement auto-publish if it's in core (will be in 4.9)

safeguard: the new default for auto-publish is 'publish'

stack: add a --children flag to stack If a commit in the stack has been merged outside the current topic, show a trailing status of (external-children)

extensions: avoid shadowing imported module names with exthelper methods The previous code worked, but confused pyscripter.

extensions: add fileset support to exthelper This will be tested by using it in lfs.

extensions: add uipopulate() support to exthelper

exthelper: clarify copyright and licence for the module The exthelper is quite useful and Matt Harbison is looking into having it upstreamed. We clarify the legal situation first.

packaging: merge with version 8.3.2

packaging: mark development version This help reduce the confusion when people install from source.

Added tag 8.3.2 for changeset 7edc5c148df0

packagin: prepare release 8.3.2

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 mercurial-4.7 into mercurial-4.6

test-compat: merge stable into mercurial-4.7

changelog: add information about the topic message improvements

branching: merge with stable

evolve: update the abort to a ProgrammingError This error should be a ProgrammingError and as Pierre-Yves David said ProgrammingError type did not existed when this code was written, so lets update this now.

topics: improve the message around topic changing The new message says 'cleared' when topic name is cleared, if we change to a new topic name, it mentions the new topic name too.

tests: fix for POSIX compliance * Mac ls will exit with a different message and exit code [1], replace with grep (which is what mercurial tests do) * POSIX echo has no -n switch, use printf instead

style: remove unused variables Both `as e` references are not used and can go.

evolve: fix a documentation typo

compat: drop 4.3 related obsfate code All the necessary piece are supported starting 4.4.

compat: drop code dealing with incompatibility for --publish with 4.3 We dropped 4.3 support.

compat: clarify when some conditional are used The middle condition was an intermediate state that never existed into a release. We can safely drop it.

compat: drop 4.3 "new troubles" report code This is supported natively for Mercurial 4.4 and above.

compat: drop 4.3 wrapping of createmarker for effect flag support This is supported natively in 4.4 and above.

compat: drop 4.3 monkey patch of `copies.mergecopies`

compat: drop 4.3 compatiblity code for `obsutil.allprecursors` function

compat: drop 4.3 compatiblity code for `ui.edit` method

compat: drop 4.3 compatiblity code for 'successors' revset

compat: drop 4.3 compatiblity code for 'precursors' revset

compat: drop Mercurial 4.3 support for exthelper The last release email noted plans to drop 4.3 and 4.4 support in the next feature release. I'd like to move this code into core, and dropping this should allow the class to be copied in unmodified.

compat: update metadata about minimum ag version

next: solve the issue of `next` get confused by split This patch solve a problem of next command which get confused by split. Let me describe how it was getting confused: Initial state of repo: A---B---C After splitting B to (B1,B2): @ A---B1---B2 \ ---B---C X * (note: C is orphan; checkedout to B1) Lets make an amend on B1: @ B1' / A---B1---B2 \ X * \ ---B---C X * Now, if run `hg next` (--evolve is True by default now): $ it would give you choice to choose from B2 and C thinking that C could also be a possbile children for B1, instead of stablizing B2 on B1. I fixed this problem by filtering those aspiring children which can be stablized on one of the aspiring children itself. Changes made in test-prev-next.t shows the changed expected behaviour.

next: add test which shows that `next` get confused by split

cleanup: avoid a Yoda condition

evolve: modify and move the comment to appropriate position

next: update the command description Now, if necessary next command evolve the next child revision by defualt. You don't need to pass the --evolve flag.

next: make next command --evolve by default Before this patch, if we need to evolve to update to the next child, we were suggesting the user to use --evolve flag. This patch make some changes to evolve by default in that conditions. After making next command to evolve by default we have to consider the following points: 1) If we don't need to evolve while updating to the next child: a) And if wdir is dirty, we suggest to use --merge flag b) if wdir is clean, we simply update to next child (if ambiguous, prompt the user to select one) 2) If we need to evolve: a) when wdir is dirty, we suggest the user to use `hg shelve` first, to make wdir clean. As we don't support --merge while evovling. b) when wdir is clean, we evolve the next cset. Changes made in test-prev-next.t reflect the changed behaviour.

safeguard: allow push to succeed (and without warning) with --publish

topic: only add --publish flag to push if it's not already there

safeguard: check auto-publish value before sending listkeys command Always sending listkeys command is just wasteful, let's first make sure users even care about auto-publish behavior.

style: silence another flak8 warning Default should be green now.

oops: backed out changeset df22f010cf24 pushed by error The changeset still fails some test

next: make next command --evolve by default Before this patch, if we need to evolve to update to the next child, we were suggesting the user to use --evolve flag. This patch make some changes to evolve by default in that conditions. After making next command to evolve by default we have to consider the following points: 1) If we don't need to evolve while updating to the next child: a) And if wdir is dirty, we suggest to use --merge flag b) if wdir is clean, we simply update to next child (if ambiguous, prompt the user to select one) 2) If we need to evolve: a) when wdir is dirty, we suggest the user to use `hg shelve` first, to make wdir clean. As we don't support --merge while evovling. b) when wdir is clean, we evolve the next cset. Changes made in test-prev-next.t reflect the changed behaviour.

next: improve the message for dirty working copy with --evolve This will be important soon when --evolve will be the default.

next: use the `hint` argument of bail if changed The argument is availabel since Mercurial 4.1. So let's use it.

prev: use the `hint` argument of bail if changed The argument is availabel since Mercurial 4.1. So let's use it.

next: explicitly specify --no-evolve in the tests The default value for this flag is about to switch.

branching: merge with stable