# HG changeset patch # User Pierre-Yves David <pierre-yves.da...@ens-lyon.org> # Date 1476314793 -7200 # Thu Oct 13 01:26:33 2016 +0200 # Node ID 92dfc856c6cc25366eb8a7fb9b59d992ad5efc36 # Parent 52fcb1d6cf58c18d63c6e63f3bc1d39194271707 copies: move variable document from checkcopies to mergecopies
It appears that 'mergecopies' is the function consuming these data so we move the documentation there. diff -r 52fcb1d6cf58 -r 92dfc856c6cc mercurial/copies.py --- a/mercurial/copies.py Tue Oct 11 02:21:42 2016 +0200 +++ b/mercurial/copies.py Thu Oct 13 01:26:33 2016 +0200 @@ -331,7 +331,10 @@ m2 = c2.manifest() ma = ca.manifest() - # see _checkcopies documentation below for these dicts + # gather data from _checkcopies: + # - diverge = record all diverges in this dict + # - copy = record all non-divergent copies in this dict + # - fullcopy = record all copies in this dict diverge = {} # divergence data is shared data1 = {'copy': {}, 'fullcopy': {}, @@ -507,10 +510,7 @@ m2 = the destination manifest base = the changectx used as a merge base limit = the rev number to not search beyond - data = dictionary of dictionary to store copy data. The keys are: - - diverge = record all diverges in this dict - - copy = record all non-divergent copies in this dict - - fullcopy = record all copies in this dict + data = dictionary of dictionary to store copy data. (see mergecopies) note: limit is only an optimization, and there is no guarantee that irrelevant revisions will not be limited _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel