##// END OF EJS Templates
copies: avoid materializing a full directory map during copy tracing...
Kyle Lippincott -
r46632:b9588ff9 default
parent child Browse files
Show More
@@ -930,7 +930,6 b' def _dir_renames(repo, ctx, copy, fullco'
930 addedfiles: added files on the other side (compared to ctx)
930 addedfiles: added files on the other side (compared to ctx)
931 """
931 """
932 # generate a directory move map
932 # generate a directory move map
933 d = ctx.dirs()
934 invalid = set()
933 invalid = set()
935 dirmove = {}
934 dirmove = {}
936
935
@@ -941,7 +940,7 b' def _dir_renames(repo, ctx, copy, fullco'
941 if dsrc in invalid:
940 if dsrc in invalid:
942 # already seen to be uninteresting
941 # already seen to be uninteresting
943 continue
942 continue
944 elif dsrc in d and ddst in d:
943 elif ctx.hasdir(dsrc) and ctx.hasdir(ddst):
945 # directory wasn't entirely moved locally
944 # directory wasn't entirely moved locally
946 invalid.add(dsrc)
945 invalid.add(dsrc)
947 elif dsrc in dirmove and dirmove[dsrc] != ddst:
946 elif dsrc in dirmove and dirmove[dsrc] != ddst:
@@ -954,7 +953,7 b' def _dir_renames(repo, ctx, copy, fullco'
954 for i in invalid:
953 for i in invalid:
955 if i in dirmove:
954 if i in dirmove:
956 del dirmove[i]
955 del dirmove[i]
957 del d, invalid
956 del invalid
958
957
959 if not dirmove:
958 if not dirmove:
960 return {}, {}
959 return {}, {}
General Comments 0
You need to be logged in to leave comments. Login now