Eric Spishak-Thomas <emspishak@gmail.com> [Wed, 25 Mar 2020 17:44:08 -0400] rev 5211
evolve: fix some documentation grammar/typos
Eric Spishak-Thomas <emspishak@gmail.com> [Wed, 25 Mar 2020 17:44:08 -0400] rev 5210
evolve: fix some documentation grammar/typos
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Mar 2020 21:48:32 +0100] rev 5209
changelog: mention the recent evolve improvements
Manuel Jacob <me@manueljacob.de> [Sat, 21 Mar 2020 00:46:37 +0100] rev 5208
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.
Manuel Jacob <me@manueljacob.de> [Wed, 11 Mar 2020 16:05:53 +0100] rev 5207
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.
Manuel Jacob <me@manueljacob.de> [Wed, 11 Mar 2020 16:04:06 +0100] rev 5206
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.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 11 Mar 2020 18:50:39 +0100] rev 5205
exchange: deal with empty obscommon
The case can happen, we better support it.
Anton Shestakov <av6@dwimlabs.net> [Fri, 20 Mar 2020 12:37:44 +0700] rev 5204
topic: compat with tr.changes[b'phases'], it's now a list
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 19 Mar 2020 20:09:18 +0530] rev 5203
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.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Mar 2020 02:42:03 +0100] rev 5202
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.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Mar 2020 02:46:51 +0100] rev 5201
obsexchange: swap the 'common' and 'missing' clause
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Mar 2020 02:41:53 +0100] rev 5200
obsdiscovery: avoid considering locally hidden changeset
This looks like a dubious optimisation
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 11 Mar 2020 18:29:46 +0100] rev 5199
obsdiscovery: add a test where some common node are hidden
This is useful to prevent regression.
Anton Shestakov <av6@dwimlabs.net> [Fri, 13 Mar 2020 19:11:43 +0700] rev 5198
tests: use appropriate Python (2 or 3) for dummyssh
Manuel Jacob <me@manueljacob.de> [Wed, 11 Mar 2020 18:28:26 +0100] rev 5197
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.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Mar 2020 18:39:40 +0100] rev 5196
test: fix graph label in test-push-checkheads-pruned-B5.t
They were wrong.
Anton Shestakov <av6@dwimlabs.net> [Wed, 11 Mar 2020 16:11:04 +0700] rev 5195
readme: mention compat string format
Anton Shestakov <av6@dwimlabs.net> [Wed, 11 Mar 2020 15:55:36 +0700] rev 5194
readme: copywrite the section about branch policy, wrap long lines
Anton Shestakov <av6@dwimlabs.net> [Tue, 10 Mar 2020 19:05:08 +0700] rev 5193
compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net> [Tue, 10 Mar 2020 19:04:33 +0700] rev 5192
contrib: add a script to check release in compat comments that have node hash
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Mar 2020 11:50:40 +0100] rev 5191
changelog: add an entry about the cleanup
Anton Shestakov <av6@dwimlabs.net> [Mon, 09 Mar 2020 18:47:18 +0700] rev 5190
evolve: drop compat for pre-4.5 context.memfilectx()
Anton Shestakov <av6@dwimlabs.net> [Mon, 09 Mar 2020 18:36:10 +0700] rev 5189
compat: update a couple of obviously outdated version comments
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 23:16:31 +0700] rev 5188
evolve: drop pre 4.0 compat for dirstate.parentchange()
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 22:38:14 +0700] rev 5187
evolve: drop 4.5 compat for scmutil.resolvehexnodeidprefix()
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 02:26:49 +0700] rev 5186
evolve: drop 4.5 compatibility for patch in tryimportone()
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 02:03:28 +0700] rev 5185
evolve: drop 4.5 compatibility with `patch.extract` API
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 01:43:40 +0700] rev 5184
evolve: drop 4.5 compatibility for template keywords
Anton Shestakov <av6@dwimlabs.net> [Sat, 07 Mar 2020 01:36:33 +0700] rev 5183
topic: drop 4.5 compatibility for template keywords
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 16:30:38 +0100] rev 5182
compat: drop 4.5 compatibility for strdiff
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 16:30:19 +0100] rev 5181
compat: drop 4.5 compatibility layer for log utility
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Mar 2020 11:07:06 +0100] rev 5180
compat: drop 4.5 related compatibility around wireprotocol module
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Mar 2020 11:06:37 +0100] rev 5179
compat: directly use status attribute instead of the compat layer
With 4.5 dropped, this compat layer is no longer needed.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Mar 2020 11:07:34 +0100] rev 5178
compat: directly use function from dateutil
Since support for 4.5 have been dropped we no longer needs this indirection.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 16:14:03 +0100] rev 5177
compat: drop 4.5 compatibility for `_filterederror`
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 16:03:23 +0100] rev 5176
compat: drop import compatibility <= 4.5 for `forcebytestr`
We no longer support 4.5
Martin von Zweigbergk <martinvonz@google.com> [Wed, 04 Mar 2020 15:21:32 -0800] rev 5175
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
Anton Shestakov <av6@dwimlabs.net> [Fri, 06 Mar 2020 21:37:28 +0700] rev 5174
tests: add more involved tests for obslog -T now that everything is a property
Anton Shestakov <av6@dwimlabs.net> [Tue, 25 Feb 2020 18:07:30 +0700] rev 5173
obslog: remove the separate "obslog -f" implementation and use the common one
Anton Shestakov <av6@dwimlabs.net> [Tue, 25 Feb 2020 17:47:54 +0700] rev 5172
obslog: provide successors and multiple markers to marker-displaying function
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 18:16:11 +0800] rev 5171
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 18:10:58 +0800] rev 5170
obslog: make note template property into notes
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 18:07:11 +0800] rev 5169
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 17:58:22 +0800] rev 5168
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 17:31:41 +0800] rev 5167
obslog: have at least one test that shows multiple dates with -f flag
Anton Shestakov <av6@dwimlabs.net> [Tue, 18 Feb 2020 15:21:14 +0800] rev 5166
obslog: use fm.data() instead of fm.write() because it's all templates now
Anton Shestakov <av6@dwimlabs.net> [Fri, 06 Mar 2020 22:06:05 +0700] rev 5165
tests: add checkheads-related cap
CORE-TEST-OUTPUT-UPDATE: edc8504bc26b
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 17:49:58 +0100] rev 5164
branching: merge stable back into default
evolve 9.3.0 have been released.
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 15:18:00 +0700] rev 5163
test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 15:17:31 +0700] rev 5162
test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 15:17:13 +0700] rev 5161
test-compat: merge mercurial-4.9 into mercurial-4.8
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 23:23:02 +0700] rev 5160
test-compat: merge mercurial-5.0 into mercurial-4.9
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 23:18:48 +0700] rev 5159
test-compat: merge mercurial-5.1 into mercurial-5.0
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 23:10:48 +0700] rev 5158
test-compat: merge mercurial-5.2 into mercurial-5.1
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 22:48:46 +0700] rev 5157
test-compat: back out changeset 2371d40f0878
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 21:44:36 +0700] rev 5156
test-compat: back out changeset bb2042ff6444
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 21:09:51 +0700] rev 5155
test-compat: merge stable into mercurial-5.2
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 14:59:23 +0700] rev 5154
packaging: mark as developer version
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 14:55:37 +0700] rev 5153
packaging: add tag 9.3.0 for changeset 583dc6ef3eb2
Anton Shestakov <av6@dwimlabs.net> [Wed, 04 Mar 2020 16:53:48 +0100] rev 5152
packaging: prepare version 9.3.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 15:47:08 +0100] rev 5151
branching: preserve test change on stable
CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc
CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 17:08:05 +0100] rev 5150
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.
Anton Shestakov <av6@dwimlabs.net> [Wed, 04 Mar 2020 16:53:32 +0100] rev 5149
changelog: more entries for 9.3.0, sorting
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 16:36:32 +0100] rev 5148
compat: fix subsettable import for mercurial <= 4.8
Anton Shestakov <av6@dwimlabs.net> [Wed, 04 Mar 2020 16:05:28 +0100] rev 5147
compat: officialy drop compatibility with mercurial 4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 15:45:33 +0100] rev 5146
test-compat: back out changeset 591a0afd2ef3
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 20:19:16 +0700] rev 5145
test-compat: back out changeset 51e38bf936cf
Anton Shestakov <av6@dwimlabs.net> [Fri, 28 Feb 2020 20:18:42 +0700] rev 5144
branching: merge into stable in preparation for release
Anton Shestakov <av6@dwimlabs.net> [Sat, 29 Feb 2020 14:26:50 +0700] rev 5143
branching: closing test-compat branch for mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 15:17:29 +0100] rev 5142
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 15:09:22 +0100] rev 5141
tests: update graph output after core change
CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 04 Mar 2020 13:17:00 +0100] rev 5140
fix: reinstall import from the right location
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 19 Feb 2020 01:35:23 +0100] rev 5139
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.
Anton Shestakov <av6@dwimlabs.net> [Tue, 03 Mar 2020 17:20:05 +0700] rev 5138
readme: update heptapod link
willstott101@gmail.com [Mon, 02 Mar 2020 17:12:09 +0000] rev 5137
py3-exceptions: wrap more Exceptions in forcebytestr before formatting
Martin von Zweigbergk <martinvonz@google.com> [Tue, 04 Feb 2020 16:22:40 -0800] rev 5136
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.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 04 Feb 2020 16:22:40 -0800] rev 5135
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.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 04 Feb 2020 13:43:16 -0800] rev 5134
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`.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 22 Feb 2020 18:36:32 +0100] rev 5133
release-checklist: do not forget to move the '@' bookmark
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 19 Feb 2020 13:13:09 +0530] rev 5132
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.
Anton Shestakov <av6@dwimlabs.net> [Sat, 15 Feb 2020 16:52:56 +0800] rev 5131
prune: actually track folds using fold-* metadata in obsmarkers
Anton Shestakov <av6@dwimlabs.net> [Thu, 13 Feb 2020 19:13:36 +0800] rev 5130
packaging: handle docs in a separate block in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net> [Thu, 13 Feb 2020 19:08:31 +0800] rev 5129
packaging: simplify inclusion of docs in MANIFEST.in
Anton Shestakov <av6@dwimlabs.net> [Thu, 13 Feb 2020 19:04:00 +0800] rev 5128
packaging: simply prune some directories in MANIFEST.in in a dedicated block
exclude+recursive-exclude is basically prune.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 04 Feb 2020 13:00:05 -0800] rev 5127
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).
Martin von Zweigbergk <martinvonz@google.com> [Tue, 04 Feb 2020 12:46:55 -0800] rev 5126
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.
Anton Shestakov <av6@dwimlabs.net> [Tue, 11 Feb 2020 17:21:43 +0800] rev 5125
tests: drop useless "(glob)" for timezone offsets
Anton Shestakov <av6@dwimlabs.net> [Tue, 04 Feb 2020 14:07:29 +0700] rev 5124
changelog: obslog shows folds now
Anton Shestakov <av6@dwimlabs.net> [Tue, 14 Jan 2020 20:20:13 +0700] rev 5123
obslog: use _successorsetverb() in regular obslog too
It was already used for obslog --filternonlocal.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Feb 2020 16:18:18 +0100] rev 5122
release: do not forget to tweet about it
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Feb 2020 15:49:31 +0100] rev 5121
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Feb 2020 13:40:13 +0100] rev 5120
release: fix a silly typo
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Feb 2020 13:28:47 +0100] rev 5119
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Feb 2020 13:25:23 +0100] rev 5118
release: add missing checklist items
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 01 Feb 2020 11:24:46 +0100] rev 5117
heptapod: add an issue template for new version
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 30 Jan 2020 18:14:14 +0100] rev 5116
packaging: create a release check list
This should help other to release version of evolve.
Anton Shestakov <av6@dwimlabs.net> [Tue, 14 Jan 2020 19:42:06 +0700] rev 5115
obshistory: add 'folded' to the list of precise verbs
It's used for templates and for obslog --filternonlocal, but not for regular
obslog.
Anton Shestakov <av6@dwimlabs.net> [Sat, 11 Jan 2020 19:53:11 +0700] rev 5114
metaedit: actually track folds using fold-* metadata in obsmarkers
Anton Shestakov <av6@dwimlabs.net> [Sat, 11 Jan 2020 19:52:56 +0700] rev 5113
fold: actually track folds using fold-* metadata in obsmarkers
Anton Shestakov <av6@dwimlabs.net> [Sun, 02 Feb 2020 15:51:10 +0700] rev 5112
tests: adjust test output for an early return in mergecopies()
CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 01 Feb 2020 12:50:10 +0100] rev 5111
branching
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 31 Jan 2020 14:50:37 +0100] rev 5110
packaging: mark as developer version
This avoid confusion when installing from source.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 31 Jan 2020 15:03:59 +0100] rev 5109
Added tag 9.2.2 for changeset ef41094c34e1
Anton Shestakov <av6@dwimlabs.net> [Fri, 31 Jan 2020 14:44:45 +0100] rev 5108
packaging: prepare version 9.2.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 31 Jan 2020 14:52:38 +0100] rev 5107
packaging: update tested with version
We have tested this with 5.3rc so let mark 5.3 as tested too.
Anton Shestakov <av6@dwimlabs.net> [Fri, 31 Jan 2020 14:44:39 +0100] rev 5106
packaging: update changelog for version 9.2.2
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:11 +0700] rev 5105
test-compat: merge mercurial-4.6 into mercurial-4.5
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:10 +0700] rev 5104
test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:09 +0700] rev 5103
test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:08 +0700] rev 5102
test-compat: merge mercurial-4.9 into mercurial-4.8
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:06 +0700] rev 5101
test-compat: merge mercurial-5.0 into mercurial-4.9
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:05 +0700] rev 5100
test-compat: merge mercurial-5.1 into mercurial-5.0
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:04 +0700] rev 5099
test-compat: merge mercurial-5.2 into mercurial-5.1
Anton Shestakov <av6@dwimlabs.net> [Thu, 30 Jan 2020 14:32:03 +0700] rev 5098
test-compat: merge stable into mercurial-5.2
Anton Shestakov <av6@dwimlabs.net> [Mon, 27 Jan 2020 14:55:35 +0700] rev 5097
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.
Anton Shestakov <av6@dwimlabs.net> [Tue, 28 Jan 2020 20:12:04 +0700] rev 5096
compat: add a context manager that calls _quick_access_changeid_invalidate()
Anton Shestakov <av6@dwimlabs.net> [Fri, 17 Jan 2020 20:40:24 +0700] rev 5095
evolve: provide branch argument to overlayworkingctx.tomemctx()
This is related to upstream 2ecbc4ec87d8 and fixes test-evolve.t.
Anton Shestakov <av6@dwimlabs.net> [Thu, 23 Jan 2020 19:33:40 +0700] rev 5094
evolve: compatibility with copies.graftcopies() from hg 5.3
Martin von Zweigbergk <martinvonz@google.com> [Fri, 15 Nov 2019 08:14:06 -0800] rev 5093
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.
Anton Shestakov <av6@dwimlabs.net> [Thu, 23 Jan 2020 17:41:00 +0700] rev 5092
test-compat: merge mercurial-4.6 into mercurial-4.5