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

commit: check branch change on to-be-committed changeset...

commit: check branch change on to-be-committed changeset This makes a difference when a branch name is passed via the `extra` argument, which will be used as the branch name for the created changeset. The empty commit check should use that branch name instead of whatever was set on the working directory. Besides fixing the bug for which a test case was extended, it enables to remove a workaround in the rebase extension, which will be done in a follow-up patch (D8725). Differential Revision: https://phab.mercurial-scm.org/D8724

Martin von Zweigbergk - - Load All Authors

File last commit:

r44968:ec54b3d2 default


                r45644:07b3166e

default

Download file

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

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

      from __future__ import absolute_import

      from mercurial.node import bin, hex, nullid

      from mercurial import pycompat

      pygit2_module = None

      def get_pygit2():

          global pygit2_module

          if pygit2_module is None:

              try:

                  import pygit2 as pygit2_module

                  pygit2_module.InvalidSpecError

              except (ImportError, AttributeError):

                  pass

          return pygit2_module

      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 pycompat.sysstr(hex(n))

      def fromgitnode(n):

          """Opposite of togitnode."""

          assert len(n) == 40

          if pycompat.ispy3:

              return bin(n.encode('ascii'))

          return bin(n)

      nullgit = togitnode(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 __future__ import absolute_import

				from mercurial.node import bin, hex, nullid

				from mercurial import pycompat

				pygit2_module = None


				def get_pygit2():
				global pygit2_module
				if pygit2_module is None:
				try:
				import pygit2 as pygit2_module

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


				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 pycompat.sysstr(hex(n))


				def fromgitnode(n):
				"""Opposite of togitnode."""
				assert len(n) == 40
				if pycompat.ispy3:
				return bin(n.encode('ascii'))
				return bin(n)


				nullgit = togitnode(nullid)