Show More
@@ -997,11 +997,10 b' def _checkcollision(repo, wmf, actions):' | |||
|
997 | 997 | """ |
|
998 | 998 | Check for case-folding collisions. |
|
999 | 999 | """ |
|
1000 | ||
|
1001 | 1000 | # If the repo is narrowed, filter out files outside the narrowspec. |
|
1002 | 1001 | narrowmatch = repo.narrowmatch() |
|
1003 | 1002 | if not narrowmatch.always(): |
|
1004 |
|
|
|
1003 | pmmf = set(wmf.walk(narrowmatch)) | |
|
1005 | 1004 | if actions: |
|
1006 | 1005 | narrowactions = {} |
|
1007 | 1006 | for m, actionsfortype in pycompat.iteritems(actions): |
@@ -1010,9 +1009,9 b' def _checkcollision(repo, wmf, actions):' | |||
|
1010 | 1009 | if narrowmatch(f): |
|
1011 | 1010 | narrowactions[m].append((f, args, msg)) |
|
1012 | 1011 | actions = narrowactions |
|
1013 | ||
|
1014 | # build provisional merged manifest up | |
|
1015 | pmmf = set(wmf) | |
|
1012 | else: | |
|
1013 | # build provisional merged manifest up | |
|
1014 | pmmf = set(wmf) | |
|
1016 | 1015 | |
|
1017 | 1016 | if actions: |
|
1018 | 1017 | # KEEP and EXEC are no-op |
General Comments 0
You need to be logged in to leave comments.
Login now