Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 4393:cf5f35ec4720
Fix rm -A with no patterns, which I just broke.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Apr 2007 09:13:27 -0700 |
parents | 9770d260a405 |
children | a6436e9333db |
comparison
equal
deleted
inserted
replaced
4392:9770d260a405 | 4393:cf5f35ec4720 |
---|---|
2081 | 2081 |
2082 This only removes files from the current branch, not from the | 2082 This only removes files from the current branch, not from the |
2083 entire project history. If the files still exist in the working | 2083 entire project history. If the files still exist in the working |
2084 directory, they will be deleted from it. If invoked with --after, | 2084 directory, they will be deleted from it. If invoked with --after, |
2085 files are marked as removed, but not actually unlinked unless --force | 2085 files are marked as removed, but not actually unlinked unless --force |
2086 is also given. | 2086 is also given. Without an explicit pattern, --after will only mark |
2087 files as removed if they are no longer in the working directory. | |
2087 | 2088 |
2088 This command schedules the files to be removed at the next commit. | 2089 This command schedules the files to be removed at the next commit. |
2089 To undo a remove before that, see hg revert. | 2090 To undo a remove before that, see hg revert. |
2090 | 2091 |
2091 Modified files and added files are not removed by default. To | 2092 Modified files and added files are not removed by default. To |
2108 forget.append(abs) | 2109 forget.append(abs) |
2109 continue | 2110 continue |
2110 reason = _('has been marked for add (use -f to force removal)') | 2111 reason = _('has been marked for add (use -f to force removal)') |
2111 elif abs in unknown: | 2112 elif abs in unknown: |
2112 reason = _('is not managed') | 2113 reason = _('is not managed') |
2114 elif opts['after'] and not pats and abs not in deleted: | |
2115 continue | |
2113 elif abs in removed: | 2116 elif abs in removed: |
2114 continue | 2117 continue |
2115 if reason: | 2118 if reason: |
2116 if exact: | 2119 if exact: |
2117 ui.warn(_('not removing %s: file %s\n') % (rel, reason)) | 2120 ui.warn(_('not removing %s: file %s\n') % (rel, reason)) |