Show More
@@ -343,7 +343,7 b' class basectx(object):' | |||||
343 | reversed = True |
|
343 | reversed = True | |
344 | ctx1, ctx2 = ctx2, ctx1 |
|
344 | ctx1, ctx2 = ctx2, ctx1 | |
345 |
|
345 | |||
346 | match = match or matchmod.always(self._repo.root, self._repo.getcwd()) |
|
346 | match = self._repo.narrowmatch(match) | |
347 | match = ctx2._matchstatus(ctx1, match) |
|
347 | match = ctx2._matchstatus(ctx1, match) | |
348 | r = scmutil.status([], [], [], [], [], [], []) |
|
348 | r = scmutil.status([], [], [], [], [], [], []) | |
349 | r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, |
|
349 | r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, | |
@@ -371,10 +371,6 b' class basectx(object):' | |||||
371 | for rfiles, sfiles in zip(r, s): |
|
371 | for rfiles, sfiles in zip(r, s): | |
372 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) |
|
372 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) | |
373 |
|
373 | |||
374 | narrowmatch = self._repo.narrowmatch() |
|
|||
375 | if not narrowmatch.always(): |
|
|||
376 | for l in r: |
|
|||
377 | l[:] = list(filter(narrowmatch, l)) |
|
|||
378 | for l in r: |
|
374 | for l in r: | |
379 | l.sort() |
|
375 | l.sort() | |
380 |
|
376 |
General Comments 0
You need to be logged in to leave comments.
Login now