Mercurial > hg
changeset 30185:e2bfe2d52d7a
copies: move variable document from checkcopies to mergecopies
It appears that 'mergecopies' is the function consuming these data so we move
the documentation there.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 13 Oct 2016 01:26:33 +0200 |
| parents | 7321c6b0c9fd |
| children | f7ed5af31242 |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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