Sushil khanchi <sushilkhanchi97@gmail.com> [Mon, 23 Dec 2019 01:03:45 +0530] rev 5236
evolve: add quotes around the action in msg of pre-checking
Sushil khanchi <sushilkhanchi97@gmail.com> [Wed, 04 Dec 2019 21:06:39 +0530] rev 5235
metaedit: use pre-checking before rewriting csets
Changes in test file demonstrate the changed behaviour.
Sushil khanchi <sushilkhanchi97@gmail.com> [Sat, 14 Dec 2019 13:31:45 +0530] rev 5234
evolve: update the pre-check message for risk of orphans
Sushil khanchi <sushilkhanchi97@gmail.com> [Sun, 10 Nov 2019 16:32:34 +0530] rev 5233
evolve: add pre-check logic for creation of phase divergence locally
Changes in tests reflect the added behaviour.
Sushil khanchi <sushilkhanchi97@gmail.com> [Sun, 10 Nov 2019 18:08:57 +0530] rev 5232
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.
Sushil khanchi <sushilkhanchi97@gmail.com> [Mon, 04 Nov 2019 00:18:55 +0530] rev 5231
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()
Sushil khanchi <sushilkhanchi97@gmail.com> [Mon, 04 Nov 2019 01:30:50 +0530] rev 5230
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).
Martin von Zweigbergk <martinvonz@google.com> [Thu, 26 Dec 2019 10:21:31 -0800] rev 5229
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).
Boris Feld <boris.feld@octobus.net> [Wed, 18 Dec 2019 14:10:56 +0100] rev 5228
Temporary commit for time measurement of test file + pandoc
Boris Feld <boris.feld@octobus.net> [Wed, 18 Dec 2019 14:10:49 +0100] rev 5227
ci: Add CI job for building the documentation
Boris Feld <boris.feld@octobus.net> [Fri, 22 Nov 2019 18:56:42 +0100] rev 5226
tutorial: compile the tutorial in rst so it can be included
Boris Feld <boris.feld@octobus.net> [Fri, 22 Nov 2019 18:29:27 +0100] rev 5225
tutorial: run the tutorial test file to update to latests ui messages
Boris Feld <boris.feld@octobus.net> [Fri, 22 Nov 2019 18:28:01 +0100] rev 5224
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.
Anton Shestakov <av6@dwimlabs.net> [Thu, 12 Sep 2019 15:38:11 +0700] rev 5223
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().
Anton Shestakov <av6@dwimlabs.net> [Thu, 12 Sep 2019 15:22:50 +0700] rev 5222
stack: return from behindcount() early
Reduces indentation.
Anton Shestakov <av6@dwimlabs.net> [Thu, 12 Sep 2019 14:44:19 +0700] rev 5221
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.
Anton Shestakov <av6@dwimlabs.net> [Thu, 12 Sep 2019 14:42:38 +0700] rev 5220
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).
Boris Feld <boris.feld@octobus.net> [Tue, 04 Sep 2018 19:53:08 +0200] rev 5219
pick: Add a test to check that pick pick the right content
Boris Feld <boris.feld@octobus.net> [Thu, 01 Feb 2018 18:26:56 +0100] rev 5218
WIP on handling stacks
Boris Feld <boris.feld@octobus.net> [Mon, 15 Jan 2018 17:46:40 +0100] rev 5217
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.
Anton Shestakov <av6@dwimlabs.net> [Sun, 29 Mar 2020 16:00:57 +0700] rev 5216
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.
Anton Shestakov <av6@dwimlabs.net> [Sun, 29 Mar 2020 16:08:43 +0700] rev 5215
tests: unindent lines that only have one leading space
One space is not even defined in our .t files syntax.
Anton Shestakov <av6@dwimlabs.net> [Fri, 27 Mar 2020 17:37:34 +0700] rev 5214
rewind: make __rewind-hash__ extra field be bytes
Anton Shestakov <av6@dwimlabs.net> [Fri, 27 Mar 2020 17:37:03 +0700] rev 5213
touch: make __touch-noise__ extra field be bytes
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Mar 2020 04:30:22 +0100] rev 5212
branching: merge with stable
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