This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10844

transaction: clarify a conditionnal about version check
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe7ad2490d623: transaction: clarify a conditionnal about version check
Summary

Let us move the short branch early.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/transaction.py (6 lines)

Diff 28592

mercurial/transaction.py

) )
backupjournal = b"%s.backupfiles" % file backupjournal = b"%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):
report(BAD_VERSION_MSG)
else:
for line in lines[1:]: for line in lines[1:]:
if line: if line:
# Shave off the trailing newline # Shave off the trailing newline
line = line[:-1] line = line[:-1]
l, f, b, c = line.split(b'\0') l, f, b, c = line.split(b'\0')
backupentries.append((l, f, b, bool(c))) backupentries.append((l, f, b, bool(c)))
else:
report(BAD_VERSION_MSG)
_playback( _playback(
file, file,
report, report,
opener, opener,
vfsmap, vfsmap,
entries, entries,
backupentries, backupentries,
checkambigfiles=checkambigfiles, checkambigfiles=checkambigfiles,
) )