@matheusbsbs / matheus-bagliano / commits / 3ac221a78e

git-remote-testpy: fix path hashing on Python 3

When this change was originally made (0846b0c - git-remote-testpy: hash bytes explicitly , I didn't realise that the "hex" encoding we chose is a "bytes to bytes" encoding so it just fails with an error on Python 3 in the same way as the original code. It is not possible to provide a single code path that works on Python 2 and Python 3 since Python 2.x will attempt to decode the string before encoding it, which fails for strings that are not valid in the default encoding. Python 3.1 introduced the "surrogateescape" error handler which handles this correctly and permits a bytes -> unicode -> bytes round-trip to be lossless. As the original came from reading the filesystem path, we convert them back into the original bytes encoded in sys.getfilesystemencoding(). At this point Python 3.0 is unsupported so we don't go out of our way to try to support it. Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>

John Keeping committed Jan 27, 2013 at 14:50 UTC 3ac221a78eba2f447a7990fc5c4709853dc32fee

1 file changed +17 -1

git-remote-testpy.py

+17 -1

@@ -36,6 +36,22 @@ if sys.hexversion < 0x02000000:

36 sys.stderr.write("git-remote-testgit: requires Python 2.0 or later.\n")

37 sys.exit(1)

39 +

40 +def encode_filepath(path):

41 + """Encodes a Unicode file path to a byte string.

42 +

43 + On Python 2 this is a no-op; on Python 3 we encode the string as

44 + suggested by [1] which allows an exact round-trip from the command line

45 + to the filesystem.

46 +

47 + [1] http://docs.python.org/3/c-api/unicode.html#file-system-encoding

48 +

49 + """

50 + if sys.hexversion < 0x03000000:

51 + return path

52 + return path.encode(sys.getfilesystemencoding(), 'surrogateescape')

53 +

54 +

55 def get_repo(alias, url):

56 """Returns a git repository object initialized for usage.

57 """

@@ -45,7 +61,7 @@ def get_repo(alias, url):

61 repo.get_head()

63 hasher = _digest()

48 - hasher.update(repo.path.encode('hex'))

64 + hasher.update(encode_filepath(repo.path))

65 repo.hash = hasher.hexdigest()

67 repo.get_base_path = lambda base: os.path.join(