This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2674

transaction: fix an error string with bytestr() on a repr()d value
ClosedPublic

Authored by durin42 on Mar 4 2018, 4:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGef345f9e4295: transaction: fix an error string with bytestr() on a repr()d value
Summary

Fixes test-rollback.t on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 4 2018, 4:50 PM
pulkit accepted this revision.Mar 4 2018, 4:55 PM
Closed by commit rHGef345f9e4295: transaction: fix an error string with bytestr() on a repr()d value (authored by durin42). · Explain WhyMar 4 2018, 5:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/transaction.py (4 lines)

Diff 6630

contrib/python3-whitelist

test-revert-flags.t test-revert-flags.t
test-revert-unknown.t test-revert-unknown.t
test-revlog-ancestry.py test-revlog-ancestry.py
test-revlog-group-emptyiter.t test-revlog-group-emptyiter.t
test-revlog-mmapindex.t test-revlog-mmapindex.t
test-revlog-packentry.t test-revlog-packentry.t
test-revset-dirstate-parents.t test-revset-dirstate-parents.t
test-revset-outgoing.t test-revset-outgoing.t
test-rollback.t
test-run-tests.py test-run-tests.py
test-schemes.t test-schemes.t
test-serve.t test-serve.t
test-share.t test-share.t
test-show-stack.t test-show-stack.t
test-show-work.t test-show-work.t
test-show.t test-show.t
test-simple-update.t test-simple-update.t

mercurial/transaction.py

from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
pycompat,
util, util,
) )
version = 2 version = 2
# These are the file generators that should only be executed after the # These are the file generators that should only be executed after the
# finalizers are done, since they rely on the output of the finalizers (like # finalizers are done, since they rely on the output of the finalizers (like
# the changelog having been written). # the changelog having been written).
fp = opener.open(file) fp = opener.open(file)
lines = fp.readlines() lines = fp.readlines()
fp.close() fp.close()
for l in lines: for l in lines:
try: try:
f, o = l.split('\0') f, o = l.split('\0')
entries.append((f, int(o), None)) entries.append((f, int(o), None))
except ValueError: except ValueError:
report(_("couldn't read journal entry %r!\n") % l) report(
_("couldn't read journal entry %r!\n") % pycompat.bytestr(l))
backupjournal = "%s.backupfiles" % file backupjournal = "%s.backupfiles" % file
if opener.exists(backupjournal): if opener.exists(backupjournal):
fp = opener.open(backupjournal) fp = opener.open(backupjournal)
lines = fp.readlines() lines = fp.readlines()
if lines: if lines:
ver = lines[0][:-1] ver = lines[0][:-1]
if ver == (b'%d' % version): if ver == (b'%d' % version):