comparison mercurial/context.py @ 28017:d3f1b7ee5e70

match: rename "narrowmatcher" to "subdirmatcher" (API) I keep mistaking "narrowmatcher" for narrowhg's narrowmatcher. "subdirmatcher" seems more to the point anyway.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 05 Feb 2016 21:09:32 -0800
parents b7af616ca675
children ba8257cb53e8
comparison
equal deleted inserted replaced
28016:a2be6f0f58fb 28017:d3f1b7ee5e70
363 except KeyError: 363 except KeyError:
364 # A subrepo that existed in node1 was deleted between 364 # A subrepo that existed in node1 was deleted between
365 # node1 and node2 (inclusive). Thus, ctx2's substate 365 # node1 and node2 (inclusive). Thus, ctx2's substate
366 # won't contain that subpath. The best we can do ignore it. 366 # won't contain that subpath. The best we can do ignore it.
367 rev2 = None 367 rev2 = None
368 submatch = matchmod.narrowmatcher(subpath, match) 368 submatch = matchmod.subdirmatcher(subpath, match)
369 s = sub.status(rev2, match=submatch, ignored=listignored, 369 s = sub.status(rev2, match=submatch, ignored=listignored,
370 clean=listclean, unknown=listunknown, 370 clean=listclean, unknown=listunknown,
371 listsubrepos=True) 371 listsubrepos=True)
372 for rfiles, sfiles in zip(r, s): 372 for rfiles, sfiles in zip(r, s):
373 rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) 373 rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)