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

absorb: preserve changesets which were already empty...

absorb: preserve changesets which were already empty Most commands in Mercurial (commit, rebase, absorb itself) don’t create empty changesets or drop them if they become empty. If there’s a changeset that’s empty, it must be a deliberate choice of the user. At least it shouldn’t be absorb’s responsibility to prune them. The fact that changesets that became empty during absorb are pruned, is unaffected by this. This case was found while writing patches which make it possible to configure absorb and rebase to not drop empty changesets. Even without having such config set, I think it’s valuable to preserve changesets which were already empty.

Martin von Zweigbergk - - Load All Authors

File last commit:

r44968:ec54b3d2 default


                r45518:1ca0047f

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)