Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 36850:ff541b8cdee0
graft: check for missing revision first before scanning working copy
Differential Revision: https://phab.mercurial-scm.org/D2753
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Fri, 09 Mar 2018 15:57:16 +0100 |
| parents | 390d16ea7c76 |
| children | 45bfcd16f27e |
comparison
equal
deleted
inserted
replaced
| 36849:9c636ec1ef37 | 36850:ff541b8cdee0 |
|---|---|
| 2179 except IOError as inst: | 2179 except IOError as inst: |
| 2180 if inst.errno != errno.ENOENT: | 2180 if inst.errno != errno.ENOENT: |
| 2181 raise | 2181 raise |
| 2182 cmdutil.wrongtooltocontinue(repo, _('graft')) | 2182 cmdutil.wrongtooltocontinue(repo, _('graft')) |
| 2183 else: | 2183 else: |
| 2184 if not revs: | |
| 2185 raise error.Abort(_('no revisions specified')) | |
| 2184 cmdutil.checkunfinished(repo) | 2186 cmdutil.checkunfinished(repo) |
| 2185 cmdutil.bailifchanged(repo) | 2187 cmdutil.bailifchanged(repo) |
| 2186 if not revs: | |
| 2187 raise error.Abort(_('no revisions specified')) | |
| 2188 revs = scmutil.revrange(repo, revs) | 2188 revs = scmutil.revrange(repo, revs) |
| 2189 | 2189 |
| 2190 skipped = set() | 2190 skipped = set() |
| 2191 # check for merges | 2191 # check for merges |
| 2192 for rev in repo.revs('%ld and merge()', revs): | 2192 for rev in repo.revs('%ld and merge()', revs): |