##// END OF EJS Templates
merge: use ACTION_* constants instead of values in _filternarrowactions()...
merge: use ACTION_* constants instead of values in _filternarrowactions() It makes easier to check what noconflicttypes are and which are not included. I hope we can have a state where we always use ACTION_* constants instead of these values which are very hard to understand. Differential Revision: https://phab.mercurial-scm.org/D8885

File last commit:

r44968:ec54b3d2 default
r45903:e3826f1d default
Show More
gitutil.py
40 lines | 866 B | text/x-python | PythonLexer
Augie Fackler
git: skeleton of a new extension to _directly_ operate on git repos...
r44961 """utilities to assist in working with pygit2"""
from __future__ import absolute_import
from mercurial.node import bin, hex, nullid
from mercurial import pycompat
Martin von Zweigbergk
git: don't fail import when pygit2 is not install...
r44968 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
Augie Fackler
git: skeleton of a new extension to _directly_ operate on git repos...
r44961
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)