Mercurial > hg
view tests/pullext.py @ 40790:f07d4f94f098 stable
rebase: preserve working copy when redoing in-mem rebase on disk
When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.
Differential Revision: https://phab.mercurial-scm.org/D5356
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 30 Nov 2018 16:21:37 -0800 |
parents | 229d23cdb203 |
children | 70a00a8cd66e |
line wrap: on
line source
# pullext.py - Simple extension to test pulling # # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( commands, error, extensions, localrepo, repository, ) def clonecommand(orig, ui, repo, *args, **kwargs): if kwargs.get(r'include') or kwargs.get(r'exclude'): kwargs[r'narrow'] = True if kwargs.get(r'depth'): try: kwargs[r'depth'] = int(kwargs[r'depth']) except ValueError: raise error.Abort(_('--depth must be an integer')) return orig(ui, repo, *args, **kwargs) def featuresetup(ui, features): features.add(repository.NARROW_REQUIREMENT) def extsetup(ui): entry = extensions.wrapcommand(commands.table, 'clone', clonecommand) hasinclude = any(x[1] == 'include' for x in entry[1]) hasdepth = any(x[1] == 'depth' for x in entry[1]) if not hasinclude: entry[1].append(('', 'include', [], _('pattern of file/directory to clone'))) entry[1].append(('', 'exclude', [], _('pattern of file/directory to not clone'))) if not hasdepth: entry[1].append(('', 'depth', '', _('ancestry depth of changesets to fetch'))) localrepo.featuresetupfuncs.add(featuresetup)