Mercurial > public > mercurial-scm > hg-stable
diff hgext/shelve.py @ 33055:18c2489ac96d
bundle: make applybundle() delegate v1 bundles to applybundle1()
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 22 Jun 2017 15:00:19 -0700 |
| parents | b82615afde65 |
| children | ea03b3223611 |
line wrap: on
line diff
--- a/hgext/shelve.py Thu Jun 22 21:27:57 2017 -0700 +++ b/hgext/shelve.py Thu Jun 22 15:00:19 2017 -0700 @@ -126,17 +126,10 @@ fp = self.opener() try: gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs) - if not isinstance(gen, bundle2.unbundle20): - bundle2.applybundle1(self.repo, gen, - self.repo.currenttransaction(), - source='unshelve', - url='bundle:' + self.vfs.join(self.fname), - targetphase=phases.secret) - else: - bundle2.applybundle(self.repo, gen, - self.repo.currenttransaction(), - source='unshelve', - url='bundle:' + self.vfs.join(self.fname)) + bundle2.applybundle(self.repo, gen, self.repo.currenttransaction(), + source='unshelve', + url='bundle:' + self.vfs.join(self.fname), + targetphase=phases.secret) finally: fp.close()