Mercurial > hg
comparison mercurial/cmdutil.py @ 23327:bd296bb4b5c8
remove: avoid a bogus warning about no tracked files when removing '.'
Previously, any files relative to the root of the repo that match the -I
patterns would be deleted, but the command exited with 1 after printing a
warning:
$ hg remove -S -I 're:.*.txt' .
removing sub1/sub2/folder/test.txt
removing sub1/sub2/test.txt
not removing .: no tracked files
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 16 Nov 2014 00:24:23 -0500 |
parents | f6b8d23492e5 |
children | aa0a430d9c75 |
comparison
equal
deleted
inserted
replaced
23326:f6b8d23492e5 | 23327:bd296bb4b5c8 |
---|---|
2086 for subpath in wctx.substate: | 2086 for subpath in wctx.substate: |
2087 if f.startswith(subpath): | 2087 if f.startswith(subpath): |
2088 return True | 2088 return True |
2089 return False | 2089 return False |
2090 | 2090 |
2091 if f in repo.dirstate or f in wctx.dirs() or insubrepo(): | 2091 if f in repo.dirstate or f in wctx.dirs() or f == '.' or insubrepo(): |
2092 continue | 2092 continue |
2093 | 2093 |
2094 if os.path.exists(m.rel(join(f))): | 2094 if os.path.exists(m.rel(join(f))): |
2095 if os.path.isdir(m.rel(join(f))): | 2095 if os.path.isdir(m.rel(join(f))): |
2096 ui.warn(_('not removing %s: no tracked files\n') | 2096 ui.warn(_('not removing %s: no tracked files\n') |