equal
deleted
inserted
replaced
103 fp.close() |
103 fp.close() |
104 |
104 |
105 def bundlerepo(self): |
105 def bundlerepo(self): |
106 return bundlerepo.bundlerepository(self.repo.baseui, self.repo.root, |
106 return bundlerepo.bundlerepository(self.repo.baseui, self.repo.root, |
107 self.vfs.join(self.fname)) |
107 self.vfs.join(self.fname)) |
108 def writebundle(self, cg): |
108 def writebundle(self, bases, node): |
|
109 cg = changegroup.changegroupsubset(self.repo, bases, [node], 'shelve') |
109 changegroup.writebundle(self.ui, cg, self.fname, 'HG10BZ', self.vfs) |
110 changegroup.writebundle(self.ui, cg, self.fname, 'HG10BZ', self.vfs) |
110 |
111 |
111 class shelvedstate(object): |
112 class shelvedstate(object): |
112 """Handle persistence during unshelving operations. |
113 """Handle persistence during unshelving operations. |
113 |
114 |
289 else: |
290 else: |
290 ui.status(_("nothing changed\n")) |
291 ui.status(_("nothing changed\n")) |
291 return 1 |
292 return 1 |
292 |
293 |
293 bases = list(publicancestors(repo[node])) |
294 bases = list(publicancestors(repo[node])) |
294 cg = changegroup.changegroupsubset(repo, bases, [node], 'shelve') |
295 shelvedfile(repo, name, 'hg').writebundle(bases, node) |
295 shelvedfile(repo, name, 'hg').writebundle(cg) |
|
296 cmdutil.export(repo, [node], |
296 cmdutil.export(repo, [node], |
297 fp=shelvedfile(repo, name, 'patch').opener('wb'), |
297 fp=shelvedfile(repo, name, 'patch').opener('wb'), |
298 opts=mdiff.diffopts(git=True)) |
298 opts=mdiff.diffopts(git=True)) |
299 |
299 |
300 |
300 |