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.