Comments
Patch
@@ -929,8 +929,6 @@
merge.manifestmerge() won't care about
addedfiles: added files on the other side (compared to ctx)
"""
- # generate a directory move map
- d = ctx.dirs()
invalid = set()
dirmove = {}
@@ -941,7 +939,7 @@
if dsrc in invalid:
# already seen to be uninteresting
continue
- elif dsrc in d and ddst in d:
+ elif ctx.hasdir(dsrc) and ctx.hasdir(ddst):
# directory wasn't entirely moved locally
invalid.add(dsrc)
elif dsrc in dirmove and dirmove[dsrc] != ddst:
@@ -954,7 +952,7 @@
for i in invalid:
if i in dirmove:
del dirmove[i]
- del d, invalid
+ del invalid
if not dirmove:
return {}, {}