upstream/mercurial-mirror Files · hgext/git/gitutil.py

commit: use `dirstate.change_files` to scope the associated `addremove`...

commit: use `dirstate.change_files` to scope the associated `addremove` This was significantly more complicated than I expected, because multiple extensions get in the way. I introduced a context that lazily open the transaction and associated context to work around these complication. See the inline documentation for details. Introducing the wrapping transaction remove the need for dirstate-guard (one of the ultimate goal of all this), and slightly affect the result of a `hg rollback` after a `hg commit --addremove`. That last part is deemed fine. It aligns the behavior with what happens after a failed `hg commit --addremove` and nobody should be using `hg rollback` anyway. The small output change in the test come from the different transaction timing and fact the transaction now backup the dirstate before the addremove, which might mean "no file to backup" when the repository starts from an empty state.

Matt Harbison - - Load All Authors

File last commit:

r50744:de9ffb82 default


                r50924:28dfb2df

default

Download file

             gitutil.py
        
                    48 lines
            
             | 988 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / git / gitutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """utilities to assist in working with pygit2"""

      from mercurial.node import bin, sha1nodeconstants

      pygit2_module = None

      def get_pygit2():

          global pygit2_module

          if pygit2_module is None:

              try:

                  import pygit2 as pygit2_module  # pytype: disable=import-error

                  pygit2_module.InvalidSpecError

              except (ImportError, AttributeError):

                  pass

          return pygit2_module

      def pygit2_version():

          mod = get_pygit2()

          v = "N/A"

          if mod:

              try:

                  v = mod.__version__

              except AttributeError:

                  pass

          return b"(pygit2 %s)" % v.encode("utf-8")

      def togitnode(n):

          """Wrapper to convert a Mercurial binary node to a unicode hexlified node.

          pygit2 and sqlite both need nodes as strings, not bytes.

          """

          assert len(n) == 20

          return n.hex()

      def fromgitnode(n):

          """Opposite of togitnode."""

          assert len(n) == 40

          return bin(n)

      nullgit = togitnode(sha1nodeconstants.nullid)

	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

				"""utilities to assist in working with pygit2"""

				from mercurial.node import bin, sha1nodeconstants

				pygit2_module = None


				def get_pygit2():
				global pygit2_module
				if pygit2_module is None:
				try:
				import pygit2 as pygit2_module # pytype: disable=import-error

				pygit2_module.InvalidSpecError
				except (ImportError, AttributeError):
				pass
				return pygit2_module


				def pygit2_version():
				mod = get_pygit2()
				v = "N/A"

				if mod:
				try:
				v = mod.__version__
				except AttributeError:
				pass

				return b"(pygit2 %s)" % v.encode("utf-8")


				def togitnode(n):
				"""Wrapper to convert a Mercurial binary node to a unicode hexlified node.

				pygit2 and sqlite both need nodes as strings, not bytes.
				"""
				assert len(n) == 20
				return n.hex()


				def fromgitnode(n):
				"""Opposite of togitnode."""
				assert len(n) == 40
				return bin(n)


				nullgit = togitnode(sha1nodeconstants.nullid)