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

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r47570:c52c3c4c

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