upstream/mercurial-mirror Files · hgext/narrow/narrowpatch.py

rebase: introduce support for automatically rebasing orphan changes...

rebase: introduce support for automatically rebasing orphan changes _destautorebase(SRC) is based on the _destrestack(SRC) revset from fbamend. The supporting _possibledestination function is extracted from evolve, with minor cleanups. We've considered some alternatives here: * This change, but with --auto as the flag name. We're hedging our bets on this a little in this change so that if this ends up being the wrong direction we haven't burned the valauble --auto name on rebase. * --destination auto: I've got reservations about the discoverability of this, and we don't currently have a good story for a revset alias of sorts that changes behavior depending on the context in which it's used. * A "rebase presets" feature, where we could use the currently-an-error positional argument space for the rebase command to define presets, so that users could define a 'linearize' preset that specifies --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC). Personally, I find the third option somewhat appealing, but am hesitant to "spend" the functionality space of positional arguments to the rebase command. We should revisit the way we expose this functionality sometime in the 4.7 cycle once we've had a chance to vet the implementation of the functionality. Differential Revision: https://phab.mercurial-scm.org/D2668

Martin von Zweigbergk - - Load All Authors

File last commit:

r36490:d0d5eef5 default


                r37805:92213f67

default

Download file

             narrowpatch.py
        
                    41 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / narrow / narrowpatch.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # narrowpatch.py - extensions to mercurial patch module to support narrow clones

      #

      # Copyright 2017 Google, Inc.

      #

      # 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 import (

          extensions,

          patch,

      )

      def setup(repo):

          def _filepairs(orig, *args):

              """Only includes files within the narrow spec in the diff."""

              narrowmatch = repo.narrowmatch()

              if not narrowmatch.always():

                  for x in orig(*args):

                      f1, f2, copyop = x

                      if ((not f1 or narrowmatch(f1)) and

                          (not f2 or narrowmatch(f2))):

                          yield x

              else:

                  for x in orig(*args):

                      yield x

          def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,

                      copy, getfilectx, *args, **kwargs):

              narrowmatch = repo.narrowmatch()

              if not narrowmatch.always():

                  modified = [f for f in modified if narrowmatch(f)]

                  added = [f for f in added if narrowmatch(f)]

                  removed = [f for f in removed if narrowmatch(f)]

                  copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}

              return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,

                          getfilectx, *args, **kwargs)

          extensions.wrapfunction(patch, '_filepairs', _filepairs)

          extensions.wrapfunction(patch, 'trydiff', trydiff)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# narrowpatch.py - extensions to mercurial patch module to support narrow clones
				#
				# Copyright 2017 Google, Inc.
				#
				# 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 import (
				extensions,
				patch,
				)

				def setup(repo):
				def _filepairs(orig, *args):
				"""Only includes files within the narrow spec in the diff."""
				narrowmatch = repo.narrowmatch()
				if not narrowmatch.always():
				for x in orig(*args):
				f1, f2, copyop = x
				if ((not f1 or narrowmatch(f1)) and
				(not f2 or narrowmatch(f2))):
				yield x
				else:
				for x in orig(*args):
				yield x

				def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
				copy, getfilectx, args, *kwargs):
				narrowmatch = repo.narrowmatch()
				if not narrowmatch.always():
				modified = [f for f in modified if narrowmatch(f)]
				added = [f for f in added if narrowmatch(f)]
				removed = [f for f in removed if narrowmatch(f)]
				copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}
				return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,
				getfilectx, args, *kwargs)

				extensions.wrapfunction(patch, '_filepairs', _filepairs)
				extensions.wrapfunction(patch, 'trydiff', trydiff)