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).
| Lint Skipped |
| Unit Tests Skipped |
In D2279#37680, @martinvonz wrote:Also make this commit back out 30d0cb279bac?
done
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (3 lines) | |||
| M | mercurial/node.py (9 lines) | |||
| M | mercurial/revlog.py (3 lines) |
| [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: | ||||
| # 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 | ||||
| # 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) | ||||