upstream/mercurial-mirror Files · mercurial/interfaces/util.py

fix: add a -s option to format a revision and its descendants...

fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r45064:5205b46b

default

Download file

             util.py
        
                    38 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / interfaces / util.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # util.py - Utilities for declaring interfaces.

      #

      # 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.

      # zope.interface imposes a run-time cost due to module import overhead and

      # bookkeeping for declaring interfaces. So, we use stubs for various

      # zope.interface primitives unless instructed otherwise.

      from __future__ import absolute_import

      from .. import encoding

      if encoding.environ.get(b'HGREALINTERFACES'):

          from ..thirdparty.zope import interface as zi

          Attribute = zi.Attribute

          Interface = zi.Interface

          implementer = zi.implementer

      else:

          class Attribute(object):

              def __init__(self, __name__, __doc__=b''):

                  pass

          class Interface(object):

              def __init__(

                  self, name, bases=(), attrs=None, __doc__=None, __module__=None

              ):

                  pass

          def implementer(*ifaces):

              def wrapper(cls):

                  return cls

              return wrapper

	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

				# util.py - Utilities for declaring interfaces.
				#
				# 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.

				# zope.interface imposes a run-time cost due to module import overhead and
				# bookkeeping for declaring interfaces. So, we use stubs for various
				# zope.interface primitives unless instructed otherwise.

				from __future__ import absolute_import

				from .. import encoding

				if encoding.environ.get(b'HGREALINTERFACES'):
				from ..thirdparty.zope import interface as zi

				Attribute = zi.Attribute
				Interface = zi.Interface
				implementer = zi.implementer
				else:

				class Attribute(object):
				def __init__(self, __name__, __doc__=b''):
				pass

				class Interface(object):
				def __init__(
				self, name, bases=(), attrs=None, __doc__=None, __module__=None
				):
				pass

				def implementer(*ifaces):
				def wrapper(cls):
				return cls

				return wrapper