##// END OF EJS Templates
revisions: allow "x123" to refer to nodeid prefix "123"...
revisions: allow "x123" to refer to nodeid prefix "123" When resolving "123" to a revision, we try to interpret it as revnum before we try to interpret it as a nodeid hex prefix. This can lead to the shortest valid prefix being longer than necessary. This patch lets us write such nodeids in a shorter form by prefixing them with "x" instead of adding more hex digits until they're longer than the longest decimal revnum. On my hg repo with almost 69k revisions, turning this feature on saves on average 0.4% on the average nodeid length. That clearly doesn't justify this patch. However, it becomes more usefule when combined with the earlier patches in this series that let you disambiguate nodeid prefixes within a configured revset. Note that we attempt to resolve symbols as nodeid prefixes after we've exhausted all other posibilities, so this is a backwards compatible change (only queries that would previously fail may now succeed). I've still hidden this feature behind an experiemntal config option so we can roll it back if needed. Differential Revision: https://phab.mercurial-scm.org/D4041

File last commit:

r36498:4dc6f090 default
r38891:7848f284 default
Show More
fakemergerecord.py
26 lines | 752 B | text/x-python | PythonLexer
/ tests / fakemergerecord.py
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 # Extension to write out fake unsupported records into the merge state
#
#
from __future__ import absolute_import
from mercurial import (
merge,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 )
cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027
Augie Fackler
tests: port fakemergerecord to python3...
r36191 @command(b'fakemergerecord',
[(b'X', b'mandatory', None, b'add a fake mandatory record'),
(b'x', b'advisory', None, b'add a fake advisory record')], '')
Siddharth Agarwal
mergestate: handle additional record types specially...
r27027 def fakemergerecord(ui, repo, *pats, **opts):
Pierre-Yves David
fakemergerecord: take wlock to write the merge state...
r29754 with repo.wlock():
ms = merge.mergestate.read(repo)
records = ms._makerecords()
Pulkit Goyal
py3: backout changeset 56635c506608 which wrongly added couple of b''...
r36498 if opts.get('mandatory'):
Augie Fackler
tests: port fakemergerecord to python3...
r36191 records.append((b'X', b'mandatory record'))
Pulkit Goyal
py3: backout changeset 56635c506608 which wrongly added couple of b''...
r36498 if opts.get('advisory'):
Augie Fackler
tests: port fakemergerecord to python3...
r36191 records.append((b'x', b'advisory record'))
Pierre-Yves David
fakemergerecord: take wlock to write the merge state...
r29754 ms._writerecords(records)