followlines: join merge parents line ranges in blockdescendants() (issue5595) In blockdescendants(), we had an assertion when line range of a merge changeset was not consistent depending on which parent was considered for computation. For instance, this might occur when file content (in lookup range) is significantly different between parent branches of the merge as demonstrated in added tests (where we almost completely rewrite the "baz" file while also introducing similarities with its content in the other branch we later merge to). Now, in such case, we combine line ranges from all parents by storing the envelope of both line ranges. This is conservative (the line range is extended, possibly unnecessarily) but at least this should avoid missing descendants with changes in a range that would fall in that of one parent but not in another one (the case of "baz: narrow change (2->2+)" changeset in tests).

     1

'''

     2

Examples of useful python hooks for Mercurial.

     3

'''

     4

from __future__ import absolute_import

     5

from mercurial import (

     6

    patch,

     7

    util,

     8

)

     9

    10

def diffstat(ui, repo, **kwargs):

    11

    '''Example usage:

    12

    13

    [hooks]

    14

    commit.diffstat = python:/path/to/this/file.py:diffstat

    15

    changegroup.diffstat = python:/path/to/this/file.py:diffstat

    16

    '''

    17

    if kwargs.get('parent2'):

    18

        return

    19

    node = kwargs['node']

    20

    first = repo[node].p1().node()

    21

    if 'url' in kwargs:

    22

        last = repo['tip'].node()

    23

    else:

    24

        last = node

    25

    diff = patch.diff(repo, first, last)

    26

    ui.write(patch.diffstat(util.iterlines(diff)))