Mercurial > python-hglib
changeset 151:b91356bf7186
hglib: use strtobytes() (issue4520)
| author | Brett Cannon <brett@python.org> |
|---|---|
| date | Thu, 19 Mar 2015 17:42:46 -0400 |
| parents | b94e1263836c |
| children | 0808bb03add5 |
| files | hglib/context.py tests/test-update.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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)