comparison hgext/rebase.py @ 35290:482614b3802a

rebase: add the --inmemory option flag; assign a wctx object for the rebase

In the future, the --inmemory flag might be deprecated in favor of something more
intelligent (for example, always rebasing in-memory if the working copy parent
isn't in the rebaseset). But we might keep it as a way to explicitly force IMM
on or off.

Differential Revision: https://phab.mercurial-scm.org/D1232

35289:2f8c476c49fe

        # keepopen is not meant for use on the command line, but by
        # other extensions
        self.keepopen = opts.get('keepopen', False)
        self.obsoletenotrebased = {}
        self.obsoletewithoutsuccessorindestination = set()

    @property
    def repo(self):
        if self.prepared:
            return self._repo.unfiltered()

        self.prepared = True

    def _performrebase(self, tr):
        repo, ui = self.repo, self.ui
        if self.keepbranchesf:
            # insert _savebranch at the start of extrafns so if
            # there's a user-provided extrafn it can clobber branch if
            # desired
            self.extrafns.insert(0, _savebranch)

    ('', 'keepbranches', False, _('keep original branch names')),
    ('D', 'detach', False, _('(DEPRECATED)')),
    ('i', 'interactive', False, _('(DEPRECATED)')),
    ('t', 'tool', '', _('specify merge tool')),
    ('c', 'continue', False, _('continue an interrupted rebase')),
    ('a', 'abort', False, _('abort an interrupted rebase'))] +
    cmdutil.formatteropts,
    _('[-s REV | -b REV] [-d REV] [OPTION]'))
def rebase(ui, repo, **opts):
    """move changeset (and descendants) to a different branch

    Returns 0 on success, 1 if nothing to rebase or there are
    unresolved conflicts.

    """
    opts = pycompat.byteskwargs(opts)
    rbsrt = rebaseruntime(repo, ui, opts)

    with repo.wlock(), repo.lock():
        # Validate input and define rebasing points
        destf = opts.get('dest', None)

35290:482614b3802a

        # keepopen is not meant for use on the command line, but by
        # other extensions
        self.keepopen = opts.get('keepopen', False)
        self.obsoletenotrebased = {}
        self.obsoletewithoutsuccessorindestination = set()
        self.inmemory = opts.get('inmemory', False)

    @property
    def repo(self):
        if self.prepared:
            return self._repo.unfiltered()

        self.prepared = True

    def _performrebase(self, tr):
        repo, ui = self.repo, self.ui
        # Assign a working copy object.
        if self.inmemory:
            from mercurial.context import overlayworkingctx
            self.wctx = overlayworkingctx(self.repo)
        else:
            self.wctx = self.repo[None]
        if self.keepbranchesf:
            # insert _savebranch at the start of extrafns so if
            # there's a user-provided extrafn it can clobber branch if
            # desired
            self.extrafns.insert(0, _savebranch)

    ('', 'keepbranches', False, _('keep original branch names')),
    ('D', 'detach', False, _('(DEPRECATED)')),
    ('i', 'interactive', False, _('(DEPRECATED)')),
    ('t', 'tool', '', _('specify merge tool')),
    ('c', 'continue', False, _('continue an interrupted rebase')),
    ('',  'inmemory', False, _('run rebase in-memory (EXPERIMENTAL)')),
    ('a', 'abort', False, _('abort an interrupted rebase'))] +
    cmdutil.formatteropts,
    _('[-s REV | -b REV] [-d REV] [OPTION]'))
def rebase(ui, repo, **opts):
    """move changeset (and descendants) to a different branch

    Returns 0 on success, 1 if nothing to rebase or there are
    unresolved conflicts.

    """
    opts = pycompat.byteskwargs(opts)
    if 'inmemory' not in opts:
        opts['inmemory'] = False
    rbsrt = rebaseruntime(repo, ui, opts)

    with repo.wlock(), repo.lock():
        # Validate input and define rebasing points
        destf = opts.get('dest', None)