Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: move variable document from checkcopies to mergecopies
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 13 Oct 2016 01:26:33 +0200
changeset 30185 e2bfe2d52d7a
parent 30184 7321c6b0c9fd
child 30186 f7ed5af31242
copies: move variable document from checkcopies to mergecopies It appears that 'mergecopies' is the function consuming these data so we move the documentation there.
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- 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