# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1548891131 18000
# Node ID 8e0dd36f7a978bbc3e2917d83a9212f6d0eb65bf
# Parent  4caf56c33009439bdb519a85db2683c572a784e5
git: a little pycompat.bytestring() love to make this code work in py3

Differential Revision: https://phab.mercurial-scm.org/D5765

diff -r 4caf56c33009 -r 8e0dd36f7a97 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Thu Jan 24 16:07:32 2019 -0500
+++ b/contrib/python3-whitelist	Wed Jan 30 18:32:11 2019 -0500
@@ -116,6 +116,7 @@
 test-convert-cvsnt-mergepoints.t
 test-convert-datesort.t
 test-convert-filemap.t
+test-convert-git.t
 test-convert-hg-sink.t
 test-convert-hg-source.t
 test-convert-hg-startrev.t
diff -r 4caf56c33009 -r 8e0dd36f7a97 hgext/convert/git.py
--- a/hgext/convert/git.py	Thu Jan 24 16:07:32 2019 -0500
+++ b/hgext/convert/git.py	Wed Jan 30 18:32:11 2019 -0500
@@ -13,6 +13,7 @@
     config,
     error,
     node as nodemod,
+    pycompat,
 )
 
 from . import (
@@ -175,7 +176,8 @@
         self.catfilepipe[0].flush()
         info = self.catfilepipe[1].readline().split()
         if info[1] != ftype:
-            raise error.Abort(_('cannot read %r object at %s') % (ftype, rev))
+            raise error.Abort(_('cannot read %r object at %s') % (
+                pycompat.bytestr(ftype), rev))
         size = int(info[2])
         data = self.catfilepipe[1].read(size)
         if len(data) < size:
@@ -294,7 +296,7 @@
             if not entry:
                 if not l.startswith(':'):
                     continue
-                entry = l.split()
+                entry = tuple(pycompat.bytestr(p) for p in l.split())
                 continue
             f = l
             if entry[4][0] == 'C':