Mercurial > hg
comparison mercurial/copies.py @ 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 |
comparison
equal
deleted
inserted
replaced
30184:7321c6b0c9fd | 30185:e2bfe2d52d7a |
---|---|
329 | 329 |
330 m1 = c1.manifest() | 330 m1 = c1.manifest() |
331 m2 = c2.manifest() | 331 m2 = c2.manifest() |
332 ma = ca.manifest() | 332 ma = ca.manifest() |
333 | 333 |
334 # see _checkcopies documentation below for these dicts | 334 # gather data from _checkcopies: |
335 # - diverge = record all diverges in this dict | |
336 # - copy = record all non-divergent copies in this dict | |
337 # - fullcopy = record all copies in this dict | |
335 diverge = {} # divergence data is shared | 338 diverge = {} # divergence data is shared |
336 data1 = {'copy': {}, | 339 data1 = {'copy': {}, |
337 'fullcopy': {}, | 340 'fullcopy': {}, |
338 'diverge': diverge, | 341 'diverge': diverge, |
339 } | 342 } |
505 f = the filename to check (as in m1) | 508 f = the filename to check (as in m1) |
506 m1 = the source manifest | 509 m1 = the source manifest |
507 m2 = the destination manifest | 510 m2 = the destination manifest |
508 base = the changectx used as a merge base | 511 base = the changectx used as a merge base |
509 limit = the rev number to not search beyond | 512 limit = the rev number to not search beyond |
510 data = dictionary of dictionary to store copy data. The keys are: | 513 data = dictionary of dictionary to store copy data. (see mergecopies) |
511 - diverge = record all diverges in this dict | |
512 - copy = record all non-divergent copies in this dict | |
513 - fullcopy = record all copies in this dict | |
514 | 514 |
515 note: limit is only an optimization, and there is no guarantee that | 515 note: limit is only an optimization, and there is no guarantee that |
516 irrelevant revisions will not be limited | 516 irrelevant revisions will not be limited |
517 there is no easy way to make this algorithm stop in a guaranteed way | 517 there is no easy way to make this algorithm stop in a guaranteed way |
518 once it "goes behind a certain revision". | 518 once it "goes behind a certain revision". |