Show More
@@ -160,10 +160,11 b' class shelvedfile(object):' | |||||
160 | btype = 'HG20' |
|
160 | btype = 'HG20' | |
161 | compression = 'BZ' |
|
161 | compression = 'BZ' | |
162 |
|
162 | |||
163 | outgoing = discovery.outgoing(self.repo, missingroots=bases, |
|
163 | repo = self.repo.unfiltered() | |
|
164 | ||||
|
165 | outgoing = discovery.outgoing(repo, missingroots=bases, | |||
164 | missingheads=[node]) |
|
166 | missingheads=[node]) | |
165 |
cg = changegroup.makechangegroup( |
|
167 | cg = changegroup.makechangegroup(repo, outgoing, cgversion, 'shelve') | |
166 | 'shelve') |
|
|||
167 |
|
168 | |||
168 | bundle2.writebundle(self.ui, cg, self.fname, btype, self.vfs, |
|
169 | bundle2.writebundle(self.ui, cg, self.fname, btype, self.vfs, | |
169 | compression=compression) |
|
170 | compression=compression) | |
@@ -762,6 +763,7 b' def _commitworkingcopychanges(ui, repo, ' | |||||
762 |
|
763 | |||
763 | def _unshelverestorecommit(ui, repo, basename): |
|
764 | def _unshelverestorecommit(ui, repo, basename): | |
764 | """Recreate commit in the repository during the unshelve""" |
|
765 | """Recreate commit in the repository during the unshelve""" | |
|
766 | repo = repo.unfiltered() | |||
765 | with ui.configoverride({('ui', 'quiet'): True}): |
|
767 | with ui.configoverride({('ui', 'quiet'): True}): | |
766 | shelvedfile(repo, basename, 'hg').applybundle() |
|
768 | shelvedfile(repo, basename, 'hg').applybundle() | |
767 | shelvectx = repo['tip'] |
|
769 | shelvectx = repo['tip'] | |
@@ -961,6 +963,7 b' def _dounshelve(ui, repo, *shelved, **op' | |||||
961 | if not shelvedfile(repo, basename, patchextension).exists(): |
|
963 | if not shelvedfile(repo, basename, patchextension).exists(): | |
962 | raise error.Abort(_("shelved change '%s' not found") % basename) |
|
964 | raise error.Abort(_("shelved change '%s' not found") % basename) | |
963 |
|
965 | |||
|
966 | repo = repo.unfiltered() | |||
964 | lock = tr = None |
|
967 | lock = tr = None | |
965 | try: |
|
968 | try: | |
966 | lock = repo.lock() |
|
969 | lock = repo.lock() |
General Comments 0
You need to be logged in to leave comments.
Login now