Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 24554:6e73c66a6919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 Mar 2015 17:49:46 -0500
parents 1925769b4ff8 c780a63f61ca
children 6117a29e9e76
comparison
equal deleted inserted replaced
24553:afc29e29d569 24554:6e73c66a6919
2238 if not explicitonly: 2238 if not explicitonly:
2239 for f in match.files(): 2239 for f in match.files():
2240 if f not in repo.dirstate and not repo.wvfs.isdir(f): 2240 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2241 if f not in forgot: 2241 if f not in forgot:
2242 if repo.wvfs.exists(f): 2242 if repo.wvfs.exists(f):
2243 # Don't complain if the exact case match wasn't given.
2244 # But don't do this until after checking 'forgot', so
2245 # that subrepo files aren't normalized, and this op is
2246 # purely from data cached by the status walk above.
2247 if repo.dirstate.normalize(f) in repo.dirstate:
2248 continue
2243 ui.warn(_('not removing %s: ' 2249 ui.warn(_('not removing %s: '
2244 'file is already untracked\n') 2250 'file is already untracked\n')
2245 % match.rel(f)) 2251 % match.rel(f))
2246 bad.append(f) 2252 bad.append(f)
2247 2253