<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae62f619b4ce35f030896f648fc527ff03b7a878">https://github.com/macports/macports-ports/commit/ae62f619b4ce35f030896f648fc527ff03b7a878</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ae62f619b4c hg-git: update to 0.10.1
</span>ae62f619b4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae62f619b4ce35f030896f648fc527ff03b7a878
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue May 18 16:30:54 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> hg-git: update to 0.10.1
</span>---
devel/hg-git/Portfile | 14 ++--
devel/hg-git/files/patch-mercurial58.diff | 130 ------------------------------
2 files changed, 5 insertions(+), 139 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hg-git/Portfile b/devel/hg-git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b41c381f651..fe266f0998f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/hg-git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/hg-git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup python 1.0
name hg-git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories devel
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +21,12 @@ long_description This is the Hg-Git plugin for Mercurial, adding the abil
</span> or use a Git server as a collaboration point for a team with \
developers using both Git and Mercurial.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0761909e050e4d03d63c1ff41b8bbac2daae5272 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 190e9682d830731be956ae5f7ce01cabda5cf3d4180e15d6d64b832a952e6b8a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 174434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e3dcbd1bf9203849d2648ba435a2f11d57478d12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60b7d11f13a6d3895d6d63bac9b69e2e50155d85a2a8dbb594884e9124c0b4eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 176551
</span>
python.default_version 39
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://foss.heptapod.net/mercurial/hg-git/-/merge_requests/100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-mercurial58.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:mercurial port:py${python.version}-dulwich
# workaround for https://foss.heptapod.net/mercurial/hg-git/-/issues/326
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hg-git/files/patch-mercurial58.diff b/devel/hg-git/files/patch-mercurial58.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31aade60200..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/hg-git/files/patch-mercurial58.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,130 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1620205158 -7200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Wed May 05 10:59:18 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Branch 0.10.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID bedf9b77f0bec57e0bdb9cb6344c8cb2df954c0e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent cc4f3340afc9b6cb859b9737b4b782fff08f9d56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# EXP-Topic hg58-0.10.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compat: add support for mercurial 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hggit/__init__.py b/hggit/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hggit/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hggit/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,6 @@ from mercurial import (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exchange,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extensions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ui as hgui,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util as hgutil,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localrepo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- manifest,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +199,7 @@ def _isgitdir(path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _local(path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p = hgutil.url(path).localpath()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p = compat.url(path).localpath()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if _isgitdir(p):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gitrepo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # detect git ssh urls (which mercurial thinks is a file-like path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -520,9 +519,15 @@ def isvalidlocalpath(orig, self, path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return orig(self, path) or _isgitdir(path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (hgutil.safehasattr(hgui, b'path') and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hgutil.safehasattr(hgui.path, b'_isvalidlocalpath')):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extensions.wrapfunction(hgui.path, b'_isvalidlocalpath', isvalidlocalpath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extensions.wrapfunction(compat.path, b'_isvalidlocalpath', isvalidlocalpath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def isurllocal(orig, path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # recognise git scp-style paths when cloning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return orig(path) and not util.isgitsshuri(path._origpath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extensions.wrapfunction(compat.url, b'islocal', isurllocal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def islocal(orig, path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -538,7 +543,7 @@ def hasscheme(orig, path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return orig(path) or util.isgitsshuri(path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extensions.wrapfunction(hgutil, b'hasscheme', hasscheme)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extensions.wrapfunction(compat.urlutil, b'hasscheme', hasscheme)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @util.transform_notgit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hggit/compat.py b/hggit/compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hggit/compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hggit/compat.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,17 @@ except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- itervalues = lambda x: x.itervalues()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added in 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from mercurial.utils import urlutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ url = urlutil.url
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path = urlutil.path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ urlutil = hgutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ url = hgutil.url
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path = ui.path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from mercurial.cmdutil import check_at_most_one_arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except (ImportError, AttributeError):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # added in 5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hggit/git_handler.py b/hggit/git_handler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hggit/git_handler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hggit/git_handler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1860,7 +1860,7 @@ class GitHandler(object):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not available in dulwich 0.19, used on Python 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if hasattr(client, 'get_credentials_from_store'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- urlobj = hgutil.url(uri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ urlobj = compat.url(uri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auth = client.get_credentials_from_store(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- urlobj.scheme,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- urlobj.host,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1894,7 +1894,7 @@ class GitHandler(object):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if uri.startswith(b'file://'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return client.LocalGitClient(), hgutil.url(uri).path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return client.LocalGitClient(), compat.url(uri).path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if its not git or git+ssh, try a local url..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return client.SubprocessGitClient(), uri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hggit/gitrepo.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hggit/gitrepo.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,6 @@ from __future__ import absolute_import,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from .util import isgitsshuri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from mercurial import (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- util
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from . import compat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,5 +157,5 @@ def islocal(path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isgitsshuri(path):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- u = util.url(path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ u = compat.url(path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return not u.scheme or u.scheme == b'file'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/test-networking.t b/tests/test-networking.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tests/test-networking.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tests/test-networking.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,6 +88,8 @@ So, that went well; now push...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ hg add thefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ fn_hg_commit -m 'add the file'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ hg book -r tip master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $ hg path default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ git@git-server:/srv/repo.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ hg push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Warning: Permanently added * (glob) (?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushing to git@git-server:/srv/repo.git
</span></pre><pre style='margin:0'>
</pre>