Release v1.0.4

... to allow file protocol

Fixes mnauw/git-remote-hg#53

Makefile

@@ -14,9 +14,9 @@ build:
 		PYTHON=python2 ; \
 	elif python -c 'import mercurial' 2> /dev/null ; then \
 		PYTHON=python ; \
-	fi ; \
+	else \
-	if [ -n "$$PYTHON" ] ; then \
+		echo 'Python with Mercurial not available' >&2 ; \
-		PYTHON=python ; \
+		exit 1 ; \
 	fi ; \
 	mkdir -p bin ; \
 	for s in git-remote-hg git-hg-helper ; do \

git-hg-helper

@@ -5,6 +5,11 @@
 
 from mercurial import hg, ui, commands, util
 from mercurial import context, subrepo
+try:
+    # hg >= 5.8
+    from mercurial.utils import urlutil
+except ImportError:
+    from mercurial import util as urlutil
 
 import re
 import sys
@@ -51,7 +56,13 @@ if sys.version_info[0] == 3:
         stdout = sys.stdout.buffer
         stderr = sys.stderr.buffer
         getcwd = os.getcwdb
-        getenv = os.getenvb if os.supports_bytes_environ else os.getenv
+        @staticmethod
+        def getenvb(val, default):
+            result = os.getenv(val.decode(), default.decode() if hasattr(default, 'decode') else default)
+             # if result is a string, get bytes instead
+            result = result.encode() if hasattr(result, 'encode') else result
+            return result
+        getenv = os.getenvb if os.supports_bytes_environ else getenvb
 else:
     class compat(basecompat):
         # life was simple in those days ...
@@ -308,11 +319,11 @@ class GitHgRepo:
             if not kind in (b'hg', b'git'):
                 warn('skipping unsupported subrepo type %s' % kind)
                 continue
-            if not util.url(src).isabs():
+            if not urlutil.url(src).isabs():
                 parent = self.get_hg_repo_url(remote)
                 if not parent:
                     die(b'could not determine repo url of %s' % remote)
-                parent = util.url(parent)
+                parent = urlutil.url(parent)
                 parent.path = posixpath.join(parent.path or b'', src)
                 parent.path = posixpath.normpath(parent.path)
                 src = bytes(parent)

git-remote-hg

@@ -86,7 +86,13 @@ if sys.version_info[0] == 3:
         stdout = sys.stdout.buffer
         stderr = sys.stderr.buffer
         getcwd = os.getcwdb
-        getenv = os.getenvb if os.supports_bytes_environ else os.getenv
+        @staticmethod
+        def getenvb(val, default):
+            result = os.getenv(val.decode(), default.decode() if hasattr(default, 'decode') else default)
+             # if result is a string, get bytes instead
+            result = result.encode() if hasattr(result, 'encode') else result
+            return result
+        getenv = os.getenvb if os.supports_bytes_environ else getenvb
         urlparse = urllib.parse.urlparse
         urljoin = urllib.parse.urljoin
 else:

setup.py

@@ -3,7 +3,7 @@
 import setuptools
 
 # strip leading v
-version = 'v1.0.3'[1:]
+version = 'v1.0.4'[1:]
 
 # check for released version
 assert (len(version) > 0)

test/test-lib.sh

@@ -27,28 +27,33 @@ SHARNESS_BUILD_DIRECTORY="$(mktemp -d)"
 export PATH="${PATH#*:}"
 rmdir "$SHARNESS_BUILD_DIRECTORY"
 
-if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then
+if [ -z "$TEST_INSTALLED_SCRIPTS" ] ; then
-	: Use chosen Python version
+	if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then
-elif python3 -c 'import mercurial' 2> /dev/null ; then
+		: Use chosen Python version
-	PYTHON=python3
+	elif python3 -c 'import mercurial' 2> /dev/null ; then
-elif python2 -c 'import mercurial' 2> /dev/null ; then
+		PYTHON=python3
-	PYTHON=python2
+	elif python2 -c 'import mercurial' 2> /dev/null ; then
-elif python -c 'import mercurial' 2> /dev/null ; then
+		PYTHON=python2
-	PYTHON=python
+	elif python -c 'import mercurial' 2> /dev/null ; then
-fi
+		PYTHON=python
-if [ -n "$PYTHON" ] ; then
+	fi
-	test_set_prereq PYTHON
+	if [ -n "$PYTHON" ] ; then
+		test_set_prereq PYTHON
 
-	# Change shebang on a copy of scripts to chosen Python version
+		# Change shebang on a copy of scripts to chosen Python version
-	TEST_BIN="$SHARNESS_TRASH_DIRECTORY/bin"
+		TEST_BIN="$SHARNESS_TRASH_DIRECTORY/bin"
-	mkdir -p "$TEST_BIN"
+		mkdir -p "$TEST_BIN"
-	for s in git-remote-hg git-hg-helper ; do
+		for s in git-remote-hg git-hg-helper ; do
-		printf "%s\n" "#!/usr/bin/env $PYTHON" > "$TEST_BIN/$s"
+			printf "%s\n" "#!/usr/bin/env $PYTHON" > "$TEST_BIN/$s"
-		tail -n +2 "$SHARNESS_TEST_DIRECTORY/../$s" >> "$TEST_BIN/$s"
+			tail -n +2 "$SHARNESS_TEST_DIRECTORY/../$s" >> "$TEST_BIN/$s"
-		chmod u+x "$TEST_BIN/$s"
+			chmod u+x "$TEST_BIN/$s"
-	done
+		done
-	export PATH="$TEST_BIN${PATH:+:$PATH}"
+		export PATH="$TEST_BIN${PATH:+:$PATH}"
-	unset TEST_BIN
+		unset TEST_BIN
+	fi
+else
+	# The build/install process ensures Python is available
+	test_set_prereq PYTHON
 fi
 
 GIT_AUTHOR_EMAIL=author@example.com
@@ -60,3 +65,4 @@ export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 # maintain backwards compatible default
 # (as used in remote helper)
 git config --global init.defaultBranch master
+git config --global protocol.file.allow always