Show More
@@ -99,6 +99,10 b' class ShelfDir:' | |||||
99 | return sorted(info, reverse=True) |
|
99 | return sorted(info, reverse=True) | |
100 |
|
100 | |||
101 |
|
101 | |||
|
102 | def _target_phase(repo): | |||
|
103 | return phases.internal if phases.supportinternal(repo) else phases.secret | |||
|
104 | ||||
|
105 | ||||
102 | class Shelf: |
|
106 | class Shelf: | |
103 | """Represents a shelf, including possibly multiple files storing it. |
|
107 | """Represents a shelf, including possibly multiple files storing it. | |
104 |
|
108 | |||
@@ -167,9 +171,7 b' class Shelf:' | |||||
167 | filename = self.name + b'.hg' |
|
171 | filename = self.name + b'.hg' | |
168 | fp = self.vfs(filename) |
|
172 | fp = self.vfs(filename) | |
169 | try: |
|
173 | try: | |
170 |
targetphase = |
|
174 | targetphase = _target_phase(repo) | |
171 | if not phases.supportinternal(repo): |
|
|||
172 | targetphase = phases.secret |
|
|||
173 | gen = exchange.readbundle(repo.ui, fp, filename, self.vfs) |
|
175 | gen = exchange.readbundle(repo.ui, fp, filename, self.vfs) | |
174 | pretip = repo[b'tip'] |
|
176 | pretip = repo[b'tip'] | |
175 | bundle2.applybundle( |
|
177 | bundle2.applybundle( | |
@@ -485,9 +487,7 b' def getcommitfunc(extra, interactive, ed' | |||||
485 | if hasmq: |
|
487 | if hasmq: | |
486 | saved, repo.mq.checkapplied = repo.mq.checkapplied, False |
|
488 | saved, repo.mq.checkapplied = repo.mq.checkapplied, False | |
487 |
|
489 | |||
488 |
targetphase = |
|
490 | targetphase = _target_phase(repo) | |
489 | if not phases.supportinternal(repo): |
|
|||
490 | targetphase = phases.secret |
|
|||
491 | overrides = {(b'phases', b'new-commit'): targetphase} |
|
491 | overrides = {(b'phases', b'new-commit'): targetphase} | |
492 | try: |
|
492 | try: | |
493 | editor_ = False |
|
493 | editor_ = False | |
@@ -851,9 +851,7 b' def unshelvecontinue(ui, repo, state, op' | |||||
851 | repo.setparents(state.pendingctx.node(), repo.nullid) |
|
851 | repo.setparents(state.pendingctx.node(), repo.nullid) | |
852 | repo.dirstate.write(repo.currenttransaction()) |
|
852 | repo.dirstate.write(repo.currenttransaction()) | |
853 |
|
853 | |||
854 |
targetphase = |
|
854 | targetphase = _target_phase(repo) | |
855 | if not phases.supportinternal(repo): |
|
|||
856 | targetphase = phases.secret |
|
|||
857 | overrides = {(b'phases', b'new-commit'): targetphase} |
|
855 | overrides = {(b'phases', b'new-commit'): targetphase} | |
858 | with repo.ui.configoverride(overrides, b'unshelve'): |
|
856 | with repo.ui.configoverride(overrides, b'unshelve'): | |
859 | with repo.dirstate.parentchange(): |
|
857 | with repo.dirstate.parentchange(): |
General Comments 0
You need to be logged in to leave comments.
Login now