Show More
@@ -107,7 +107,7 b' def _findlimit(repo, a, b):' | |||||
107 | return min(limit, a, b) |
|
107 | return min(limit, a, b) | |
108 |
|
108 | |||
109 | def _chain(src, dst, a, b): |
|
109 | def _chain(src, dst, a, b): | |
110 |
|
|
110 | """chain two sets of copies a->b""" | |
111 | t = a.copy() |
|
111 | t = a.copy() | |
112 | for k, v in b.iteritems(): |
|
112 | for k, v in b.iteritems(): | |
113 | if v in t: |
|
113 | if v in t: | |
@@ -130,8 +130,8 b' def _chain(src, dst, a, b):' | |||||
130 | return t |
|
130 | return t | |
131 |
|
131 | |||
132 | def _tracefile(fctx, am, limit=-1): |
|
132 | def _tracefile(fctx, am, limit=-1): | |
133 |
|
|
133 | """return file context that is the ancestor of fctx present in ancestor | |
134 |
manifest am, stopping after the first ancestor lower than limit |
|
134 | manifest am, stopping after the first ancestor lower than limit""" | |
135 |
|
135 | |||
136 | for f in fctx.ancestors(): |
|
136 | for f in fctx.ancestors(): | |
137 | if am.get(f.path(), None) == f.filenode(): |
|
137 | if am.get(f.path(), None) == f.filenode(): | |
@@ -157,7 +157,7 b' def _computeforwardmissing(a, b, match=N' | |||||
157 | return mb.filesnotin(ma, match=match) |
|
157 | return mb.filesnotin(ma, match=match) | |
158 |
|
158 | |||
159 | def _forwardcopies(a, b, match=None): |
|
159 | def _forwardcopies(a, b, match=None): | |
160 |
|
|
160 | """find {dst@b: src@a} copy mapping where a is an ancestor of b""" | |
161 |
|
161 | |||
162 | # check for working copy |
|
162 | # check for working copy | |
163 | w = None |
|
163 | w = None | |
@@ -223,7 +223,7 b' def _backwardrenames(a, b):' | |||||
223 | return r |
|
223 | return r | |
224 |
|
224 | |||
225 | def pathcopies(x, y, match=None): |
|
225 | def pathcopies(x, y, match=None): | |
226 |
|
|
226 | """find {dst@y: src@x} copy mapping for directed compare""" | |
227 | if x == y or not x or not y: |
|
227 | if x == y or not x or not y: | |
228 | return {} |
|
228 | return {} | |
229 | a = y.ancestor(x) |
|
229 | a = y.ancestor(x) | |
@@ -861,13 +861,13 b' def _checkcopies(srcctx, dstctx, f, base' | |||||
861 | return |
|
861 | return | |
862 |
|
862 | |||
863 | def duplicatecopies(repo, wctx, rev, fromrev, skiprev=None): |
|
863 | def duplicatecopies(repo, wctx, rev, fromrev, skiprev=None): | |
864 |
|
|
864 | """reproduce copies from fromrev to rev in the dirstate | |
865 |
|
865 | |||
866 | If skiprev is specified, it's a revision that should be used to |
|
866 | If skiprev is specified, it's a revision that should be used to | |
867 | filter copy records. Any copies that occur between fromrev and |
|
867 | filter copy records. Any copies that occur between fromrev and | |
868 | skiprev will not be duplicated, even if they appear in the set of |
|
868 | skiprev will not be duplicated, even if they appear in the set of | |
869 | copies between fromrev and rev. |
|
869 | copies between fromrev and rev. | |
870 | ''' |
|
870 | """ | |
871 | exclude = {} |
|
871 | exclude = {} | |
872 | if (skiprev is not None and |
|
872 | if (skiprev is not None and | |
873 | repo.ui.config('experimental', 'copytrace') != 'off'): |
|
873 | repo.ui.config('experimental', 'copytrace') != 'off'): |
General Comments 0
You need to be logged in to leave comments.
Login now