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).

     1

Source: mercurial-evolve

     2

Section: vcs

     3

Priority: optional

     4

Maintainer: Logilab <contact@logilab.fr>

     5

Uploaders:

     6

 Julien Cristau <julien.cristau@logilab.fr>,

     7

 Pierre-Yves David <pierre-yves.david@logilab.fr>,

     8

Standards-Version: 3.9.3

     9

Build-Depends:

    10

 mercurial (>= 4.5),

    11

 python,

    12

 python3,

    13

 debhelper (>= 10),

    14

 dh-python,

    15

 python-sphinx (>= 1.0.8),

    16

 imagemagick,

    17

 librsvg2-bin,

    18

 wget,

    19

 sphinx-common,

    20

X-Python-Version: >= 2.7

    21

X-Python3-Version: >= 3.6

    22

Homepage: https://www.mercurial-scm.org/doc/evolution/

    23

    24

Package: mercurial-evolve

    25

Architecture: all

    26

Depends:

    27

 ${python:Depends},

    28

 ${python3:Depends},

    29

 ${misc:Depends},

    30

 ${sphinxdoc:Depends},

    31

 mercurial (>= 4.5),

    32

Built-Using: ${sphinxdoc:Built-Using}

    33

Description: evolve extension for Mercurial

    34

 This package provides the experimental "evolve" extension for the Mercurial

    35

 DVCS.

    36

 .

    37

 This extension provides several commands to mutate history and deal with issues

    38

 it may raise.

    39

    40