Rodrigo Damazio Bovendorp <rdamazio@google.com> [Thu, 07 May 2020 19:47:59 -0700] rev 5352
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.
Anton Shestakov <av6@dwimlabs.net> [Sun, 03 May 2020 15:39:56 +0800] rev 5351
changelog: summarize the last couple of features
Anton Shestakov <av6@dwimlabs.net> [Wed, 29 Apr 2020 21:57:59 +0800] rev 5350
obshistory: create _fatemarkers() similar to _originmarkers()
Anton Shestakov <av6@dwimlabs.net> [Thu, 07 May 2020 01:29:48 +0200] rev 5349
obslog: makes --origin flag the default
Test change have been carefully validated.
Anton Shestakov <av6@dwimlabs.net> [Thu, 07 May 2020 01:29:24 +0200] rev 5348
obslog: add a --origin flag to show predecessors instead of successors
This flag will be turned on by default in the next changeset.
Anton Shestakov <av6@dwimlabs.net> [Tue, 21 Apr 2020 23:45:11 +0800] rev 5347
obslog: add preliminary support for showing predecessors
This functionality is not yet used right now, but will be in the next patch.
Anton Shestakov <av6@dwimlabs.net> [Fri, 24 Apr 2020 01:15:38 +0800] rev 5346
obshistory: add _originmarkers() function to be used for obslog --origin
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 08 May 2020 04:02:22 +0200] rev 5345
evolve: rename `evolve_source_*` to `divergence_source_*`
This makes it clearer that this comes from divergence resolution.
Martin von Zweigbergk <martinvonz@google.com> [Thu, 07 May 2020 07:57:14 -0700] rev 5344
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.
Martin von Zweigbergk <martinvonz@google.com> [Mon, 09 Dec 2019 11:09:11 -0800] rev 5343
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).