equal
deleted
inserted
replaced
1801 atbranch = data |
1801 atbranch = data |
1802 ui.progress(_('building'), id, unit=_('revisions'), total=total) |
1802 ui.progress(_('building'), id, unit=_('revisions'), total=total) |
1803 tr.close() |
1803 tr.close() |
1804 |
1804 |
1805 if tags: |
1805 if tags: |
1806 repo.opener.write("localtags", "".join(tags)) |
1806 repo.vfs.write("localtags", "".join(tags)) |
1807 finally: |
1807 finally: |
1808 ui.progress(_('building'), None) |
1808 ui.progress(_('building'), None) |
1809 release(tr, lock) |
1809 release(tr, lock) |
1810 |
1810 |
1811 @command('debugbundle', |
1811 @command('debugbundle', |
3375 cont = True |
3375 cont = True |
3376 if revs: |
3376 if revs: |
3377 raise util.Abort(_("can't specify --continue and revisions")) |
3377 raise util.Abort(_("can't specify --continue and revisions")) |
3378 # read in unfinished revisions |
3378 # read in unfinished revisions |
3379 try: |
3379 try: |
3380 nodes = repo.opener.read('graftstate').splitlines() |
3380 nodes = repo.vfs.read('graftstate').splitlines() |
3381 revs = [repo[node].rev() for node in nodes] |
3381 revs = [repo[node].rev() for node in nodes] |
3382 except IOError, inst: |
3382 except IOError, inst: |
3383 if inst.errno != errno.ENOENT: |
3383 if inst.errno != errno.ENOENT: |
3384 raise |
3384 raise |
3385 raise util.Abort(_("no graft state found, can't continue")) |
3385 raise util.Abort(_("no graft state found, can't continue")) |
3504 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
3504 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
3505 # report any conflicts |
3505 # report any conflicts |
3506 if stats and stats[3] > 0: |
3506 if stats and stats[3] > 0: |
3507 # write out state for --continue |
3507 # write out state for --continue |
3508 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
3508 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
3509 repo.opener.write('graftstate', ''.join(nodelines)) |
3509 repo.vfs.write('graftstate', ''.join(nodelines)) |
3510 raise util.Abort( |
3510 raise util.Abort( |
3511 _("unresolved conflicts, can't continue"), |
3511 _("unresolved conflicts, can't continue"), |
3512 hint=_('use hg resolve and hg graft --continue')) |
3512 hint=_('use hg resolve and hg graft --continue')) |
3513 else: |
3513 else: |
3514 cont = False |
3514 cont = False |