upstream/mercurial-mirror Files · mercurial/thirdparty/attr/__init__.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

Siddharth Agarwal - - Load All Authors

File last commit:

r34398:765eb17a default


                r47570:c52c3c4c

default

Download file

             __init__.py
        
                    71 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / attr / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, division, print_function

      from ._funcs import (

          asdict,

          assoc,

          astuple,

          evolve,

          has,

      )

      from ._make import (

          Attribute,

          Factory,

          NOTHING,

          attr,

          attributes,

          fields,

          make_class,

          validate,

      )

      from ._config import (

          get_run_validators,

          set_run_validators,

      )

      from . import exceptions

      from . import filters

      from . import converters

      from . import validators

      __version__ = "17.2.0"

      __title__ = "attrs"

      __description__ = "Classes Without Boilerplate"

      __uri__ = "http://www.attrs.org/"

      __doc__ = __description__ + " <" + __uri__ + ">"

      __author__ = "Hynek Schlawack"

      __email__ = "hs@ox.cx"

      __license__ = "MIT"

      __copyright__ = "Copyright (c) 2015 Hynek Schlawack"

      s = attrs = attributes

      ib = attrib = attr

      __all__ = [

          "Attribute",

          "Factory",

          "NOTHING",

          "asdict",

          "assoc",

          "astuple",

          "attr",

          "attrib",

          "attributes",

          "attrs",

          "converters",

          "evolve",

          "exceptions",

          "fields",

          "filters",

          "get_run_validators",

          "has",

          "ib",

          "make_class",

          "s",

          "set_run_validators",

          "validate",

          "validators",

      ]

	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

				from __future__ import absolute_import, division, print_function

				from ._funcs import (
				asdict,
				assoc,
				astuple,
				evolve,
				has,
				)
				from ._make import (
				Attribute,
				Factory,
				NOTHING,
				attr,
				attributes,
				fields,
				make_class,
				validate,
				)
				from ._config import (
				get_run_validators,
				set_run_validators,
				)
				from . import exceptions
				from . import filters
				from . import converters
				from . import validators


				__version__ = "17.2.0"

				__title__ = "attrs"
				__description__ = "Classes Without Boilerplate"
				__uri__ = "http://www.attrs.org/"
				__doc__ = __description__ + " <" + __uri__ + ">"

				__author__ = "Hynek Schlawack"
				__email__ = "hs@ox.cx"

				__license__ = "MIT"
				__copyright__ = "Copyright (c) 2015 Hynek Schlawack"


				s = attrs = attributes
				ib = attrib = attr

				__all__ = [
				"Attribute",
				"Factory",
				"NOTHING",
				"asdict",
				"assoc",
				"astuple",
				"attr",
				"attrib",
				"attributes",
				"attrs",
				"converters",
				"evolve",
				"exceptions",
				"fields",
				"filters",
				"get_run_validators",
				"has",
				"ib",
				"make_class",
				"s",
				"set_run_validators",
				"validate",
				"validators",
				]