update to hggit 0.8.3

OK juanfra@, shadchin@
This commit is contained in:
czarkoff 2015-12-21 22:16:10 +00:00
parent e5d64c1999
commit eb61698aef
3 changed files with 25 additions and 6 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2015/09/29 10:51:54 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2015/12/21 22:16:10 czarkoff Exp $
COMMENT = mercurial extension to work with git repositories
MODPY_EGG_VERSION = 0.8.2
MODPY_EGG_VERSION = 0.8.3
DISTNAME = py-hg-git-${MODPY_EGG_VERSION}
REVISION = 0
CATEGORIES = devel
@ -21,7 +20,7 @@ DISTFILES = ${DISTNAME}{${MODPY_EGG_VERSION}}${EXTRACT_SUFX}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
WRKDIST = ${WRKDIR}/durin42-hg-git-e183fdc198f0
WRKDIST = ${WRKDIR}/durin42-hg-git-d7ad67f850b2
RUN_DEPENDS = devel/py-dulwich>=0.10.1 \
devel/mercurial

View File

@ -1,2 +1,2 @@
SHA256 (py-hg-git-0.8.2.tar.gz) = 8mAoEkp2c+Mga3HJ71sd070yqYR+DBQxvmujvRT3Sz4=
SIZE (py-hg-git-0.8.2.tar.gz) = 99762
SHA256 (py-hg-git-0.8.3.tar.gz) = hJzKibWlm2CKNAs4SB10B+ld4W/k8TWIGkAspn/s0Co=
SIZE (py-hg-git-0.8.3.tar.gz) = 100467

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-hggit__ssh_py,v 1.1 2015/12/21 22:16:10 czarkoff Exp $
--- hggit/_ssh.py.orig Mon Nov 9 06:41:43 2015
+++ hggit/_ssh.py Mon Dec 21 12:22:04 2015
@@ -14,15 +14,10 @@ def generate_ssh_vendor(ui):
class _Vendor(SSHVendor):
def run_command(self, host, command, username=None, port=None):
- # newer dulwich changes the way they pass command and parameters
- # around, so we detect that here and reformat it back to what
- # hg-git expects (e.g. "command 'arg1 arg2'")
- if len(command) > 1:
- command = ["%s '%s'" % (command[0], ' '.join(command[1:]))]
sshcmd = ui.config("ui", "ssh", "ssh")
args = util.sshargs(sshcmd, host, username, port)
cmd = '%s %s %s' % (sshcmd, args,
- util.shellquote(' '.join(command)))
+ util.shellquote(command))
ui.debug('calling ssh: %s\n' % cmd)
proc = subprocess.Popen(util.quotecommand(cmd), shell=True,
stdin=subprocess.PIPE,