mercurial-scm/hg: mercurial/cmdutil.py comparison

remove: support remove with explicit paths in subrepos

author	Matt Harbison <matt_harbison@yahoo.com>
date	Wed, 12 Nov 2014 23:15:20 -0500
parents	4165cfd67519
children	bd296bb4b5c8

comparison

equal deleted inserted replaced

-:4165cfd67519
+:f6b8d23492e5
 s = repo.status(match=m, clean=True)
 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
 wctx = repo[None]
-if subrepos:
+for subpath in sorted(wctx.substate):
-for subpath in sorted(wctx.substate):
+def matchessubrepo(matcher, subpath):
+if matcher.exact(subpath):
+return True
+for f in matcher.files():
+if f.startswith(subpath):
+return True
+return False
+if subrepos or matchessubrepo(m, subpath):
 sub = wctx.sub(subpath)
 try:
 submatch = matchmod.narrowmatcher(subpath, m)
 if sub.removefiles(ui, submatch, prefix, after, force,
 subrepos):
 for subpath in wctx.substate:
 if f.startswith(subpath):
 return True
 return False
-if f in repo.dirstate or f in wctx.dirs() or (subrepos and insubrepo()):
+if f in repo.dirstate or f in wctx.dirs() or insubrepo():
 continue
 if os.path.exists(m.rel(join(f))):
 if os.path.isdir(m.rel(join(f))):
 ui.warn(_('not removing %s: no tracked files\n')

Mercurial > public > mercurial-scm > hg