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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge mercurial-5.2 into mercurial-5.1

test-compat: merge mercurial-5.3 into mercurial-5.2

test-compat: back out changeset 591a0afd2ef3

test-compat: back out changeset 51e38bf936cf

test-compat: back out changeset 4da1d21231ae

test-compat: back out changeset 7d0d066329f4

test-compat: create a compatibility branch for Mercurial 5.3 Mercurial 5.4 have been released, so the stable branch is no longer about 5.3.

Added tag 10.0.0 for changeset 0b5d1b0b3336

packaging: prepare evolve version 10.0.0

changelog: update for evolve 10.0.0

branching: merge into stable in preparation for release

utility: deal with having multiple When a revision has multiple prune obsolescence markers, it's thought to be a split, and the way we try to deal with splits currently crashes.

changelog: summarize the last couple of features

obshistory: create _fatemarkers() similar to _originmarkers()

obslog: makes --origin flag the default Test change have been carefully validated.

obslog: add a --origin flag to show predecessors instead of successors This flag will be turned on by default in the next changeset.

obslog: add preliminary support for showing predecessors This functionality is not yet used right now, but will be in the next patch.

obshistory: add _originmarkers() function to be used for obslog --origin

evolve: rename `evolve_source_*` to `divergence_source_*` This makes it clearer that this comes from divergence resolution.

evolve: mark new hash-salting extras keys as uninteresting for effect flag The user doesn't care if the `evolve_source_local`/`evolve_source_other` values in the extras changed, so this patch adds them to the blacklist that already exists for that purpose. This should also fix the flakiness we've seen in some tests. The flakiness seemed to stem from `mercurial.obsutil.geteffectflag()` not sorting extras keys. That means we ran into it relatively often for the `evolve_source_local`/`evolve_source_other` keys because there were two of them. That sorting bug should be fixed upstream.

evolve: handle relocation during divergence resolution producing no changes When resolving divergence and the two divergent commits have different parents, we start by rebasing one of them to have the same parent as the other. That step can result in no changes to commit. When it does, we would crash with a TypeError before this patch. This patch fixes it by instead creating an empty commit in that scenario. The existing code then continues to attempt to merge it, which produces no changes, and no commit is created on top. The other side of the divergence is marked as successor as usual, so orphans from the side that became empty will be evolved to the right place (see test).

tests: show crash from divergence resolution resulting in empty commit When relocating a commit results in an empty commit (because the changes are already in the destination), we get a TypeError from evolve.

evolve: always create commit when resolving divergence When resolving content-divergence, the final commit we create may end up empty (which means that Mercurial won't even create it). We've had code for handling that in evolve ever since 41bf6c27a122 (evolve: stabilize now handle conflicting changeset, 2012-08-23). However, that resolved the issue by marking on the divergent commits as successor. As Pierre-Yves has pointed out (in other code reviews), we should instead be creating a new successor. So that's what this patch does. It does that by setting `ui.allowemptycommit` while creating the final commit. However, that is not enough, because we may end up creating the same nodeid as already existed (we'd then end up trying to mark the "new" commit a successor of itself). To solve that, we add some salt to the commit extras. That salt affects lots of tests.

tests: replace an X+X revset with something meaningful The change in aab2afc2bd82 seem to have been make too hastily.

tests: update section headers and comments in obslog-related tests

tests: use common obshistory_setup.sh script instead of manual setup This is now consistent with other test-evolve-obshistory*.t tests.

tests: remove "second diverged revision" from a phase divergence test It was basically testing the same thing twice with a different comment.

obshistory: omit duplicate notes of obsolescence operations When folding changesets, it's possible to provide a --note flag to e.g. fold or prune, which will store a note for that operation. But since there would be more than one marker for the fold operation and the provided note would be stored in all of them, _markersnotes() previously would return the same text message many times. We don't really want to see the same thing over and over, so let's make notes a set(). This will also make unrelated operations with the same note show the message only once, which is probably an improvement too.

changelog: adjust The changes only apply to newly created sqlite database. There are code pathes that drop existing ones, but that's a more complicated condition.

changelog: mention the sqlite fix

evolve: extract function for relocating divergent commit There was some duplication here, so let's extract to a function. I'm going to add a little bit more shared code next.

caches: preserve permissions of top-level .hg When using hg on a shared filesystem on UNIX, cache files normally inherit the permissions of the .hg directory. This is most commonly used to ensure everything is writable by all users. The sqlite3 cache files don't have a way to directly set the permission, so check if a special mode is necessary and try to apply them to newly created database files.

changelog: mention obsorigin template keyword

templatekw: add obsorigin keyword

obshistory: add predecessorsandmarkers()

obshistory: add a function to group predsets by fold-id

obshistory: add _predecessorsverb() similar to _successorsetverb()

obshistory: add a docstring to patchavailable()

tests: avoid referring to commits by hash in a few places This patch means that the next patch can be written without manual editing of the test cases.

tests: add more verification of output to divergence tests It's not obvious what the obsmarkers should look like in these tests and adding them highlights a bug that happens when commit we create to resolve the divergence doesn't get created because it would be empty. I also added a few graphlog calls to check that the divergence-resolution commit is in the right place (has right parentage).

tests: add debugobsolete calls before many obslog calls As requested by Pierre-Yves. The main reason is to catch superfluous creation of obsmarkers, as well as any future changes to how the obsmarkers get created.

stablerangecache: sanity check subranges Try to detect invalid conditions on insert as would result in deep recursions and final aborts much later. This has been observed on two different machines and the check makes it hopefully possible to find the origin of the problem.

obslog: use unfiltered repo for --no-graph implementation too repo.unfiltered() is used for graph version of obslog, because if we want to filter non-local changesets, we only have to provide --filternonlocal flag on the command line and _nodesandmarkers() will handle filtering. But that means for obslog without -f to work correctly we need to provide unfiltered repo to that function. With this patch both implementations of obslog (--graph and --no-graph) see the same repo.

tests: don't assume that echo will unescape \\

tests: avoid non-portable sed command sed -i is a GNU extension and the i command without newline as well. Just create the file from scratch with printf to side-step the issue.

tests: check for file existance in a portable way The precise output of ls is highly OS specific, so just use the simpler test command.

tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems ls on 2BSD derived systems historically defaults to -A for root, so use it unconditionally for consistent results.

tests: silence potential warnings about uname -o The option is not supported on the BSDs, but also not relevant as it is only used to detect msys.

evolve: remove unused divergenceflag and splitflag of MultipleSuccessorsError

evolve: consider all obsolete ancestors when finding new parent for orphan Both the old and the new logic have in common that the orphan changeset is moved to the tipmost successor of one or more ancestors of the orphan changeset. The previous logic considered only the first non-pruned ancestor of the orphan changeset. The new logic considers all obsolete ancestors of the orphan changeset. The logic in _possibledestination() had to be changed to be consistent with the new logic.

py3: fix debugstablerangecache

topic: provide cache to successorssets() in _singlesuccessor() Since we're using obsutil.successorssets() in a loop, it may help performance to have cache.

evolve: provide cache to successorssets() in _singlesuccessor() Since we're using obsutil.successorssets() in a loop, it may help performance to have cache.

evolve: provide cache to successorssets() in _possibledestination() Since we're using obsutil.successorssets() in a loop, it may help performance to have cache.

obslog: support --all with --no-graph

obslog: support --filternonlocal with --no-graph

obshistory: restructure templates a bit, drop default verb ("pruned") We always have a verb provided to the templates now, this should be fine.

obshistory: prepare data for displaymarkers() in a separate function

obshistory: make patchavailable() handle predecessors too

tests: make sure not to test the same thing twice A block under this one already tests obslog --no-graph with -f. Right now there's no difference in output, but maybe some day obslog --no-graph will actually support --filternonlocal.

obshistory: rename precursors to predecessors in displayrevs()

obshistory: rename _debugobshistorydisplaymarker() to displaymarkers() Apart from the obvious change, the function now can show multiple markers, not just one.

obshistory: rename graph/revs-displaying functions Same idea as the previous patch, but with a "display" prefix.

obshistory: rename node/ctx-displaying functions Not just for debug, and yes we know it's obshistory-related.

branching: merge with stable

topic: use generationssubrel less directly, because it was recently renamed

auto-publish: issue the capabilities in all cases It seems better to message client that we support the capabilities in all cases.

packaging: add an entry to debian/changelog mentioning the previous change

packaging: bump minimum required version of mercurial in debian/control

[debian] package 9.3.1-3 for bionic ubuntu

tests: update output to match 1b8fd4af3318 in core CORE-TEST-OUTPUT-UPDATE: 1b8fd4af3318

manifest: now that there's only one legacy.py, exclude it After the last patch, this file is only included because of package_dir in setup.py (i.e. just once), so we can ignore it with just one clause. But package_dir starts with "./", so we need to add it to the pattern.

manifest: don't include .py files from hgext3rd/ twice They are already included by default because we've given package_dir to setup().

manifest: just include all .py .sh and .t files from tests/ recursively

manifest: make sure exclusions and prunes are last, because order matters

branching: merge 9.3.1 release into default

packaging: mark as developer version

Added tag 9.3.1 for changeset 8d955635cf45

packaging: prepare version 9.3.1

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge mercurial-5.2 into mercurial-5.1

test-compat: merge stable into mercurial-5.2

topic: hg <= 4.8 compatibility for wrapping exchange._checkpublish() phase-divergent update to 1a81bbc94d45:

branching: merge with stable

topic: check that exchange._checkpublish() exists before wrapping it

head-checking: also test single head enforcement with topic They are an important part of why we want this.

head-checking: ignore obsoleted section when checking head creation locally Same as for the server side check, these do not need to be taken in account.

head-checking: ignore obsolete section when checking for single heads This overwrite the core code that enforce single heads to ignore obsolete section. That way older obsolete version of a branch no longer prevent the new version to be pushed.

head-checking: update changelog

head-checking: add test variant mixing branch and topics

head-checking: add test variants with topics

head-checking: backport fix from 7d5455b988ec See 7d5455b988ec for details. Having a version in the evolve repository allow us to check the behavior when topic is enabled. It will also become the base of further head checking fix and topic compatibility.

head-checking: filter out obsolete heads when checking for new heads This does not affect any tests right now, but this will be useful for the next changeset. This is also the start of a more aggressive removal of obsolete heads in places where it does not make sense to take them into account.

topics: fix auto-publish=abort with servers publishing bare branches Before this change, servers that automatically publish bare branches were detected as "non publishing" and the check for automatic publishing on push assumed nothing was to be published. Now we signal the server-side config to clients via a new capability so that they can adjust their behavior.

evolve: fixed some typos in stablerangecache LONG_MESSAGE (issue6279) phase-divergent update to bf37ba1c80ee

evolve: fixed some typos in stablerangecache LONG_MESSAGE, fix #6279

evolve: fixed some typos in stablerangecache LONG_MESSAGE, fix #6279

branching: merge stable in default

WIP: fix

WIP: rotate loop

WIP: test

build: make docs/conf.py compatible with py3 I don't even know what this file does, but it made our Debian build fail on py3 because it attempted to pass unicode to `mercurial.ui.setconfig()`.

obshistory: add _debugobshistorydisplaypredsandmarkers() and test it

obshistory: make patchavailable() handle predecessors too

templatekw: add obsorigin keyword

obshistory: implement predecessorsandmarkers() for obsorigin

fold: proposal for output improvement Listing other changeset we got folded with seems like a good idea. We need to think about the case where changesets we got folded with is filtered.

obslog: add display of precursor information to the default template This will still only be output when the user passes --precursors to the command (otherwise the data just won't be there). This addresses a common user request, where they actually would find more intuitive to use --precursors --no-successors.

obslog: add flags to control the output of precursors and successors With just this change, precursors are only shown in structured output.

obslog: extract display of a markers to its own function

tests: allow an empty merge commit to have tests pass without too many changes Not the greatest fix, but this allows us to have the same test case for all versions of Mercurial. Hash of 29 changes because instead of both parents only one is set in hg 5.3.

uncommit: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes potential quick-access desync problems where repo[b'.'] would be different from repo.dirstate.p1().

touch: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes potential quick-access desync problems where repo[b'.'] would be different from repo.dirstate.p1().

evolve: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes an actual quick-access desync problem where repo[b'.'] would be different from repo.dirstate.p1(), as demonstrated by test-evolve-phase-divergence.t when ran on hg 5.3rc0 and later. Modified _uncommitdirstate() too, because it is used in dirstatedance(), which sometimes follows repo.setparents() calls.

tests: demonstrate that evolve swaps parents of merge commits Tests currently pass, don't forget to change FIXME items.

ci: cache pytype-related files between runs

evolve: add pre-check logic for creation of phase divergence locally Changes in tests reflect the added behaviour.

evolve: add test to show that user can create phase-divergence locally After resolution of phase-divergence, user can locally create phase-divergence by rewriting the old bumped (obsolete now) changeset. Next patch will be adding the pre-check logic for creation of this phase-divergence.

evolve: remove unnecessary code since it's been covered already We don't need this logic any more since the case of "two divergent csets where one is the parent of other" has been handled correctly by the logic present in method _prepcontentdivresolution() This is how things works in method _prepcontentdivresolution() for our case i.e "content-divergence with parent-child relation": cset_b (content-divergent) | cset_a (content-divergent) | ~ Acc. to revision selection criteria: "divergent" = min_revision(cset_a, cset_b) So always "divergent" will be cset_a and "other" will be "cset_b" and resolution parent will be the successor of parent of cset_a Both the csets will be merged and resolution cset will be based on correct revision. The result could be wrong only in the case when "divergent" is cset_b which is not possible acc. to the current logic.

test: no need to look at full log

evolve: refactor content-divergence resolution logic > What is the case we are looking at? This is about refactoring the part of content-div resolution logic where it decides which cset should be relocated and where. > What is a "topologicial common ancestors" vs a "greatest common ancestors"? `tca` is an ancestor which we can decide/find by looking at the at graph visually for e.g ``` c3(*) c4(*) | | c2(x) c1(x) c5 | / \ | / c0 ``` (c5 is the successor of c2 and c1) now here, `tca` of c3 and c4 is: c0 `gca` of c3 and c4 is: c5 > What is the new top-level logic/behavior that makes it better? The old code had some unnecessary edge cases just because we were using `gca`, since it can point to a revision that is not a topological ancestor. For e.g see b779b40f996e Eventually, the code around this was getting messy unnecessarily. So I looked into it and found a simple and more robust approach. And in new code, it is simple and straightforward (and easy to understand), where we handle the following 4 cases when solving content-div: 1) when both are on the same parent => (no need to do anything special, and simply proceed) 2) both are on the different parent but a) `tca` is the parent of one of them or b) there is no non-obsolete revision between `tca` and one of the divergent cset. => (relocate one to the other side and proceed) 3) both are on different parents and `tca` is not the parent of any of them and there is at least one non-obsolete cset between tca and both the divergent cset i.e (tca::div1) and (tca::div2) both the ranges have at least one non-obs revision. => (this is the case which we don't handle yet, but the solution would be to prompt the user to choose an evolve destination.) 4) both are in the parent-child relation => (both are merged and new cset will be based on the successor of `tca`) Changes in test-evolve-issue5958.t demonstrate that new code also covered case4 because in a resolution of "two divergent csets with parent-child relation" there should be one cset as a result and no orphan revs (as you can see there was an orphan before this patch).

evolve: remove duplicated code See at line 500.

evolve: make necessary changes in a test to reflect a fix in next patch

evolve: add quotes around the action in msg of pre-checking

metaedit: use pre-checking before rewriting csets Changes in test file demonstrate the changed behaviour.

evolve: update the pre-check message for risk of orphans

evolve: add pre-check logic for creation of phase divergence locally Changes in tests reflect the added behaviour.

evolve: add test to show that user can create phase-divergence locally After resolution of phase-divergence, user can locally create phase-divergence by rewriting the old bumped (obsolete now) changeset. Next patch will be adding the pre-check logic for creation of this phase-divergence.

evolve: remove a check which is already done by rewriteutil.precheck() We have tests to check if fold is being performed on public cset. There is no changes in test files because testing that never touched the part this patch removes, and already caught in rewriteutil.precheck()

evolve: add pre-check logic for content-divergence in rewriteutil.precheck() For now, pre-check will abort if rewriting a rev create divergence (and config experimental.evolution.allowdivergence is not set to True). But this behaviour can be improved where instead of abort maybe we can confirm the user to either proceed with divergence or some other options depends on what command user is running. Changes in test file are used to overrides the pre-check for testing purpose (using experimental.evolution.allowdivergence=yes).

topic: make in-memory rebase preserve topic The override code thought that `__init__` would return the runtime instance, but it's actually the first argument to the function (the `self` argument), so the code had no effect at all before this patch. I think the bug only affected in-memory rebase because the in-working-copy rebase used the current topic, which was set correctly since 5156a67f66a6 (topics: update current topic to the topic of newly rebased commit (issue5551), 2017-06-29).

Temporary commit for time measurement of test file + pandoc

ci: Add CI job for building the documentation

tutorial: compile the tutorial in rst so it can be included

tutorial: run the tutorial test file to update to latests ui messages

ignore: fix hgignore to point to the correct folder Files might have been imported initially as docs/training but were moved to docs/tutorial and the hgignore was likely forgotten.

stack: rename stack.revs into stack.indexedrevs They are accessible by an index, and are sorted. But they don't include all revisions for show in showstack().

stack: return from behindcount() early Reduces indentation.

stack: use self._revs in stack.behindcount() This code also doesn't care about the order of revisions, it just wants all revs except stack base, and that's what self._revs is.

stack: use self._revs in stack.heads() No code cares about the ordering of the heads anyway, so let's use the unordered property that doesn't need to be sliced (because it doesn't include base).

pick: Add a test to check that pick pick the right content

WIP on handling stacks

test: add a test for current behavior of precursors revset The precursors revset currently returns the closest predecessors of a revset. If these predecessors are not known locally, it returns an empty list.

obshistory: give a more correct name to a variable This variable holds a list of predecessors, which obslog presents to graphmod as parents so the latter could understand the data without the need to introduce another graph edge type specifically for predecessors. Also remove debug comments.

tests: unindent lines that only have one leading space One space is not even defined in our .t files syntax.

rewind: make __rewind-hash__ extra field be bytes

touch: make __touch-noise__ extra field be bytes

branching: merge with stable

evolve: fix some documentation grammar/typos

evolve: fix some documentation grammar/typos

changelog: mention the recent evolve improvements

tests: merge two tests about split changesets Because the removed test case is essentially already included in the succeeding one, the tests are merged by removing the first.

evolve: support successors of ancestor of orphan with multiple roots The previous code checked that the set of successors has a single root. However, there’s no reason to require that in general. Example: o 6 | o 5 |\ | o 4 | | o | 3 |/ | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3, 4 and 6. We are considering the case when 2 gets evolved. The roots are [3, 4] and the heads are [6]. Before the change, the user was asked which destination to choose, but there was only one choice (6). After the change, 6 is chosen as the destination.

evolve: support ancestor of orphan split with unrelated changeset in between This is done by searching for roots and heads within the range delimited on both sides by the target revs instead of just within the target revs. Example: o 5 | o 4 | o 3 | | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3 and 5. We are considering the case when 2 gets evolved. Before the change, both roots and heads were [3, 5]. The user was offered a choice between 3 and 5 as the destination. After the change, roots are [3] and heads are [5]. 5 is chosen as the destination.

exchange: deal with empty obscommon The case can happen, we better support it.

topic: compat with tr.changes[b'phases'], it's now a list

topic: fix compatibility issues caused because of change in transaction API In 36f08ae87ef687be53a59bd87376bcfbe4479205 in core mercurial, `_validator` attribute to transaction class was removed and a dict was introduced. It added a `addvalidator()` function to transaction class which can be used to register multiple validator callbacks. This updates the code to use `addvalidator()` when `_validator` attribute is not present.

obsexchange: fallback to simpler request for dumb http server If the http server cannot accept many arguments, avoid sending too large requests (at the cost of more data exchanged). A better solution would be to aggregate contiguous range, but this is a question for later.

obsexchange: swap the 'common' and 'missing' clause

obsdiscovery: avoid considering locally hidden changeset This looks like a dubious optimisation

obsdiscovery: add a test where some common node are hidden This is useful to prevent regression.

tests: use appropriate Python (2 or 3) for dummyssh

evolve: add missing 'of' in message The message refers to the changeset that is currently evolved. Therefore the message needs an additional 'of' to be correct.

test: fix graph label in test-push-checkheads-pruned-B5.t They were wrong.

readme: mention compat string format

readme: copywrite the section about branch policy, wrap long lines

compat: update hg-X.Y compat comments and test them

contrib: add a script to check release in compat comments that have node hash

changelog: add an entry about the cleanup

evolve: drop compat for pre-4.5 context.memfilectx()

compat: update a couple of obviously outdated version comments

evolve: drop pre 4.0 compat for dirstate.parentchange()

evolve: drop 4.5 compat for scmutil.resolvehexnodeidprefix()

evolve: drop 4.5 compatibility for patch in tryimportone()

evolve: drop 4.5 compatibility with `patch.extract` API

evolve: drop 4.5 compatibility for template keywords

topic: drop 4.5 compatibility for template keywords

compat: drop 4.5 compatibility for strdiff

compat: drop 4.5 compatibility layer for log utility

compat: drop 4.5 related compatibility around wireprotocol module

compat: directly use status attribute instead of the compat layer With 4.5 dropped, this compat layer is no longer needed.

compat: directly use function from dateutil Since support for 4.5 have been dropped we no longer needs this indirection.

compat: drop 4.5 compatibility for `_filterederror`

compat: drop import compatibility <= 4.5 for `forcebytestr` We no longer support 4.5

tests: adapt now that Mercurial clears the merge state for empty wdir `hg evolve` forgot to clear the merge state when its attempt to commit resulted in no commit because the working copy had no changes. That resulted in test-evolve-issue5967.t showing a conflict state that shouldn't be there. The responsibility for clearing the merge state was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear resolved mergestate even if working copy is clean, 2020-02-28), so the bug is now fixed in `hg evolve`, which impacts that test case. CORE-TEST-OUTPUT-UPDATE: 6a34e438461b

tests: add more involved tests for obslog -T now that everything is a property

obslog: remove the separate "obslog -f" implementation and use the common one

obslog: provide successors and multiple markers to marker-displaying function

obslog: make date template property into dates

obslog: make note template property into notes

obslog: make operation template property into operations

obslog: make user template property into users

obslog: have at least one test that shows multiple dates with -f flag

obslog: use fm.data() instead of fm.write() because it's all templates now

tests: add checkheads-related cap CORE-TEST-OUTPUT-UPDATE: edc8504bc26b

branching: merge stable back into default evolve 9.3.0 have been released.

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge mercurial-5.2 into mercurial-5.1

test-compat: back out changeset 2371d40f0878

test-compat: back out changeset bb2042ff6444

test-compat: merge stable into mercurial-5.2

packaging: mark as developer version

packaging: add tag 9.3.0 for changeset 583dc6ef3eb2

packaging: prepare version 9.3.0

branching: preserve test change on stable CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2

topic: extend topic gating to descendant If a changeset with topic as descendant without topic, we need to exclude them too when using: topic.server-gate-topic-changesets.

changelog: more entries for 9.3.0, sorting

compat: fix subsettable import for mercurial <= 4.8

compat: officialy drop compatibility with mercurial 4.5

test-compat: back out changeset 591a0afd2ef3

test-compat: back out changeset 51e38bf936cf

branching: merge into stable in preparation for release

branching: closing test-compat branch for mercurial-4.5

branching: merge with stable

tests: update graph output after core change CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2

fix: reinstall import from the right location

topic: option to hide topic changesets to plain client This is the first version of an option that make topic changeset hidden to client without the extension. It might become the default in the future.

readme: update heptapod link

py3-exceptions: wrap more Exceptions in forcebytestr before formatting

touch: allow divergence with -A even if allowdivergence=no This is a phase-divergent update to 731b5a89a784. 1f92a6aa40d6 (evolve: add pre-check logic for content-divergence in rewriteutil.precheck(), 2019-11-04) taught `rewriteutil.precheck()` to check for divergence. It also set allowdivergence=yes in test-touch.t to silence the error. However, if one does *not* have that set, it is no longer possible to allow divergence with `hg touch -A`. This patch fixes that.

touch: allow divergence with -A even if allowdivergence=no 1f92a6aa40d6 (evolve: add pre-check logic for content-divergence in rewriteutil.precheck(), 2019-11-04) taught `rewriteutil.precheck()` to check for divergence. It also set allowdivergence=yes in test-touch.t to silence the error. However, if one does *not* have that set, it is no longer possible to allow divergence with `hg touch -A`. This patch fixes that.

tests: add test of `hg touch -A` There didn't seem to be any before. It currently passes because the test case incorrectly (IMO) sets `evolution.allowdivergence = True`.

release-checklist: do not forget to move the '@' bookmark

topic: use `%d` for integers instead of `%s` on py3 I have system mercurial using py3 which lead me to the traceback pointing to this.

prune: actually track folds using fold-* metadata in obsmarkers

packaging: handle docs in a separate block in MANIFEST.in

packaging: simplify inclusion of docs in MANIFEST.in

packaging: simply prune some directories in MANIFEST.in in a dedicated block exclude+recursive-exclude is basically prune.

metaedit: replace a compat condition with a less specific proxy Same reasoning as for the previous patch. In this case, the closest commit I could find was 36 commits later (3d35304bd09b).

fold: replace a compat condition with a less specific proxy If `scmutil.cleanupnodes()` is overridden, the check in `scmutil.cleanupnodes.__code__.co_varnames` will fail. Let's use a less specific proxy for that condition so extensions are safely override `scmutil.cleanupnodes()`. I picked `util.safehasattr(scmutil, 'nullrev')` as the proxy. That basically checks for Mercurial commit d739f423bf06, which is two commits later than the commit we actually care about.

tests: drop useless "(glob)" for timezone offsets

changelog: obslog shows folds now

obslog: use _successorsetverb() in regular obslog too It was already used for obslog --filternonlocal.

release: do not forget to tweet about it

branching: merge with stable

release: fix a silly typo

branching: merge with stable

release: add missing checklist items

heptapod: add an issue template for new version

packaging: create a release check list This should help other to release version of evolve.

obshistory: add 'folded' to the list of precise verbs It's used for templates and for obslog --filternonlocal, but not for regular obslog.

metaedit: actually track folds using fold-* metadata in obsmarkers

fold: actually track folds using fold-* metadata in obsmarkers

tests: adjust test output for an early return in mergecopies() CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc

branching

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

Added tag 9.2.2 for changeset ef41094c34e1

packaging: prepare version 9.2.2

packaging: update tested with version We have tested this with 5.3rc so let mark 5.3 as tested too.

packaging: update changelog for version 9.2.2

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

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge mercurial-5.2 into mercurial-5.1

test-compat: merge stable into mercurial-5.2

tests: allow an empty merge commit to have tests pass without too many changes Not the greatest fix, but this allows us to have the same test case for all versions of Mercurial. Hash of 29 changes because instead of both parents only one is set in hg 5.3.

compat: add a context manager that calls _quick_access_changeid_invalidate()

evolve: provide branch argument to overlayworkingctx.tomemctx() This is related to upstream 2ecbc4ec87d8 and fixes test-evolve.t.

evolve: compatibility with copies.graftcopies() from hg 5.3

cmdrewrite: avoid accessing scmutil.status fields by index Support for indexed access is going away in Mercurial. Accessing the fields by name is clearer anyway.

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

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge mercurial-5.2 into mercurial-5.1

test-compat: merge stable into mercurial-5.2

tests: use --tool flag instead of --config ui.merge Makes this test not fail on older hg versions.

evolve: remove a check which is already done by rewriteutil.precheck() We have tests to check if fold is being performed on public cset. There is no changes in test files because testing that never touched the part this patch removes, and already caught in rewriteutil.precheck()

test-compat: create a compatibility branch for Mercurial 5.2 Mercurial 5.3rc have been released, so the stable branch is no longer about 5.2.

contrib: make merge-test-compat.sh more topic-friendly

contrib: shellcheck merge-test-compat.sh

evolve: add pre-check logic for content-divergence in rewriteutil.precheck() For now, pre-check will abort if rewriting a rev create divergence (and config experimental.evolution.allowdivergence is not set to True). But this behaviour can be improved where instead of abort maybe we can confirm the user to either proceed with divergence or some other options depends on what command user is running. Changes in test file are used to overrides the pre-check for testing purpose (using experimental.evolution.allowdivergence=yes).

evolve: rename a function to make it explicit

obsdiscovery: compatibility when importing forcebytestr()

heptapod-ci: add pytype job, allow it to fail for now

evolve: add a new method picksplitsuccessor() in utility.py This patch adds the logic to return a single successor of a rev which was split. If split revisions are on a single topological branch then we return highest one; otherwise prompt user to choose an evolve destination.

changelog: add missing entries

compat: also import datestr from dateutil

obshistory: remove unused ismetablacklisted() Code that used this function was removed in 461b9a91b662. But we still need to add one item currently missing from METABLACKLIST in core: touch noise.

obshistory: remove unused successorsetallmarkers() This function was used in code that was removed in 901186e1fe05.

obshistory: remove unused _successorsetdates() and _successorsetusers() They were used by preparesuccessorset() that was removed in the previous patch.

obshistory: remove unused preparesuccessorset() It was used in code that was removed in 901186e1fe05.

obshistory: use effect flags from obsutil They were added there in 51aadc0d0da2::187bc224554a (hg 4.4).

obshistory: make a {flag value: description} dict for _markerseffects()

obshistory: factor out _markerseffects()

obshistory: factor out _markerspreciseverb()

evolve: provide branch argument to overlayworkingctx.tomemctx() This is related to upstream 2ecbc4ec87d8 and fixes test-evolve.t.

changelog: mention all the cleanups as one item

templatekw: drop obsfatedata and related code AFAIU, this function exists so that people could hack together a replacement template for {obsfate} if they weren't satisfied with the default, but only on older versions. It seems that 3d0f8918351b::d0f1e3d3ef4d was the series introducing obsfate* functions that can show specific obsmarker properties, and that was included in hg 4.4. obsfatedata was already claimed to be removed in 35ffd7a4b339 and then more of its usage was removed in 9882fed37ea9. There are no users in evolve and in core hg, no tests and nothing else mentions obsfatedata.

templatekw: drop obsfateprinter() and obsfatelineprinter() They were unused (probably because their versions were already pushed to hg 4.4).

compat: drop isobsnotesupported() that checks if storing notes is supported The check is identical to checking if core has e27f1f04c2cf (hg 4.4).

templatekw: use literal set syntax According to https://www.mercurial-scm.org/wiki/SupportedPythonVersions, we don't support Python 2.6 since 4.3.

obshistory: remove obsfateverb/obsfateprinter patching compatibility obsutil.obsfateverb() was introduced in 3d0f8918351b (hg 4.4) and renamed in b81ad5b78a81 (hg 4.5). Considering the supported evolve versions, the first check is unnecessary (the condition is always True) obsutil.obsfateprinter() was introduced in e27f1f04c2cf (hg 4.4).

obshistory: drop unused keyword argument to _getobsfateandsuccs()

obshistory: use successorsandmarkers() from obsutil, drop local variant It's been in core since 4.4 and is identical to the version removed by this patch, except it returns None if ctx is not obsolete.

compat: drop code from 35b2d201eb71 (compatibility with hg 4.3)

tests: rename precursors to predecessors in test-evolve-templates.t

evolve: correct spelling of superseded everywhere else

evolve: use obsutil._getobsfate() directly It's been there since 4.5 (265cd9e19d26), we can safely rely on it. It's necessary though to use the correct spelling of superseded.

evolve: remove dead code

evolve: use utility._singlesuccessor() in _solveunstable()

evolve: preliminary indentation The whole code will end up in a try/except clause. We pre-indent the code to clarify the next patch.

evolve: provide cache argument to obsutil.successorssets() correctly After 68f3e819d41d (4.3) the 3rd argument to that function is `closest`.

pullbundle: random.sample() chokes on a spanset, turn it into a list instead On Python 3.

pullbundle: use % instead of .format() because % exists for bytes

tests: test that debugpullbundlecacheoverlap command works

pullbundle: compatibility for progress in hg <= 4.6

compat: add hg version to progress compatibility code

serverminitopic: ask pytype to disable import-error on a block handling hg 4.5

topic: ask pytype to disable import-error on a block handling hg 4.5

evolve: remove unused struct import

compat: ask pytype to ignore some warnings It's expected to have a bunch of import and attribute errors in this module because it's for compatibility with different versions of hg and Python. Although it doesn't explain why a function wouldn't have __code__ attribute? So far I think it's a quirk of pytype.

evolve: extract logic of pre-checking divergence risk to its own function Extracting the logic (which is used to check if rewriting an obsolete revision will create divergence) to a function. This function will be used in upcoming patches of pre-checking. This is how we check if rewriting an obsolete revision will create divergence. We need to check two cases: If there is any 1) non-obsolete successor. -> easily done by `obsutil.successorssets()` 2) precursor with non-obsolete successor. -> using `evolvecmd.divergentsets()`

heptapod-ci: skip test-evolve.t in tests-py2-pure job It seems pure mode on Mercurial 4.5 was broken in case of this test. The error was: Traceback (most recent call last): File "/tmp/hgtests.YoK65c/install/bin/hg", line 41, in <module> dispatch.run() File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 88, in run status = (dispatch(req) or 0) & 255 File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 183, in dispatch ret = _runcatch(req) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 324, in _runcatch return _callcatch(ui, _runcatchfunc) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 332, in _callcatch return scmutil.callcatch(ui, func) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/scmutil.py", line 154, in callcatch return func() File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 314, in _runcatchfunc return _dispatch(req) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 918, in _dispatch cmdpats, cmdoptions) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 673, in runcommand ret = _runcommand(ui, options, cmd, d) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 926, in _runcommand return cmdfunc() File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/dispatch.py", line 915, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/tmp/hgtests.YoK65c/install/lib/python/mercurial/util.py", line 1195, in check return func(*args, **kwargs) File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 1603, in evolve return _performevolve(ui, repo, **opts) File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 1726, in _performevolve targetcat, lastsolved) File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 1752, in _solveonerev lastsolved=lastsolved, stacktmplt=stacktmplt) File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 80, in _solveone lastsolved=lastsolved) File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 183, in _solveunstable keepbranch, b'orphan') File "/builds/mercurial/evolve/hgext3rd/evolve/evolvecmd.py", line 952, in relocate fullnode = unfi.changelog.index.partialmatch(sha1) AttributeError: 'InlinedIndexObject' object has no attribute 'partialmatch'

heptapod-ci: test python 4.5 with the pure version of Mercurial the evolve extension is currently broken on 4.5-pure. So we get it in its own commit.

branching: merge with stable

pullbundle: kwarg to changegroup.makestream() is called matcher Caught by pytype.

evolve: extract pre merging content-div csets logic to its own function

evolve: further simplify a conditional The case is simple enough to be handled on its own.

evolve: simplify some conditional extracted from a changeset of Sushil khanchi <sushilkhanchi97@gmail.com>

evolve: rename some variable ahead of time A refactoring of the content divergence resolution in on its way. use a distinctive name for some variable early to make the change easier to read later.

evolve: add logic to cover --stop when "divergent" relocation in play Changes in test file reflect the added behaviour. The intermediate changeset has been properly cleaned up by the `hg evolve --stop` call.

evolve: test to show that --stop is not working when "divergent" relocated Right now, --stop leave the intermediate changeset (relocating the divergent changeset to its new location behind). This this is an incomplete step it should be removed by `hg --stop`.

evolve: add test to show that --abort is working fine When resolving content-divergence where relocation of "divergent" changeset is also required, this test file make sure that --abort option is working fine.

evolve: fix a bug in logic to choose destination when no active topic

evolve: add test to demonstrate a bug when no active topic Added test shows that the logic to find the destination for `hg up` in the case when "working directory parent has a topic but wdir has no active topic" is buggy. This will be fixed in next patch.

evolve: fix a bug in logic of choosing destination for hg update

evolve: add test to demonstrate a bug when active topic is empty Added test shows that when current active topic is empty and we try to run `hg up`, it fails with an error. It's because this case is not correctly handled when we find a destination to update (when topics are in play) Next patch will fix this.

evolvecmd: fix a typo node->None

evolvecmd: avoid a ctx->node->ctx conversion

evolvecmd: mark relocate() private

cleanup: replace .parents()[0] by .p1()

evolve: add more tests for --continue case when relocating "divergent"

evolve: use meaningful variable names for a return value

evolve: add logic to cover --continue case when relocating "divergent" Changes in test file demonstrate the added behaviour.

evolve: add test for `--continue` case when relocating "divergent" This test shows that for now we don't handle the continue case when relocating "divergent" cset hit merge conflict while resolving content-divergence. Next patch will be adding the support for --continue case.

evolve: use more specific key name to store in evolvestate Now, as we also relocate divergent cset if required, so let's use more specific key to track the relocation of "divergent" and "other".

evolve: move a test where it makes more sense

evolve: remove the unnecessary condition to check empty successors set I annotated the history of this "newer == [()]" condition and found that it was added in the initial stages of evolution project (more than 8 years ago) and there is no test where we get [()] as a successor set. So looks like "if not newer" is enough to check if it is empty. I also looked into obsutil.successorssets() implementation and I don't think it would give us [()] in any case.

evolve: delete redundant and incorrect code for updating dirstate In relocate() when we notice conflicts, we will try to fix up the dirstate by calling copies.duplicatecopies() and dirstatedance(). However, we had called _evolvemerge() just before that point and that has already fixed up the dirstate, so there's no need to do it again. Also, we did it incorrectly as the test case shows.

tests: demonstrate how evolve loses transitive copies when interrupted Let's say `b` has been renamed to `c` in commit A and then renamed to `d` in commit B. We now modify A in a way that will cause a conflict when we evolve B. `hg evolve` will now stop and let the user resolve the conflicts, but it will have lost the copy information in the working copy (should still be c->d).

evolve: use ui.configoverride() instead of ui.backupconfig() ui.configoverride() was added in hg 4.1. util.nullcontextmanager() was added in hg 4.4.

topic: use ui.configoverride() instead of ui.backupconfig() ui.configoverride() was added in hg 4.1. util.nullcontextmanager() was added in hg 4.4.

topic: use ui.configoverride() instead of ui.backupconfig() ui.configoverride() was added in hg 4.1. util.nullcontextmanager() was added in hg 4.4.

evolve: use ui.configoverride() instead of ui.backupconfig() ui.configoverride() was added in hg 4.1.

evolve: remove obsolete backup of allowemptycommit config We stopped setting the config in 88601e1cd5d8 (evolve: create new commit while resolving content-divergence, 2018-04-23), so there's no need to back it up.

evolve: remove dead initilization of "newnode" variable It's been dead since f9dad99a90d5 (evolve: create a new commit instead of amending one of the divergents, 2018-06-13).

evolve: fix a typo

changelog: mention the python 3 fix

changelog: mention the date fix for content divergence

branching: merge with stable

py3: fix several TypeError formatting bytes with an exception object

evolve: preserve date when resolving content-divergence (issue6202) This patch changes the implementation to do a 3 way merge. In case of actual conflict, it take the newest date from both sides of the content-divergence.

test: add test for content divergence involving a date update In this case, each side update the date.

test: add test for content divergence involving a date update In this case, one side update to an earlier date.

test: add test for content divergence involving a date update In this case, one side update to an older date.

test: highlight data handling when solving divergence The current handling of date is lacking, we add test to highlight this.

evolve: add tests for the case when resolution parent is ambiguous

evolve: abort if deciding resolution parent is ambiguous While solving content-divergence, it could be hard to decide which cset should be treated as a resolution parent if there are multiple successors of divergent cset. i.e split case. But we are planning to make some update in handling this split case: 1) consider highest one if all splitted csets are in a single topological branch 2) still need to decide if 1) doesn't apply

evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.

evolve: add test to demonstrate issue6203 Current logic of content-divergence resolution contains a bug that if resolution parent is not the parent of any of the two divergent changesets, it could undo some changes. I think a good solution for this is to first relocate the divergent cset to it's obsolete parent's successor if applicable and then perform the content-divergence resolution. Next patch will fix the issue.

state: there's no _unpack in struct Caught by pytype.

amend: abort if both --patch and --extract are used

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

ci: add job to build and archive the documentation

tests: update now that merge.graft() doesn't set two equal parents This is a consequence of https://phab.mercurial-scm.org/D7549. CORE-TEST-OUTPUT-UPDATE: 32d11a23c9cf

evolve: fix content-divergence resolution when p1 is null (issue6201) Before this fix, in cases like in the added test, the revision number -1 of the parent was misinterpreted to mean the tipmost revision instead of the null revision, causing the content-divergence resolution to fail.

obslog: make {node} the full node and leave shortening to template It should be up to the user to shorten the nodeid as much or as little as they like.

branching: merge with stable

compat: accept "success" argument to lock._afterlock callback The callback gets a new "success" argument since Mercurial commit 888bd39ed555 (lock: pass "success" boolean to _afterlock callbacks, 2019-11-19).

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

test-compat: run tests with -j more than 1 In 4.7 and below run-tests.py defaults to -j1. We want more speed, so we use the same mechanism to detect the available number of CPU threads as the newer versions of run-tests.py.

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: don't run the py3 test on the older branches

docs: add missing Figure 10 to sharing.rst The .svg file itself has been already added earlier.

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

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0

test-compat: merge stable into mercurial-5.1

heptapod-ci: add a script to map evolve branch to mercurial revision for tests map-hg-rev.sh can be tested using this command: ```sh for i in $(hg log -T '{branch}\n' | sort -u); do echo $i $(testlib/map-hg-rev.sh $i) done ```

pytype: ignore abc.ABCMeta metaclasses that don't work on py3 See 70d42e2ad9b4 in hg: We can remove this when we're Python 3-only, but for now it's just too awkward to deal with and it's harmless.

tests: remove extra whitespace before patch in obslog output The indent() template function was fixed in https://phab.mercurial-scm.org/D7432 so now we have less trailing whitespace in obslog output. CORE-TEST-OUTPUT-UPDATE: fa246ada356b

branching: merge with stable

changelog: add a couple of missing entry about the next feature release

changelog: fix entry in the wrong location That change was made on default, not stable.

changelog: add a wheelbarrow of missing entries

heptapod-ci: simpler CI We have a mercurial clone available in the docker image now. This will same some time to avoid a full Mercurial clone for each run.

heptapod-ci: run the test with color This make the result easier to read.

compat: compatibility for cl.nodemap.get vs cl.index.get_rev

compat: compatibility for pathuril.dirs vs util.dirs

obslog: phase divergence fix for 5c41bb482867 I forgot to pull the latest version before publishing the topic :-(

obslog: phase divergence fix for b135591bec1a I forgot to pull the latest version before publishing the topic :-(

obslog: make {descdiff} not be indented and leave that to the template Same idea as the previous patch and same explanation for changes to the test case.

obslog: make {patch} not be indented and leave that to the template This removes some unwanted indentation from the tests. In the first case, it's because indent() doesn't indent a blank line. In the second case, it's because we used templating with {patch} and had not requested indentation (but we still got it before this patch). Note that tests will only pass with a very recent Mercurial (one with https://phab.mercurial-scm.org/D7432 applied).

obslog: make {succnodes} be full hex nodes It should be up to the user to shorten the nodeid as much or as little as they like.

obslog: remove now-unused code for plain styling We now always use a non-plain formatter for the non-local-filtering code paths, so we can remove the code for plain styling. I couldn't figure out how to replace the fm.formatlist() by something less about formatting, so I've only removed the irrelevant arguments from those calls.

obslog: redefine default output as a template, unless -f was given This was easier than I expected to do without affecting any test output at all. `hg obslog -f` is pretty broken with templating. For example, it inserts a single "date" field, but it provides two values for it if the dates are different. That results in a traceback when running e.g. `hg obslog -f -Tfoo` with non-local obsmarkers with different dates. We need to figure out what we want to put in the template for the filtered case. I've just left it out for now.

obslog: add newline after all markers in non-graphlog to match graphlog I'd also be fine with doing the reverse if that's preferred, but I really want them to be the same so they can use the same template.

obslog: make reason for unavailable patch part of template We need the reason to be in the template in order to be able to templatize the whole output.

obslog: make content and description patches available to templater The code was repeatedly calling fm.write() with the same field ("patch" and "descdiff"). I think that led to the value constantly getting replaced, so when it was used in a template (as {patch} or {descdiff}), it would only get the last value, which was always an empty string. This patch fixes it by writing the full patch to a temporary buffer and then assigning the whole patch to the formatter field.

obslog: rename {desc-diff} to {descdiff} since the former is invalid

tests: demonstrate broken {patch} and {desc-diff} template keywords

topic: drop compat.successorssets(), it's not used The only place in topics that uses successorssets function is in evolvebits.py, and it's using that function from obsutil directly.

topic: drop compat.getmarkers() and use obsutil.getmarkers() directly The function in question was moved from obsolete to obsutil in a14e2e7f7d1f (hg 4.3). See also 6aff4bb3970d for hgext3rd/evolve.

cmdrewrite: avoid accessing scmutil.status fields by index Support for indexed access is going away in Mercurial. Accessing the fields by name is clearer anyway.

obslog: avoid using a formatter after calling end() on it I don't know if makes a difference, but it feels wrong to use it after calling end(). We can simply use the parent formatter in this case.

obslog: use plural name "effects" for list of all effects Same reasoning as the previous patch, but here the singular was used for the list instead. This patch also renames the variable that represents the list of effects to plural "effects" to reduce confusion.

obslog: use singular name "succnode" for each element of {succnodes} The name that we pass for formatlist() is the name of each element. After this patch, you'll write '{succnodes % "{succnode}"}' instead of the confusing '{succnodes % "{succnodes}"}' (where the two "succnodes" refer to different things. Users can write templates that are compatible across this change by using e.g. '{succnodes % "{if(succnode, succnode, succnodes)}"}'.

docs: add SVG figures for sharing.rst Generated by graphviz loosely based on .dot files produced by dotgraph extension.

docs: add some up-to-date output from push/pull commands Hopefully it's going to be helpful for users to better understand how evolve works.

docs: add two more amend commits to simulate temporary amend commits sharing.rst made reference to temporary amend commits and used them to demonstrate that hidden commits are not exchanged. Nowadays, evolve doesn't create such commits, but it still makes sense to show how they are handled during the exchange process. So let's add two more amend commits, one for each repo. This way the guide doesn't have to be updated too much, but doesn't lose this important detail of working with evolve. Unfortunately, this means that tons of hashes change, but it's better than to have figure 4 demonstrate absolutely nothing. Temporary amend commits were removed from test-sharing.t in 06844693bb21, but sharing.rst continued using them for demonstration purposes. It might've been better to replace at least some of the temporary amend commits by extra amends back then, but oh well.

docs: revision numbers are technically stable From `hg help glossary`: "Note that the revision number may be different in each clone of a repository." But cloning the same repo multiple times yields the same result, and that shows that revision numbers are stable.

tests: remove a repeated statement We looked at the review repo just 6 lines above.

docs: correct node hashes in sharing.rst based on test-sharing.t

tests: add shortlog of other repos to test-sharing.t The figures require showing multiple repos, so let's show them all, even if they look trivial.

tests: use |shortest in test-sharing.t because sharing.rst uses it

compat: compatibility for cl.nodemap.get vs cl.index.get_rev

compat: compatibility for pathuril.dirs vs util.dirs

branching: merge with stable

heptapod-ci: test with python3 too

heptapod-ci: add a --pure variant for the CI The end goal is to migrate all piece of the evolve CI currently en Jenkins.

heptapod-ci: let the number of CPU to be picked automatically We now have a larger, bigger machine to run the tests. Let's let run-tests.py pick the number of concurrent jobs.

heptapod-ci: point to our own docker images Lets step further into the future.

readme: update contribution guide We move to heptapod !

branching: merge with stable

docs: remove --all from hg evolve, since it's been the default for some time

docs: typo in user-guide.rst

obslog: don't overwrite {rev} keyword from changeset context Now that we have the whole changeset in the formatter context, there's no need to explicitly add {rev}. We should also deprecate the {shortdescription} keyword since it's no longer needed, but I don't know how to do that.

obslog: make changeset available to templater obslog templating currently has very limited support for templating the precursor changeset (when available). The only available keywords are {node}, {rev}, and {shortdescription}. This patch makes the entire changeset available to the templater by passing it to formatter.context(). That function has been available since Mercurial 4.2.

tests: simplify by pruning unwanted changesets a little earlier The pruned commits are not relevant to the test case, so let's clean them up at the end of the previous test case instead of part-way through the next one.

evolve: use more often seen metavariables in command synopsis strings Also use ellipsis when multiple options are acceptable.

topic: add more options to command synopsis string

debian: also build with python3 We build with Python 3 along with Python 2. The binary package will contain the extension for both python version. This is to ease transition until the mercurial package in Debian uses Python 3. The documentation is still built with Python 2 because it needs Mercurial (which is currently Python 2).

debian: update debhelper compat Level before 9 are deprecated says debhelper 12. Upgrade to 10, which is available in Debian oldstable and old Ubuntu releases to be conservative (and since we probably don't need more).

debian: make it possible to by-pass doc build

debian: define extend-diff-ignore for dpkg-source This makes it possible to build the source package from a hg checkout (and a sdist) by having dpkg-source ignore files not distributed in sdist.

debian: use pybuild and dh_sphinxdoc Use pybuild because it's kind of standard nowadays. Use sphinxdoc debhelper to have a Depends: libjs-sphinxdoc and common files (JS/CSS) symlinked.

debian: mark 9.2.1-1 as released

obsexchange: delete dead code for old exchange protocol Dead since 79a926b557f1 (compat: drop support for older exchange protocol, 2017-10-25).

branching: merge with stable

branching: merge the stable branch with the mercurial-5.1 branch This revert all the test changes to match the expected output for mercurial 5.1.

tests: add the new "-r" bit to the usual merge hint CORE-TEST-OUTPUT-UPDATE: 8197b395710e

test-output: reinstalled test change for 5.2 This effectively reinstall: * 8345b852cd4f * e804d5a7c193 * 62b60fc1983d * 2d85de79ead8 This mean backing out the following backout changeset: * 2eab4363fc62 * c1cc5b1f813a * 015cdd3fa469 * 3ba1c9dbf462

test-compat: opening test compatibility branch for mercurial 5.1 5.2 has a release candidate.

py3: encode/decode with going through ui in rst directive mercurial's ui wants bytes, doctutils wants text.

py3: fix setup.py --version Before: $ python3 setup.py --version b'9.3.0.dev' After: $ python3 setup.py --version 9.3.0.dev

rewind: preserve date

metaedit: don't change commit date by default (issue5994) We deliberately unset devel.default-date to allow hg commands to see the real system date, that demonstrates that metaedit doesn't fall back to system date for any of these commands.

tests: simply use testlib/common.sh in test-metaedit.t

tests: turn glog shell function into an alias in test-metaedit.t Mostly because we already have an alias and because creating an alias is the usual way to customize log -G in tests.

tests: clean up test-metaedit.t Mostly just artifacts from the times when it was one big test-evolve.t. All completely unused nowadays.

help: categorizing evolve and topic commands This makes them show up under the right categories in 'hg help'. Differential Revision: https://phab.mercurial-scm.org/D6999

tests: add the new "-r" bit to the usual merge hint CORE-TEST-OUTPUT-UPDATE: 8197b395710e

branching: merge back into default

pick: don't create any successors when there were no changes (issue6093) For example, when a changeset that user is trying to pick was already grafted or rebased (and no obsmarkers were created), pick will naturally say that there's no changes to commit and will not create the new commit. In that case it should not mark any changeset as a successor of the picked changeset, because the actual file changes were already there before picking. Technically, pick could (and did before this patch) mark the wdir commit as a successor of picked changeset (may be useful in the most trivial cases when e.g. wdir is a graft of the required change), but there are cases when the picked change is introduced in an ancestor of wdir, or even in multiple ancestors piece by piece. Pick definitely shouldn't be trying to guess something this complicated, so with this patch it always marks the picked change as pruned if it gave no changes to commit.

packaging: mark as development version This avoid confusion.

Added tag 9.2.1 for changeset d989bab720e5