This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4881		Jan 18 2018, 8:38 AM	★	★
Diff 2	4907		Jan 18 2018, 11:12 AM	★	★
Diff 3	5061	rHGa07f727a7eb1964786976ee6e29c6696cfa046f3	Jan 17 2018, 8:41 PM	★	★

Status	Author	Revision
Closed	durin42	D1908 python3: whitelist an additional 23 passing tests
Closed	durin42	D1907 tests: fix a missed b prefix in a test extension in test-strip.t
Closed	durin42	D1906 revlog: correct type in check to verify rawtext is immutable
Closed	durin42	D1903 mq: use bytes() instead of str() to encode statusentries for writing
Closed	durin42	D1902 mq: open status file et al in bytes mode
Closed	durin42	D1901 mq: fix up statusentry to be both repr()-able and bytes()-able
Closed	durin42	D1900 python3: whitelist another 7 passing tests
Closed	durin42	D1899 localrepo: pass transaction kwargs as strings, not bytes
Closed	durin42	D1898 localrepo: consistently use native str when __dict__ is involved
Closed	durin42	D1897 smartset: use native string when peeking in __dict__
Closed	durin42	D1896 obsolete: use native string when peeking in __dict__
Closed	durin42	D1895 lsprof: use native string when peeking in __dict__
Closed	durin42	D1894 dirstate: use native strings when peeking in __dict__
Closed	durin42	D1893 context: use native string when peeking in __dict__
Closed	durin42	D1892 bundlerepo: use native str when peeking in __dict__
Closed	durin42	D1891 transaction: fix hg version check when loading journal
Closed	durin42	D1890 branchmap: make error messages consistent between Python 2 and 3
Closed	durin42	D1889 tests: bytestring-ify all the adhoc extensions in test-strip.t
Closed	durin42	D1888 filemerge: fix regular expression pattern to be bytes
Closed	durin42	D1887 tags: explicitly grab list of dict keys
Closed	durin42	D1886 commands: replace map() with list comprehension
Closed	durin42	D1885 commands: rewrite legacy ternary operator hack using modern syntax
Closed	durin42	D1884 strip: use %d for known-int string interpolation
Closed	durin42	D1905 strip: use in-place revset formatspec instead of %-formatting ourselves
Closed	durin42	D1883 tests: get run-tests to reliably hand shellquote a string and not a bytes

Diff 4881

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).
	report(_("couldn't read journal entry %r!\n") % l)			report(_("couldn't read journal entry %r!\n") % 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 == str(version):			if ver == pycompat.bytestr(version):
				pulkitUnsubmitted Not Done "%d" is preferred pulkit: "%d" is preferred
	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('\0')			l, f, b, c = line.split('\0')
	backupentries.append((l, f, b, bool(c)))			backupentries.append((l, f, b, bool(c)))
	else:			else:
	report(_("journal was created by a different version of "			report(_("journal was created by a different version of "
	"Mercurial\n"))			"Mercurial\n"))

	_playback(file, report, opener, vfsmap, entries, backupentries,			_playback(file, report, opener, vfsmap, entries, backupentries,
	checkambigfiles=checkambigfiles)			checkambigfiles=checkambigfiles)

This is an archive of the discontinued Mercurial Phabricator instance.

transaction: fix hg version check when loading journalClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4881

mercurial/transaction.py

transaction: fix hg version check when loading journal
ClosedPublic

Revision Contents
Changeset List