Show More
@@ -2222,7 +2222,7 b' def _dograft(ui, repo, *revs, **opts):' | |||||
2222 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2222 | raise error.Abort(_("can't specify --continue and revisions")) | |
2223 | # read in unfinished revisions |
|
2223 | # read in unfinished revisions | |
2224 | try: |
|
2224 | try: | |
2225 |
nodes = repo |
|
2225 | nodes = _readgraftstate(repo)['nodes'] | |
2226 | revs = [repo[node].rev() for node in nodes] |
|
2226 | revs = [repo[node].rev() for node in nodes] | |
2227 | except IOError as inst: |
|
2227 | except IOError as inst: | |
2228 | if inst.errno != errno.ENOENT: |
|
2228 | if inst.errno != errno.ENOENT: | |
@@ -2381,6 +2381,11 b' def _dograft(ui, repo, *revs, **opts):' | |||||
2381 |
|
2381 | |||
2382 | return 0 |
|
2382 | return 0 | |
2383 |
|
2383 | |||
|
2384 | def _readgraftstate(repo): | |||
|
2385 | """read the graft state file and return a dict of the data stored in it""" | |||
|
2386 | nodes = repo.vfs.read('graftstate').splitlines() | |||
|
2387 | return {'nodes': nodes} | |||
|
2388 | ||||
2384 | @command('grep', |
|
2389 | @command('grep', | |
2385 | [('0', 'print0', None, _('end fields with NUL')), |
|
2390 | [('0', 'print0', None, _('end fields with NUL')), | |
2386 | ('', 'all', None, _('print all revisions that match')), |
|
2391 | ('', 'all', None, _('print all revisions that match')), |
General Comments 0
You need to be logged in to leave comments.
Login now