##// 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:

r36501:5a029f04 default
r38891:7848f284 default
Show More
test-revlog-ancestry.py
88 lines | 1.9 KiB | text/x-python | PythonLexer
/ tests / test-revlog-ancestry.py
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 from __future__ import absolute_import, print_function
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 import os
Robert Stanca
py3: use absolute_import in test-revlog-ancestry.py
r28763 from mercurial import (
hg,
merge,
Yuya Nishihara
tests: alias ui as uimod in test-revlog-ancestry/test-ui-verbosity
r28842 ui as uimod,
Robert Stanca
py3: use absolute_import in test-revlog-ancestry.py
r28763 )
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 u = uimod.ui.load()
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 repo = hg.repository(u, b'test1', create=1)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 os.chdir('test1')
def commit(text, time):
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 repo.commit(text=text, date=b"%d 0" % time)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
def addcommit(name, time):
Pulkit Goyal
py3: make sure we open the file in bytes mode...
r36501 f = open(name, 'wb')
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 f.write(b'%s\n' % name)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 f.close()
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 repo[None].add([name])
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 commit(name, time)
def update(rev):
Augie Fackler
merge: have merge.update use a matcher instead of partial fn...
r27344 merge.update(repo, rev, False, True)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
def merge_(rev):
Augie Fackler
merge: have merge.update use a matcher instead of partial fn...
r27344 merge.update(repo, rev, True, False)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
if __name__ == '__main__':
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 addcommit(b"A", 0)
addcommit(b"B", 1)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
update(0)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 addcommit(b"C", 2)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
merge_(1)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 commit(b"D", 3)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
update(2)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 addcommit(b"E", 4)
addcommit(b"F", 5)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
update(3)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 addcommit(b"G", 6)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
merge_(5)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 commit(b"H", 7)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
update(5)
Pulkit Goyal
py3: add b'' prefixes in tests/test-revlog-ancestry.py...
r36500 addcommit(b"I", 8)
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
# Ancestors
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('Ancestors of 5')
Bryan O'Sullivan
revlog: ancestors(*revs) becomes ancestors(revs) (API)...
r16866 for r in repo.changelog.ancestors([5]):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nAncestors of 6 and 5')
Bryan O'Sullivan
revlog: ancestors(*revs) becomes ancestors(revs) (API)...
r16866 for r in repo.changelog.ancestors([6, 5]):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nAncestors of 5 and 4')
Bryan O'Sullivan
revlog: ancestors(*revs) becomes ancestors(revs) (API)...
r16866 for r in repo.changelog.ancestors([5, 4]):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nAncestors of 7, stop at 6')
Joshua Redstone
revlog: add optional stoprev arg to revlog.ancestors()...
r16868 for r in repo.changelog.ancestors([7], 6):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Joshua Redstone
revlog: add optional stoprev arg to revlog.ancestors()...
r16868
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nAncestors of 7, including revs')
Siddharth Agarwal
revlog.ancestors: add support for including revs...
r18081 for r in repo.changelog.ancestors([7], inclusive=True):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Siddharth Agarwal
revlog.ancestors: add support for including revs...
r18081
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nAncestors of 7, 5 and 3, including revs')
Siddharth Agarwal
revlog.ancestors: add support for including revs...
r18081 for r in repo.changelog.ancestors([7, 5, 3], inclusive=True):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Siddharth Agarwal
revlog.ancestors: add support for including revs...
r18081
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 # Descendants
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\n\nDescendants of 5')
Bryan O'Sullivan
revlog: descendants(*revs) becomes descendants(revs) (API)...
r16867 for r in repo.changelog.descendants([5]):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nDescendants of 5 and 3')
Bryan O'Sullivan
revlog: descendants(*revs) becomes descendants(revs) (API)...
r16867 for r in repo.changelog.descendants([5, 3]):
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print(r, end=' ')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
Robert Stanca
py3: use print_function in test-revlog-ancestry.py
r28764 print('\nDescendants of 5 and 4')
print(*repo.changelog.descendants([5, 4]), sep=' ')