Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 21264:4e932dc5c113
resolve: abort when not applicable (BC)
The resolve command is only relevant when mergestate is present.
This patch will make resolve abort when no mergestate is present.
This change will let people know when they are using resolve when they
shouldn't be. This change will let people know when their use of resolve
doesn't do anything.
Previously, |hg resolve -m| would allow mergestate to be created. This
patch now forbids that. Strictly speaking, this is backwards
incompatible. The author of this patch believes creating mergestate via
resolve doesn't make much sense and this side-effect was unintended.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 18 Apr 2014 19:08:32 -0700 |
| parents | edac098e6a55 |
| children | 232de244ab6f |
comparison
equal
deleted
inserted
replaced
| 21263:f3e37409ecd3 | 21264:4e932dc5c113 |
|---|---|
| 4925 if not (all or pats or show or mark or unmark): | 4925 if not (all or pats or show or mark or unmark): |
| 4926 raise util.Abort(_('no files or directories specified; ' | 4926 raise util.Abort(_('no files or directories specified; ' |
| 4927 'use --all to remerge all files')) | 4927 'use --all to remerge all files')) |
| 4928 | 4928 |
| 4929 ms = mergemod.mergestate(repo) | 4929 ms = mergemod.mergestate(repo) |
| 4930 | |
| 4931 if not ms.active(): | |
| 4932 raise util.Abort(_('resolve command not applicable when not merging')) | |
| 4933 | |
| 4930 m = scmutil.match(repo[None], pats, opts) | 4934 m = scmutil.match(repo[None], pats, opts) |
| 4931 ret = 0 | 4935 ret = 0 |
| 4932 | 4936 |
| 4933 for f in ms: | 4937 for f in ms: |
| 4934 if not m(f): | 4938 if not m(f): |