comparison hgext/shelve.py @ 33039:b82615afde65

bundle: add a applybundle1() method

This is one step towards removing a bunch of "if isinstance(gen,
unbundle20)" by treating bundle1 and bundle2 more similarly.

The name may sounds ironic for a method in the bundle2 module, but I
didn't think it was worth it yet to create a new 'bundle' module that
depends on the 'bundle2' module. Besides, we'll inline the method
again later.

33038:f0efd2bffe1e

    def applybundle(self):
        fp = self.opener()
        try:
            gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
            if not isinstance(gen, bundle2.unbundle20):
                gen.apply(self.repo, self.repo.currenttransaction(), 'unshelve',
                          '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))

33039:b82615afde65

    def applybundle(self):
        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))