[PATCH 2 of 2 hglib] hglib: use strtobytes() (issue4520)
Brett Cannon
brett at python.org
Thu Mar 19 16:43:48 CDT 2015
# HG changeset patch
# User Brett Cannon <brett at python.org>
# Date 1426801366 14400
# Thu Mar 19 17:42:46 2015 -0400
# Node ID b91356bf7186845d21a219fa5282f1fa9dade69c
# Parent b94e1263836c4fdcc4809e2199b97ab24cbd123d
hglib: use strtobytes() (issue4520)
diff -r b94e1263836c -r b91356bf7186 hglib/context.py
--- a/hglib/context.py Thu Mar 19 17:42:26 2015 -0400
+++ b/hglib/context.py Thu Mar 19 17:42:46 2015 -0400
@@ -1,7 +1,7 @@
import hglib.client # Circular dependency.
from hglib import util, templates
from hglib.error import CommandError
-from hglib.util import b
+from hglib.util import b, strtobytes
_nullcset = [b('-1'), b('0000000000000000000000000000000000000000'), b(''),
b(''), b(''), b(''), b('')]
@@ -20,7 +20,7 @@
cset = _nullcset
else:
if isinstance(changeid, (long, int)):
- changeid = b('rev(') + str(changeid).encode('latin-1') + b(')')
+ changeid = b('rev(') + strtobytes(changeid) + b(')')
notfound = False
try:
diff -r b94e1263836c -r b91356bf7186 tests/test-update.py
--- a/tests/test-update.py Thu Mar 19 17:42:26 2015 -0400
+++ b/tests/test-update.py Thu Mar 19 17:42:46 2015 -0400
@@ -1,6 +1,6 @@
from tests import common
from hglib import error
-from hglib.util import b
+from hglib.util import b, strtobytes
class test_update(common.basetest):
def setUp(self):
@@ -92,7 +92,7 @@
rev2, node2 = self.client.commit(b('third'))
# Go back to 0
- self.client.rawcommand([b('update'), str(self.rev0).encode('latin-1')],
+ self.client.rawcommand([b('update'), strtobytes(self.rev0)],
# Keep the 'changed' version
prompt=lambda s, d: 'c\n')
u, m, r, ur = self.client.update(rev2, clean=True)
More information about the Mercurial-devel
mailing list