pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This fixes test-remotefilelog-bundles.t on Python 3.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5424

AFFECTED FILES
  contrib/python3-whitelist
  hgext/remotefilelog/shallowbundle.py

CHANGE DETAILS

diff --git a/hgext/remotefilelog/shallowbundle.py 
b/hgext/remotefilelog/shallowbundle.py
--- a/hgext/remotefilelog/shallowbundle.py
+++ b/hgext/remotefilelog/shallowbundle.py
@@ -15,6 +15,7 @@
     match,
     mdiff,
     pycompat,
+    util,
 )
 from . import (
     constants,
@@ -269,7 +270,7 @@
 
         base = fl.revision(deltabase, raw=True)
         text = mdiff.patch(base, delta)
-        if isinstance(text, buffer):
+        if isinstance(text, util.buffer):
             text = str(text)
 
         meta, text = shallowutil.parsemeta(text)
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -526,6 +526,7 @@
 test-relink.t
 test-remotefilelog-bad-configs.t
 test-remotefilelog-blame.t
+test-remotefilelog-bundles.t
 test-remotefilelog-clone-tree.t
 test-remotefilelog-clone.t
 test-remotefilelog-keepset.t



To: pulkit, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[email protected]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to