comparison hgext/shelve.py @ 20982:1df99f1ea28d

shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs

"applybundle()" also includes "addchangegroup()" invocation to
encapsulate "vfs.join()" inside it.

20981:4fdd1172d37e

            return self.vfs(self.fname, mode)
        except IOError, err:
            if err.errno != errno.ENOENT:
                raise
            raise util.Abort(_("shelved change '%s' not found") % self.name)

class shelvedstate(object):
    """Handle persistence during unshelving operations.

    Handles saving and restoring a shelved state. Ensures that different

            tempopts['date'] = opts.get('date')
            ui.quiet = True
            node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
            tmpwctx = repo[node]

        try:
            ui.quiet = True
            fp = shelvedfile(repo, basename, 'hg').opener()
            gen = changegroup.readbundle(fp, fp.name)
            changegroup.addchangegroup(repo, gen, 'unshelve',
                                       'bundle:' + fp.name)
            nodes = [ctx.node() for ctx in repo.set('%d:', oldtiprev)]
            phases.retractboundary(repo, phases.secret, nodes)
        finally:
            fp.close()

        ui.quiet = oldquiet

        shelvectx = repo['tip']

20982:1df99f1ea28d

            return self.vfs(self.fname, mode)
        except IOError, err:
            if err.errno != errno.ENOENT:
                raise
            raise util.Abort(_("shelved change '%s' not found") % self.name)

    def applybundle(self):
        fp = self.opener()
        try:
            gen = changegroup.readbundle(fp, self.fname, self.vfs)
            changegroup.addchangegroup(self.repo, gen, 'unshelve',
                                       'bundle:' + self.vfs.join(self.fname))
        finally:
            fp.close()

class shelvedstate(object):
    """Handle persistence during unshelving operations.

    Handles saving and restoring a shelved state. Ensures that different

            tempopts['date'] = opts.get('date')
            ui.quiet = True
            node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
            tmpwctx = repo[node]

        ui.quiet = True
        shelvedfile(repo, basename, 'hg').applybundle()
        nodes = [ctx.node() for ctx in repo.set('%d:', oldtiprev)]
        phases.retractboundary(repo, phases.secret, nodes)

        ui.quiet = oldquiet

        shelvectx = repo['tip']