This is an archive of the discontinued Mercurial Phabricator instance.

node: make bin() be a wrapper instead of just an alias
ClosedPublic

Authored by durin42 on Feb 15 2018, 9:18 AM.

Download Raw Diff

Details

Reviewers

martinvonz
indygreg

Group Reviewers

hg-reviewers

Commits

rHGf574cc00831a: node: make bin() be a wrapper instead of just an alias
rHGaba1d578c97f: node: make bin() be a wrapper instead of just an alias

Summary

This includes a full backout of 59affe7e and 30d0cb27. Per the review
of the former, we'd rather adapt the API to behave like it used to (at
least for now), and take a second run at it if it shows up in our
performance numbers. I ran perfrevlogindex with and without this
change and it didn't make a measurable difference, so maybe it's fine
(despite my intuition to the contrary).

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.Feb 15 2018, 9:18 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 15 2018, 9:18 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D2280: remotenames: port partway to python3 by using collections.MutableMapping.Feb 15 2018, 9:18 AM

Also make this commit back out 30d0cb279bac?

This revision now requires changes to proceed.Feb 15 2018, 10:55 AM

durin42 edited the summary of this revision. (Show Details)Feb 16 2018, 4:58 PM

durin42 updated this revision to Diff 5784.

Herald added a reviewer: indygreg. · View Herald TranscriptFeb 16 2018, 4:58 PM

In D2279#37680, @martinvonz wrote:

Also make this commit back out 30d0cb279bac?

done

martinvonz accepted this revision.Feb 16 2018, 4:59 PM

This revision is now accepted and ready to land.Feb 16 2018, 4:59 PM

Closed by commit rHGaba1d578c97f: node: make bin() be a wrapper instead of just an alias (authored by durin42). · Explain WhyFeb 16 2018, 5:13 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/histedit.py (3 lines)
M			mercurial/node.py (9 lines)
M			mercurial/revlog.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5761		Feb 15 2018, 9:18 AM	★	★
Diff 2	5784		Feb 16 2018, 4:58 PM	★	★
Diff 3	5788	rHGaba1d578c97fe676cde86f25f8dabde48429a84f	Feb 14 2018, 9:34 PM	★	★

Status	Author	Revision
Closed	durin42	D2281 py3: whitelist another eight passing tests
Closed	durin42	D2280 remotenames: port partway to python3 by using collections.MutableMapping
Closed	durin42	D2279 node: make bin() be a wrapper instead of just an alias

Diff 5788

hgext/histedit.py


	[histedit]			[histedit]
	singletransaction = True			singletransaction = True

	"""			"""

	from __future__ import absolute_import			from __future__ import absolute_import

	import binascii
	import errno			import errno
	import os			import os

	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	bundle2,			bundle2,
	cmdutil,			cmdutil,
	context,			context,

	@classmethod			@classmethod
	def fromrule(cls, state, rule):			def fromrule(cls, state, rule):
	"""Parses the given rule, returning an instance of the histeditaction.			"""Parses the given rule, returning an instance of the histeditaction.
	"""			"""
	rulehash = rule.strip().split(' ', 1)[0]			rulehash = rule.strip().split(' ', 1)[0]
	try:			try:
	rev = node.bin(rulehash)			rev = node.bin(rulehash)
	except (TypeError, binascii.Error):			except TypeError:
	raise error.ParseError("invalid changeset %s" % rulehash)			raise error.ParseError("invalid changeset %s" % rulehash)
	return cls(state, rev)			return cls(state, rev)

	def verify(self, prev, expected, seen):			def verify(self, prev, expected, seen):
	""" Verifies semantic correctness of the rule"""			""" Verifies semantic correctness of the rule"""
	repo = self.repo			repo = self.repo
	ha = node.hex(self.node)			ha = node.hex(self.node)
	try:			try:

mercurial/node.py

	# node.py - basic nodeid manipulation for mercurial			# node.py - basic nodeid manipulation for mercurial
	#			#
	# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>			# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	import binascii			import binascii

	# This ugly style has a noticeable effect in manifest parsing			# This ugly style has a noticeable effect in manifest parsing
	hex = binascii.hexlify			hex = binascii.hexlify
	bin = binascii.unhexlify			# Adapt to Python 3 API changes. If this ends up showing up in
				# profiles, we can use this version only on Python 3, and forward
				# binascii.unhexlify like we used to on Python 2.
				def bin(s):
				try:
				return binascii.unhexlify(s)
				except binascii.Error as e:
				raise TypeError(e)

	nullrev = -1			nullrev = -1
	nullid = b"\0" * 20			nullid = b"\0" * 20
	nullhex = hex(nullid)			nullhex = hex(nullid)

	# Phony node value to stand-in for new files in some uses of			# Phony node value to stand-in for new files in some uses of
	# manifests.			# manifests.
	newnodeid = '!' * 20			newnodeid = '!' * 20

mercurial/revlog.py

	# revlog.py - storage back-end for mercurial			# revlog.py - storage back-end for mercurial
	#			#
	# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>			# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	"""Storage back-end for Mercurial.			"""Storage back-end for Mercurial.

	This provides efficient delta storage with O(1) retrieve and append			This provides efficient delta storage with O(1) retrieve and append
	and O(changes) merge between branches.			and O(changes) merge between branches.
	"""			"""

	from __future__ import absolute_import			from __future__ import absolute_import

	import binascii
	import collections			import collections
	import contextlib			import contextlib
	import errno			import errno
	import hashlib			import hashlib
	import heapq			import heapq
	import os			import os
	import struct			import struct
	import zlib			import zlib
	if len(nl) == 1 and not maybewdir:			if len(nl) == 1 and not maybewdir:
	self._pcache[id] = nl[0]			self._pcache[id] = nl[0]
	return nl[0]			return nl[0]
	raise LookupError(id, self.indexfile,			raise LookupError(id, self.indexfile,
	_('ambiguous identifier'))			_('ambiguous identifier'))
	if maybewdir:			if maybewdir:
	raise error.WdirUnsupported			raise error.WdirUnsupported
	return None			return None
	except (TypeError, binascii.Error):			except TypeError:
	pass			pass

	def lookup(self, id):			def lookup(self, id):
	"""locate a node based on:			"""locate a node based on:
	- revision number or str(revision number)			- revision number or str(revision number)
	- nodeid or subset of hex nodeid			- nodeid or subset of hex nodeid
	"""			"""
	n = self._match(id)			n = self._match(id)