Mercurial > hg
annotate tests/test-schemes.t @ 45121:b6269741ed42
config: add option to control creation of empty successors during rewrite
The default for many history-rewriting commands (e.g. rebase and absorb) is
that changesets which would become empty are not created in the target branch.
This makes sense if the source branch consists of small fix-up changes. For
more advanced workflows that make heavy use of history-editing to create
curated patch series, dropping empty changesets is not as important or even
undesirable.
Some users want to keep the meta-history, e.g. to make finding comments in a
code review tool easier or to avoid that divergent bookmarks are created. For
that, obsmarkers from the (to-be) empty changeset to the changeset(s) that
already made the changes should be added. If a to-be empty changeset is pruned
without a successor, adding the obsmarkers is hard because the changeset has to
be found within the hidden part of the history.
If rebasing in TortoiseHg, it’s easy to miss the fact that the to-be empty
changeset was pruned. An empty changeset will function as a reminder that
obsmarkers should be added.
Martin von Zweigbergk mentioned another advantage. Stripping the successor will
de-obsolete the predecessor. If no (empty) successor is created, this won’t be
possible.
In the future, we may want to consider other behaviors, like e.g. creating the
empty successor, but pruning it right away. Therefore this configuration
accepts 'skip' and 'keep' instead of being a boolean configuration.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 11 Jul 2020 23:53:27 +0200 |
parents | 393e44324037 |
children |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18910
diff
changeset
|
1 #require serve |
9964 | 2 |
12486 | 3 $ cat <<EOF >> $HGRCPATH |
4 > [extensions] | |
5 > schemes= | |
6 > | |
7 > [schemes] | |
8 > l = http://localhost:$HGPORT/ | |
9 > parts = http://{1}:$HGPORT/ | |
10 > z = file:\$PWD/ | |
11 > EOF | |
12 $ hg init test | |
13 $ cd test | |
14 $ echo a > a | |
15 $ hg ci -Am initial | |
16 adding a | |
18910
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
17 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
18 invalid scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
19 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
20 $ hg log -R z:z |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
21 abort: no '://' in scheme url 'z:z' |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
22 [255] |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
23 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
24 http scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
25 |
12486 | 26 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
27 $ cat hg.pid >> $DAEMON_PIDS | |
28 $ hg incoming l:// | |
29 comparing with l:// | |
30 searching for changes | |
31 no changes found | |
32 [1] | |
9964 | 33 |
12486 | 34 check that {1} syntax works |
9964 | 35 |
12486 | 36 $ hg incoming --debug parts://localhost |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12486
diff
changeset
|
37 using http://localhost:$HGPORT/ |
13603
395a84f78736
httprepo: use caps instead of between for compat check
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12643
diff
changeset
|
38 sending capabilities command |
13815
d066d8d652c8
url: add trailing slashes to URLs with hostnames that don't have one
Brodie Rao <brodie@bitheap.org>
parents:
13742
diff
changeset
|
39 comparing with parts://localhost/ |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
40 query 1; heads |
14624
f03c82d1f50a
setdiscovery: batch heads and known(ownheads)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14164
diff
changeset
|
41 sending batch command |
12486 | 42 searching for changes |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
43 all remote heads known locally |
12486 | 44 no changes found |
40034
393e44324037
httppeer: report http statistics
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27982
diff
changeset
|
45 (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob) |
12486 | 46 [1] |
9964 | 47 |
12486 | 48 check that paths are expanded |
10070
9d1195b2f00d
schemes: url parts are counted from 1
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9964
diff
changeset
|
49 |
12486 | 50 $ PWD=`pwd` hg incoming z:// |
51 comparing with z:// | |
52 searching for changes | |
53 no changes found | |
54 [1] | |
11154
17031fea4e95
expand paths to local repository or bundle in appropriate classes
Alexander Solovyov <piranha@piranha.org.ua>
parents:
10070
diff
changeset
|
55 |
27982
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
56 check that debugexpandscheme outputs the canonical form |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
57 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
58 $ hg debugexpandscheme bb://user/repo |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
59 https://bitbucket.org/user/repo |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
60 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
61 expanding an unknown scheme emits the input |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
62 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
63 $ hg debugexpandscheme foobar://this/that |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
64 foobar://this/that |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
65 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
66 expanding a canonical URL emits the input |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
67 |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
68 $ hg debugexpandscheme https://bitbucket.org/user/repo |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
69 https://bitbucket.org/user/repo |
bf1d5c223ac0
schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents:
22046
diff
changeset
|
70 |
12486 | 71 errors |
72 | |
73 $ cat errors.log | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
74 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
75 $ cd .. |