Mercurial > hg
annotate hgext/schemes.py @ 31965:171de3152d50
obsolescence: add test case C-1 for obsolescence markers exchange
About 3 years ago, in August 2014, the logic to select what markers to select on
push was ported from the evolve extension to Mercurial core. However, for some
unclear reasons, the tests for that logic were not ported alongside.
I realised it a couple of weeks ago while working on another push related issue.
I've made a clean up pass on the tests and they are now ready to integrate the
core test suite. This series of changesets do not change any logic. I just adds
test for logic that has been around for about 10 versions of Mercurial.
They are a patch for each test case. It makes it easier to review and postpone
one with documentation issues without rejecting the wholes series.
This patch introduce C-1: Multiple pruned changeset atop each other
Each test case comes it in own test file. It help parallelism and does not
introduce a significant overhead from having a single unified giant test file.
Here are timing to support this claim.
# Multiple test files version:
# run-tests.py --local -j 1 test-exchange-*.t
53.40s user 6.82s system 85% cpu 1:10.76 total
52.79s user 6.97s system 85% cpu 1:09.97 total
52.94s user 6.82s system 85% cpu 1:09.69 total
# Single test file version:
# run-tests.py --local -j 1 test-exchange-obsmarkers.t
52.97s user 6.85s system 85% cpu 1:10.10 total
52.64s user 6.79s system 85% cpu 1:09.63 total
53.70s user 7.00s system 85% cpu 1:11.17 total
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Mon, 10 Apr 2017 16:50:41 +0200 |
parents | 198cd5ad9db8 |
children | 46ba2cdda476 |
rev | line source |
---|---|
9964 | 1 # Copyright 2009, Alexander Solovyov <piranha@piranha.org.ua> |
2 # | |
3 # This software may be used and distributed according to the terms of the | |
10263 | 4 # GNU General Public License version 2 or any later version. |
9964 | 5 |
6 """extend schemes with shortcuts to repository swarms | |
7 | |
8 This extension allows you to specify shortcuts for parent URLs with a | |
9 lot of repositories to act like a scheme, for example:: | |
10 | |
11 [schemes] | |
12 py = http://code.python.org/hg/ | |
13 | |
14 After that you can use it like:: | |
15 | |
16 hg clone py://trunk/ | |
17 | |
18 Additionally there is support for some more complex schemas, for | |
19 example used by Google Code:: | |
20 | |
21 [schemes] | |
22 gcode = http://{1}.googlecode.com/hg/ | |
23 | |
24 The syntax is taken from Mercurial templates, and you have unlimited | |
25 number of variables, starting with ``{1}`` and continuing with | |
26 ``{2}``, ``{3}`` and so on. This variables will receive parts of URL | |
27 supplied, split by ``/``. Anything not specified as ``{part}`` will be | |
28 just appended to an URL. | |
29 | |
30 For convenience, the extension adds these schemes by default:: | |
31 | |
32 [schemes] | |
33 py = http://hg.python.org/ | |
34 bb = https://bitbucket.org/ | |
35 bb+ssh = ssh://hg@bitbucket.org/ | |
36 gcode = https://{1}.googlecode.com/hg/ | |
10777
bdc3256a318e
schemes: add Kiln On Demand to default schemes
Benjamin Pollack <benjamin@bitquabit.com>
parents:
10282
diff
changeset
|
37 kiln = https://{1}.kilnhg.com/Repo/ |
9964 | 38 |
9965
963ed04a8fde
schemes: fixed typos in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9964
diff
changeset
|
39 You can override a predefined scheme by defining a new scheme with the |
963ed04a8fde
schemes: fixed typos in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9964
diff
changeset
|
40 same name. |
9964 | 41 """ |
28379
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
42 from __future__ import absolute_import |
9964 | 43 |
28379
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
44 import os |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
45 import re |
29205
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
28379
diff
changeset
|
46 |
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
28379
diff
changeset
|
47 from mercurial.i18n import _ |
28379
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
48 from mercurial import ( |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
49 cmdutil, |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
50 error, |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
51 extensions, |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
52 hg, |
30640
7a3e67bfa417
py3: replace os.name with pycompat.osname (part 2 of 2)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29841
diff
changeset
|
53 pycompat, |
28379
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
54 templater, |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
55 util, |
27a9032374a7
schemas: use absolute_import
timeless <timeless@mozdev.org>
parents:
27982
diff
changeset
|
56 ) |
9964 | 57 |
27982
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
58 cmdtable = {} |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
59 command = cmdutil.command(cmdtable) |
29841
d5883fd055c6
extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents:
29205
diff
changeset
|
60 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
25186
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18910
diff
changeset
|
61 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18910
diff
changeset
|
62 # be specifying the version(s) of Mercurial they are tested with, or |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18910
diff
changeset
|
63 # leave the attribute unspecified. |
29841
d5883fd055c6
extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents:
29205
diff
changeset
|
64 testedwith = 'ships-with-hg-core' |
16743
38caf405d010
hgext: mark all first-party extensions as such
Augie Fackler <raf@durin42.com>
parents:
15609
diff
changeset
|
65 |
31288
198cd5ad9db8
schemes: use br'' literal to define bytes regexp
Yuya Nishihara <yuya@tcha.org>
parents:
31181
diff
changeset
|
66 _partre = re.compile(br'\{(\d+)\}') |
9964 | 67 |
68 class ShortRepository(object): | |
69 def __init__(self, url, scheme, templater): | |
70 self.scheme = scheme | |
71 self.templater = templater | |
72 self.url = url | |
73 try: | |
31181
150cd5125722
schemes: move re construction to module-level and python3-ify
Augie Fackler <raf@durin42.com>
parents:
30640
diff
changeset
|
74 self.parts = max(map(int, _partre.findall(self.url))) |
9964 | 75 except ValueError: |
76 self.parts = 0 | |
77 | |
78 def __repr__(self): | |
79 return '<ShortRepository: %s>' % self.scheme | |
80 | |
81 def instance(self, ui, url, create): | |
27981
d630eac3a5db
schemes: extract scheme expansion as its own method on ShortRepository
Jason R. Coombs <jaraco@jaraco.com>
parents:
26587
diff
changeset
|
82 url = self.resolve(url) |
d630eac3a5db
schemes: extract scheme expansion as its own method on ShortRepository
Jason R. Coombs <jaraco@jaraco.com>
parents:
26587
diff
changeset
|
83 return hg._peerlookup(url).instance(ui, url, create) |
d630eac3a5db
schemes: extract scheme expansion as its own method on ShortRepository
Jason R. Coombs <jaraco@jaraco.com>
parents:
26587
diff
changeset
|
84 |
d630eac3a5db
schemes: extract scheme expansion as its own method on ShortRepository
Jason R. Coombs <jaraco@jaraco.com>
parents:
26587
diff
changeset
|
85 def resolve(self, url): |
17425
e95ec38f86b0
fix wording and not-completely-trivial spelling errors and bad docstrings
Mads Kiilerich <mads@kiilerich.com>
parents:
16743
diff
changeset
|
86 # Should this use the util.url class, or is manual parsing better? |
18910
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
17425
diff
changeset
|
87 try: |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
17425
diff
changeset
|
88 url = url.split('://', 1)[1] |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
17425
diff
changeset
|
89 except IndexError: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25186
diff
changeset
|
90 raise error.Abort(_("no '://' in scheme url '%s'") % url) |
9964 | 91 parts = url.split('/', self.parts) |
92 if len(parts) > self.parts: | |
93 tail = parts[-1] | |
94 parts = parts[:-1] | |
95 else: | |
96 tail = '' | |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
97 context = dict((str(i + 1), v) for i, v in enumerate(parts)) |
27981
d630eac3a5db
schemes: extract scheme expansion as its own method on ShortRepository
Jason R. Coombs <jaraco@jaraco.com>
parents:
26587
diff
changeset
|
98 return ''.join(self.templater.process(self.url, context)) + tail |
9964 | 99 |
13827
f1823b9f073b
url: nuke some newly-introduced underbars in identifiers
Matt Mackall <mpm@selenic.com>
parents:
13822
diff
changeset
|
100 def hasdriveletter(orig, path): |
15609
8f4bad72d8b1
util: fix url.__str__() for windows file URLs
Patrick Mezard <pmezard@gmail.com>
parents:
14606
diff
changeset
|
101 if path: |
8f4bad72d8b1
util: fix url.__str__() for windows file URLs
Patrick Mezard <pmezard@gmail.com>
parents:
14606
diff
changeset
|
102 for scheme in schemes: |
8f4bad72d8b1
util: fix url.__str__() for windows file URLs
Patrick Mezard <pmezard@gmail.com>
parents:
14606
diff
changeset
|
103 if path.startswith(scheme + ':'): |
8f4bad72d8b1
util: fix url.__str__() for windows file URLs
Patrick Mezard <pmezard@gmail.com>
parents:
14606
diff
changeset
|
104 return False |
13822
fbf32a6c903e
schemes: prevent one letter schemes from being interpreted as drive letters
Brodie Rao <brodie@bitheap.org>
parents:
10777
diff
changeset
|
105 return orig(path) |
fbf32a6c903e
schemes: prevent one letter schemes from being interpreted as drive letters
Brodie Rao <brodie@bitheap.org>
parents:
10777
diff
changeset
|
106 |
9964 | 107 schemes = { |
108 'py': 'http://hg.python.org/', | |
109 'bb': 'https://bitbucket.org/', | |
110 'bb+ssh': 'ssh://hg@bitbucket.org/', | |
10777
bdc3256a318e
schemes: add Kiln On Demand to default schemes
Benjamin Pollack <benjamin@bitquabit.com>
parents:
10282
diff
changeset
|
111 'gcode': 'https://{1}.googlecode.com/hg/', |
bdc3256a318e
schemes: add Kiln On Demand to default schemes
Benjamin Pollack <benjamin@bitquabit.com>
parents:
10282
diff
changeset
|
112 'kiln': 'https://{1}.kilnhg.com/Repo/' |
9964 | 113 } |
114 | |
115 def extsetup(ui): | |
116 schemes.update(dict(ui.configitems('schemes'))) | |
117 t = templater.engine(lambda x: x) | |
118 for scheme, url in schemes.items(): | |
30640
7a3e67bfa417
py3: replace os.name with pycompat.osname (part 2 of 2)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29841
diff
changeset
|
119 if (pycompat.osname == 'nt' and len(scheme) == 1 and scheme.isalpha() |
13822
fbf32a6c903e
schemes: prevent one letter schemes from being interpreted as drive letters
Brodie Rao <brodie@bitheap.org>
parents:
10777
diff
changeset
|
120 and os.path.exists('%s:\\' % scheme)): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25186
diff
changeset
|
121 raise error.Abort(_('custom scheme %s:// conflicts with drive ' |
13822
fbf32a6c903e
schemes: prevent one letter schemes from being interpreted as drive letters
Brodie Rao <brodie@bitheap.org>
parents:
10777
diff
changeset
|
122 'letter %s:\\\n') % (scheme, scheme.upper())) |
14606
6e631c24c6d9
hg: move peerschemes back to schemes
Matt Mackall <mpm@selenic.com>
parents:
14605
diff
changeset
|
123 hg.schemes[scheme] = ShortRepository(url, scheme, t) |
13822
fbf32a6c903e
schemes: prevent one letter schemes from being interpreted as drive letters
Brodie Rao <brodie@bitheap.org>
parents:
10777
diff
changeset
|
124 |
14076
924c82157d46
url: move URL parsing functions into util to improve startup time
Brodie Rao <brodie@bitheap.org>
parents:
13827
diff
changeset
|
125 extensions.wrapfunction(util, 'hasdriveletter', hasdriveletter) |
27982
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
126 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
127 @command('debugexpandscheme', norepo=True) |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
128 def expandscheme(ui, url, **opts): |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
129 """given a repo path, provide the scheme-expanded path |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
130 """ |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
131 repo = hg._peerlookup(url) |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
132 if isinstance(repo, ShortRepository): |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
133 url = repo.resolve(url) |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
27981
diff
changeset
|
134 ui.write(url + '\n') |