Show More
@@ -3339,7 +3339,7 b' def qqueue(ui, repo, name=None, **opts):' | |||
|
3339 | 3339 | continue |
|
3340 | 3340 | fh.write('%s\n' % (queue,)) |
|
3341 | 3341 | fh.close() |
|
3342 |
|
|
|
3342 | repo.vfs.rename('patches.queues.new', _allqueues) | |
|
3343 | 3343 | |
|
3344 | 3344 | if not name or opts.get('list') or opts.get('active'): |
|
3345 | 3345 | current = _getcurrent() |
@@ -3392,7 +3392,7 b' def qqueue(ui, repo, name=None, **opts):' | |||
|
3392 | 3392 | else: |
|
3393 | 3393 | fh.write('%s\n' % (queue,)) |
|
3394 | 3394 | fh.close() |
|
3395 |
|
|
|
3395 | repo.vfs.rename('patches.queues.new', _allqueues) | |
|
3396 | 3396 | _setactivenocheck(name) |
|
3397 | 3397 | elif opts.get('delete'): |
|
3398 | 3398 | _delete(name) |
@@ -551,15 +551,13 b' def unshelveabort(ui, repo, state, opts)' | |||
|
551 | 551 | try: |
|
552 | 552 | checkparents(repo, state) |
|
553 | 553 | |
|
554 |
|
|
|
555 | repo.join('rebasestate')) | |
|
554 | repo.vfs.rename('unshelverebasestate', 'rebasestate') | |
|
556 | 555 | try: |
|
557 | 556 | rebase.rebase(ui, repo, **{ |
|
558 | 557 | 'abort' : True |
|
559 | 558 | }) |
|
560 | 559 | except Exception: |
|
561 |
|
|
|
562 | repo.join('unshelverebasestate')) | |
|
560 | repo.vfs.rename('rebasestate', 'unshelverebasestate') | |
|
563 | 561 | raise |
|
564 | 562 | |
|
565 | 563 | mergefiles(ui, repo, state.wctx, state.pendingctx) |
@@ -619,15 +617,13 b' def unshelvecontinue(ui, repo, state, op' | |||
|
619 | 617 | _("unresolved conflicts, can't continue"), |
|
620 | 618 | hint=_("see 'hg resolve', then 'hg unshelve --continue'")) |
|
621 | 619 | |
|
622 |
|
|
|
623 | repo.join('rebasestate')) | |
|
620 | repo.vfs.rename('unshelverebasestate', 'rebasestate') | |
|
624 | 621 | try: |
|
625 | 622 | rebase.rebase(ui, repo, **{ |
|
626 | 623 | 'continue' : True |
|
627 | 624 | }) |
|
628 | 625 | except Exception: |
|
629 | util.rename(repo.join('rebasestate'), | |
|
630 | repo.join('unshelverebasestate')) | |
|
626 | repo.vfs.rename('rebasestate', 'unshelverebasestate') | |
|
631 | 627 | raise |
|
632 | 628 | |
|
633 | 629 | shelvectx = repo['tip'] |
@@ -698,8 +694,7 b' def _rebaserestoredcommit(ui, repo, opts' | |||
|
698 | 694 | shelvedstate.save(repo, basename, pctx, tmpwctx, stripnodes, |
|
699 | 695 | branchtorestore, opts.get('keep')) |
|
700 | 696 | |
|
701 | util.rename(repo.join('rebasestate'), | |
|
702 | repo.join('unshelverebasestate')) | |
|
697 | repo.vfs.rename('rebasestate', 'unshelverebasestate') | |
|
703 | 698 | raise error.InterventionRequired( |
|
704 | 699 | _("unresolved conflicts (see 'hg resolve', then " |
|
705 | 700 | "'hg unshelve --continue')")) |
General Comments 0
You need to be logged in to leave comments.
Login now