Show More
@@ -54,6 +54,7 b' from . import (' | |||
|
54 | 54 | rewriteutil, |
|
55 | 55 | scmutil, |
|
56 | 56 | server, |
|
57 | state as statemod, | |
|
57 | 58 | streamclone, |
|
58 | 59 | tags as tagsmod, |
|
59 | 60 | templatekw, |
@@ -2216,17 +2217,16 b' def _dograft(ui, repo, *revs, **opts):' | |||
|
2216 | 2217 | **pycompat.strkwargs(opts)) |
|
2217 | 2218 | |
|
2218 | 2219 | cont = False |
|
2220 | graftstate = statemod.cmdstate(repo, 'graftstate') | |
|
2219 | 2221 | if opts.get('continue'): |
|
2220 | 2222 | cont = True |
|
2221 | 2223 | if revs: |
|
2222 | 2224 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2223 | 2225 | # read in unfinished revisions |
|
2224 | try: | |
|
2226 | if graftstate.exists(): | |
|
2225 | 2227 | nodes = _readgraftstate(repo)['nodes'] |
|
2226 | 2228 | revs = [repo[node].rev() for node in nodes] |
|
2227 | except IOError as inst: | |
|
2228 | if inst.errno != errno.ENOENT: | |
|
2229 | raise | |
|
2229 | else: | |
|
2230 | 2230 | cmdutil.wrongtooltocontinue(repo, _('graft')) |
|
2231 | 2231 | else: |
|
2232 | 2232 | if not revs: |
General Comments 0
You need to be logged in to leave comments.
Login now