equal
deleted
inserted
replaced
61 # remove copies to files that were then removed |
61 # remove copies to files that were then removed |
62 elif k not in dst: |
62 elif k not in dst: |
63 del t[k] |
63 del t[k] |
64 |
64 |
65 |
65 |
66 def _chain(a, b): |
66 def _chain(prefix, suffix): |
67 """chain two sets of copies 'a' and 'b'""" |
67 """chain two sets of copies 'prefix' and 'suffix'""" |
68 t = a.copy() |
68 result = prefix.copy() |
69 for k, v in pycompat.iteritems(b): |
69 for key, value in pycompat.iteritems(suffix): |
70 t[k] = a.get(v, v) |
70 result[key] = prefix.get(value, value) |
71 return t |
71 return result |
72 |
72 |
73 |
73 |
74 def _tracefile(fctx, am, basemf): |
74 def _tracefile(fctx, am, basemf): |
75 """return file context that is the ancestor of fctx present in ancestor |
75 """return file context that is the ancestor of fctx present in ancestor |
76 manifest am |
76 manifest am |