Show More
@@ -453,7 +453,7 b' def _aborttransaction(repo, tr):' | |||||
453 | # transaction to do so. |
|
453 | # transaction to do so. | |
454 | assert repo.currenttransaction() is None |
|
454 | assert repo.currenttransaction() is None | |
455 | repo.dirstate.write(None) |
|
455 | repo.dirstate.write(None) | |
456 | ds.setbranch(current_branch) |
|
456 | ds.setbranch(current_branch, None) | |
457 |
|
457 | |||
458 |
|
458 | |||
459 | def getshelvename(repo, parent, opts): |
|
459 | def getshelvename(repo, parent, opts): | |
@@ -631,7 +631,9 b' def _docreatecmd(ui, repo, pats, opts):' | |||||
631 | if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): |
|
631 | if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): | |
632 | # In non-bare shelve we don't store newly created branch |
|
632 | # In non-bare shelve we don't store newly created branch | |
633 | # at bundled commit |
|
633 | # at bundled commit | |
634 |
repo.dirstate.setbranch( |
|
634 | repo.dirstate.setbranch( | |
|
635 | repo[b'.'].branch(), repo.currenttransaction() | |||
|
636 | ) | |||
635 |
|
637 | |||
636 | commitfunc = getcommitfunc(extra, interactive, editor=True) |
|
638 | commitfunc = getcommitfunc(extra, interactive, editor=True) | |
637 | if not interactive: |
|
639 | if not interactive: | |
@@ -665,7 +667,7 b' def _docreatecmd(ui, repo, pats, opts):' | |||||
665 | ms.reset() |
|
667 | ms.reset() | |
666 |
|
668 | |||
667 | if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts): |
|
669 | if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts): | |
668 | repo.dirstate.setbranch(origbranch) |
|
670 | repo.dirstate.setbranch(origbranch, repo.currenttransaction()) | |
669 |
|
671 | |||
670 | _finishshelve(repo, tr) |
|
672 | _finishshelve(repo, tr) | |
671 | finally: |
|
673 | finally: | |
@@ -849,7 +851,7 b' def mergefiles(ui, repo, wctx, shelvectx' | |||||
849 |
|
851 | |||
850 | def restorebranch(ui, repo, branchtorestore): |
|
852 | def restorebranch(ui, repo, branchtorestore): | |
851 | if branchtorestore and branchtorestore != repo.dirstate.branch(): |
|
853 | if branchtorestore and branchtorestore != repo.dirstate.branch(): | |
852 | repo.dirstate.setbranch(branchtorestore) |
|
854 | repo.dirstate.setbranch(branchtorestore, repo.currenttransaction()) | |
853 | ui.status( |
|
855 | ui.status( | |
854 | _(b'marked working directory as branch %s\n') % branchtorestore |
|
856 | _(b'marked working directory as branch %s\n') % branchtorestore | |
855 | ) |
|
857 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now