##// END OF EJS Templates
mergetools: don't let meld open all changed files on startup...
mergetools: don't let meld open all changed files on startup In meld 3.16, a multi-file change with option '-a' results in an overview list being opened. In meld 3.20, a multi-file change with option '-a' results in an overview list AND every changed file being opened. Simply removing '-a' seems to work fine for both cases and also behaves the same as before for single-file changes. As per the release notes, this is due to the following change in meld 3.19.0: "Make the --auto-compare command line flag work again (Kai Willadsen)" See also https://gitlab.gnome.org/GNOME/meld/-/issues/516

File last commit:

r50195:22712409 default
r50398:a6efc1f1 default
Show More
gitutil.py
48 lines | 956 B | text/x-python | PythonLexer
"""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
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)