##// END OF EJS Templates
sslutil: synchronize hostname matching logic with CPython...
sslutil: synchronize hostname matching logic with CPython sslutil contains its own hostname matching logic. CPython has code for the same intent. However, it is only available to Python 2.7.9+ (or distributions that have backported 2.7.9's ssl module improvements). This patch effectively imports CPython's hostname matching code from its ssl.py into sslutil.py. The hostname matching code itself is pretty similar. However, the DNS name matching code is much more robust and spec conformant. As the test changes show, this changes some behavior around wildcard handling and IDNA matching. The new behavior allows wildcards in the middle of words (e.g. 'f*.com' matches 'foo.com') This is spec compliant according to RFC 6125 Section 6.5.3 item 3. There is one test where the matcher is more strict. Before, '*.a.com' matched '.a.com'. Now it doesn't match. Strictly speaking this is a security vulnerability.

File last commit:

r28842:d466facc default
r29452:26a5d605 3.8.4 stable
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
tests: alias ui as uimod in test-revlog-ancestry/test-ui-verbosity
r28842 u = uimod.ui()
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872
repo = hg.repository(u, 'test1', create=1)
os.chdir('test1')
def commit(text, time):
repo.commit(text=text, date="%d 0" % time)
def addcommit(name, time):
Alejandro Santos
compat: use open() instead of file() everywhere
r9031 f = open(name, 'w')
Stefano Tortarolo
Add ancestors and descendants to revlog...
r6872 f.write('%s\n' % name)
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__':
addcommit("A", 0)
addcommit("B", 1)
update(0)
addcommit("C", 2)
merge_(1)
commit("D", 3)
update(2)
addcommit("E", 4)
addcommit("F", 5)
update(3)
addcommit("G", 6)
merge_(5)
commit("H", 7)
update(5)
addcommit("I", 8)
# 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=' ')