equal
deleted
inserted
replaced
2224 cont = True |
2224 cont = True |
2225 if revs: |
2225 if revs: |
2226 raise error.Abort(_("can't specify --continue and revisions")) |
2226 raise error.Abort(_("can't specify --continue and revisions")) |
2227 # read in unfinished revisions |
2227 # read in unfinished revisions |
2228 if graftstate.exists(): |
2228 if graftstate.exists(): |
2229 nodes = _readgraftstate(repo, graftstate)['nodes'] |
2229 statedata = _readgraftstate(repo, graftstate) |
|
2230 if statedata.get('date'): |
|
2231 opts['date'] = statedata['date'] |
|
2232 if statedata.get('user'): |
|
2233 opts['user'] = statedata['user'] |
|
2234 nodes = statedata['nodes'] |
2230 revs = [repo[node].rev() for node in nodes] |
2235 revs = [repo[node].rev() for node in nodes] |
2231 else: |
2236 else: |
2232 cmdutil.wrongtooltocontinue(repo, _('graft')) |
2237 cmdutil.wrongtooltocontinue(repo, _('graft')) |
2233 else: |
2238 else: |
2234 if not revs: |
2239 if not revs: |