author | Matt Harbison <matt_harbison@yahoo.com> |
Thu, 11 Jul 2024 20:54:06 -0400 | |
changeset 51685 | 0eb515c7bec8 |
parent 51646 | f02ec1ecb3bf |
child 51902 | 1eb2317c1762 |
permissions | -rw-r--r-- |
51521
0d4a6ab3c8da
branchcache-v3: use more explicit header line
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51520
diff
changeset
|
1 |
#testcases mmap nommap |
0d4a6ab3c8da
branchcache-v3: use more explicit header line
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51520
diff
changeset
|
2 |
#testcases v2 v3 |
51375
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
3 |
|
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
4 |
#if mmap |
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
5 |
$ cat <<EOF >> $HGRCPATH |
51447
40943970b7ae
config: move the option to mmap rev branch cache in the storage section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51375
diff
changeset
|
6 |
> [storage] |
40943970b7ae
config: move the option to mmap rev branch cache in the storage section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51375
diff
changeset
|
7 |
> revbranchcache.mmap=true |
51375
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
8 |
> EOF |
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
9 |
#endif |
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
10 |
|
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
11 |
#if v3 |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
12 |
$ cat <<EOF >> $HGRCPATH |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
13 |
> [experimental] |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
14 |
> branch-cache-v3=yes |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
15 |
> EOF |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
16 |
#else |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
17 |
$ cat <<EOF >> $HGRCPATH |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
18 |
> [experimental] |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
19 |
> branch-cache-v3=no |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
20 |
> EOF |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
21 |
#endif |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
22 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
23 |
$ hg init a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
24 |
$ cd a |
31454
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
25 |
|
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
26 |
Verify checking branch of nullrev before the cache is created doesnt crash |
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
27 |
$ hg log -r 'branch(.)' -T '{branch}\n' |
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
28 |
|
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
29 |
Basic test |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
30 |
$ echo 'root' >root |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
31 |
$ hg add root |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
32 |
$ hg commit -d '0 0' -m "Adding root node" |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
33 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
34 |
$ echo 'a' >a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
35 |
$ hg add a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
36 |
$ hg branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
37 |
marked working directory as branch a |
15615 | 38 |
(branches are permanent and global, did you want a bookmark?) |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
39 |
$ hg commit -d '1 0' -m "Adding a branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
40 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
41 |
$ hg branch q |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
42 |
marked working directory as branch q |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
43 |
$ echo 'aa' >a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
44 |
$ hg branch -C |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
45 |
reset working directory to branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
46 |
$ hg commit -d '2 0' -m "Adding to a branch" |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
47 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
48 |
$ hg update -C 0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
49 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
50 |
$ echo 'b' >b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
51 |
$ hg add b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
52 |
$ hg branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
53 |
marked working directory as branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
54 |
$ hg commit -d '2 0' -m "Adding b branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
55 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
56 |
$ echo 'bh1' >bh1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
57 |
$ hg add bh1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
58 |
$ hg commit -d '3 0' -m "Adding b branch head 1" |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
59 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
60 |
$ hg update -C 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
61 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
62 |
$ echo 'bh2' >bh2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
63 |
$ hg add bh2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
64 |
$ hg commit -d '4 0' -m "Adding b branch head 2" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
65 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
66 |
$ echo 'c' >c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
67 |
$ hg add c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
68 |
$ hg branch c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
69 |
marked working directory as branch c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
70 |
$ hg commit -d '5 0' -m "Adding c branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
71 |
|
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
72 |
reserved names |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
73 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
74 |
$ hg branch tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
75 |
abort: the name 'tip' is reserved |
45845
f96fa4de5055
errors: use InputError for errors about bad label names (tags etc)
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
76 |
[10] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
77 |
$ hg branch null |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
78 |
abort: the name 'null' is reserved |
45845
f96fa4de5055
errors: use InputError for errors about bad label names (tags etc)
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
79 |
[10] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
80 |
$ hg branch . |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
81 |
abort: the name '.' is reserved |
45845
f96fa4de5055
errors: use InputError for errors about bad label names (tags etc)
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
82 |
[10] |
7006
92d44ec32430
branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6815
diff
changeset
|
83 |
|
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
84 |
invalid characters |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
85 |
|
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
86 |
$ hg branch 'foo:bar' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17821
diff
changeset
|
87 |
abort: ':' cannot be used in a name |
45845
f96fa4de5055
errors: use InputError for errors about bad label names (tags etc)
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
88 |
[10] |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
89 |
|
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
90 |
$ hg branch 'foo |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
91 |
> bar' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17821
diff
changeset
|
92 |
abort: '\n' cannot be used in a name |
45845
f96fa4de5055
errors: use InputError for errors about bad label names (tags etc)
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
93 |
[10] |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
94 |
|
19180
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
95 |
trailing or leading spaces should be stripped before testing duplicates |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
96 |
|
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
97 |
$ hg branch 'b ' |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
98 |
abort: a branch of the same name already exists |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
99 |
(use 'hg update' to switch to it) |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
42542
diff
changeset
|
100 |
[10] |
19180
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
101 |
|
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
102 |
$ hg branch ' b' |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
103 |
abort: a branch of the same name already exists |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
104 |
(use 'hg update' to switch to it) |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
42542
diff
changeset
|
105 |
[10] |
19180
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
106 |
|
49968
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
107 |
underscores in numeric branch names (issue6737) |
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
108 |
|
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
109 |
$ hg branch 2700_210 |
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
110 |
marked working directory as branch 2700_210 |
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
111 |
|
17984
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
112 |
verify update will accept invalid legacy branch names |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
113 |
|
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
114 |
$ hg init test-invalid-branch-name |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
115 |
$ cd test-invalid-branch-name |
37336
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34661
diff
changeset
|
116 |
$ hg unbundle -u "$TESTDIR"/bundles/test-invalid-branch-name.hg |
17984
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
117 |
adding changesets |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
118 |
adding manifests |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
119 |
adding file changes |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
120 |
added 3 changesets with 3 changes to 2 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37336
diff
changeset
|
121 |
new changesets f0e4c7f04036:33c2ceb9310b (3 drafts) |
17984
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
122 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
123 |
|
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
124 |
$ hg update '"colon:test"' |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
125 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
126 |
$ cd .. |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
127 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
128 |
$ echo 'd' >d |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
129 |
$ hg add d |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
130 |
$ hg branch 'a branch name much longer than the default justification used by branches' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
131 |
marked working directory as branch a branch name much longer than the default justification used by branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
132 |
$ hg commit -d '6 0' -m "Adding d branch" |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
133 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
134 |
$ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
135 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
136 |
b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
137 |
c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
138 |
a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
139 |
default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
140 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
141 |
------- |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
142 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
143 |
$ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
144 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
145 |
b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
146 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
147 |
--- Branch a |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
148 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
149 |
$ hg log -b a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
150 |
changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
151 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
152 |
parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
153 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
154 |
date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
155 |
summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
156 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
157 |
changeset: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
158 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
159 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
160 |
date: Thu Jan 01 00:00:02 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
161 |
summary: Adding to a branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
162 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
163 |
changeset: 1:dd6b440dd85a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
164 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
165 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
166 |
date: Thu Jan 01 00:00:01 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
167 |
summary: Adding a branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
168 |
|
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
169 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
170 |
---- Branch b |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
171 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
172 |
$ hg log -b b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
173 |
changeset: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
174 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
175 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
176 |
date: Thu Jan 01 00:00:03 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
177 |
summary: Adding b branch head 1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
178 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
179 |
changeset: 3:ac22033332d1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
180 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
181 |
parent: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
182 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
183 |
date: Thu Jan 01 00:00:02 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
184 |
summary: Adding b branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
185 |
|
10417
58e040c51231
branch: avoid using reserved tag names
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8991
diff
changeset
|
186 |
|
41064
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
187 |
---- going to test branch listing by rev |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
188 |
$ hg branches -r0 |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
189 |
default 0:19709c5a4e75 (inactive) |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
190 |
$ hg branches -qr0 |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
191 |
default |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
192 |
--- now more than one rev |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
193 |
$ hg branches -r2:5 |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
194 |
b 4:aee39cd168d0 |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
195 |
a 5:d8cbc61dbaa6 (inactive) |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
196 |
$ hg branches -qr2:5 |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
197 |
b |
4506f801e492
branches: add -r option to show branch name(s) of a given rev (issue5948)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents:
39480
diff
changeset
|
198 |
a |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
199 |
---- going to test branch closing |
6631
a2b13cac0922
Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6067
diff
changeset
|
200 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
201 |
$ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
202 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
203 |
b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
204 |
c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
205 |
a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
206 |
default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
207 |
$ hg up -C b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
208 |
2 files updated, 0 files merged, 4 files removed, 0 files unresolved |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
209 |
$ echo 'xxx1' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
210 |
$ hg commit -d '7 0' -m 'adding cset to branch b' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
211 |
$ hg up -C aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
212 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
213 |
$ echo 'xxx2' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
214 |
$ hg commit -d '8 0' -m 'adding head to branch b' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
215 |
created new head |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
216 |
$ echo 'xxx3' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
217 |
$ hg commit -d '9 0' -m 'adding another cset to branch b' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
218 |
$ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
219 |
b 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
220 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
221 |
c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
222 |
a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
223 |
default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
224 |
$ hg heads --closed |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
225 |
changeset: 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
226 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
227 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
228 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
229 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
230 |
summary: adding another cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
231 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
232 |
changeset: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
233 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
234 |
parent: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
235 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
236 |
date: Thu Jan 01 00:00:07 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
237 |
summary: adding cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
238 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
239 |
changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
240 |
branch: a branch name much longer than the default justification used by branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
241 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
242 |
date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
243 |
summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
244 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
245 |
changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
246 |
branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
247 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
248 |
date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
249 |
summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
250 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
251 |
changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
252 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
253 |
parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
254 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
255 |
date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
256 |
summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
257 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
258 |
changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
259 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
260 |
date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
261 |
summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
262 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
263 |
$ hg heads |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
264 |
changeset: 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
265 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
266 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
267 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
268 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
269 |
summary: adding another cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
270 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
271 |
changeset: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
272 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
273 |
parent: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
274 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
275 |
date: Thu Jan 01 00:00:07 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
276 |
summary: adding cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
277 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
278 |
changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
279 |
branch: a branch name much longer than the default justification used by branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
280 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
281 |
date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
282 |
summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
283 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
284 |
changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
285 |
branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
286 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
287 |
date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
288 |
summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
289 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
290 |
changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
291 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
292 |
parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
293 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
294 |
date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
295 |
summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
296 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
297 |
changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
298 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
299 |
date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
300 |
summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
301 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
302 |
$ hg commit -d '9 0' --close-branch -m 'prune bad branch' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
303 |
$ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
304 |
b 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
305 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
306 |
$ hg up -C b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
307 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
308 |
$ hg commit -d '9 0' --close-branch -m 'close this part branch too' |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
309 |
$ hg commit -d '9 0' --close-branch -m 're-closing this branch' |
42493
9f7cb777b654
commit: add a check if it is trying to close an already closed branch head
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42202
diff
changeset
|
310 |
abort: current revision is already a branch closing head |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
42542
diff
changeset
|
311 |
[10] |
6067
57c1a7052982
Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents:
4675
diff
changeset
|
312 |
|
49320
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
313 |
$ echo foo > b |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
314 |
$ hg commit -d '9 0' --close-branch -m 're-closing this branch' |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
315 |
|
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
316 |
$ echo bar > b |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
317 |
$ hg commit -d '9 0' --close-branch -m 're-closing this branch' bh1 |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
318 |
abort: current revision is already a branch closing head |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
319 |
[10] |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
320 |
$ hg commit -d '9 0' --close-branch -m 're-closing this branch' b |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
321 |
|
49617
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
322 |
$ echo baz > b |
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
323 |
$ hg commit -d '9 0' --close-branch -m 'empty re-closing this branch' -X b |
49618
3adca6eb6659
commit: properly consider file include and exclude options when closing branch
Matt Harbison <matt_harbison@yahoo.com>
parents:
49617
diff
changeset
|
324 |
abort: current revision is already a branch closing head |
3adca6eb6659
commit: properly consider file include and exclude options when closing branch
Matt Harbison <matt_harbison@yahoo.com>
parents:
49617
diff
changeset
|
325 |
[10] |
49617
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
326 |
$ hg revert b |
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
327 |
|
49320
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
328 |
$ hg debugstrip --rev 13: --no-backup |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
329 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
330 |
$ hg revert --all --no-backup |
3d3d7fc6035a
commit: allow to close branch when committing change over a closed head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48677
diff
changeset
|
331 |
|
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
332 |
$ hg log -r tip --debug |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
333 |
changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
334 |
branch: b |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
335 |
tag: tip |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
336 |
phase: draft |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
337 |
parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
338 |
parent: -1:0000000000000000000000000000000000000000 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
339 |
manifest: 8:6f9ed32d2b310e391a4f107d5f0f071df785bfee |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
340 |
user: test |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
341 |
date: Thu Jan 01 00:00:09 1970 +0000 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
342 |
extra: branch=b |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
343 |
extra: close=1 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
344 |
description: |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
345 |
close this part branch too |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
346 |
|
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
347 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
348 |
--- b branch should be inactive |
7657
405cacb06745
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
7006
diff
changeset
|
349 |
|
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
350 |
$ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
351 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
352 |
c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
353 |
a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
354 |
default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
355 |
$ hg branches -c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
356 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
357 |
b 12:e3d49c0575d8 (closed) |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
358 |
c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
359 |
a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
360 |
default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
361 |
$ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
362 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
16612
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
363 |
$ hg branches -q |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
364 |
a branch name much longer than the default justification used by branches |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
365 |
c |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
366 |
a |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
367 |
default |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
368 |
$ hg heads b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
369 |
no open branch heads found on branches b |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11969
diff
changeset
|
370 |
[1] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
371 |
$ hg heads --closed b |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
372 |
changeset: 12:e3d49c0575d8 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
373 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
374 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
375 |
parent: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
376 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
377 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
378 |
summary: close this part branch too |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
379 |
|
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
380 |
changeset: 11:d3f163457ebf |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
381 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
382 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
383 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
384 |
summary: prune bad branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
385 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
386 |
$ echo 'xxx4' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
387 |
$ hg commit -d '9 0' -m 'reopen branch with a change' |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
388 |
reopening closed branch head 12 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
389 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
390 |
--- branch b is back in action |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
391 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
392 |
$ hg branches -a |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
393 |
b 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
394 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
395 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
396 |
---- test heads listings |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
397 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
398 |
$ hg heads |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
399 |
changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
400 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
401 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
402 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
403 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
404 |
summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
405 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
406 |
changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
407 |
branch: a branch name much longer than the default justification used by branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
408 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
409 |
date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
410 |
summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
411 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
412 |
changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
413 |
branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
414 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
415 |
date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
416 |
summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
417 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
418 |
changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
419 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
420 |
parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
421 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
422 |
date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
423 |
summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
424 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
425 |
changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
426 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
427 |
date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
428 |
summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
429 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
430 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
431 |
branch default |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
432 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
433 |
$ hg heads default |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
434 |
changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
435 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
436 |
date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
437 |
summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
438 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
439 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
440 |
branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
441 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
442 |
$ hg heads a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
443 |
changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
444 |
branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
445 |
parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
446 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
447 |
date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
448 |
summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
449 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
450 |
$ hg heads --active a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
451 |
no open branch heads found on branches a |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11969
diff
changeset
|
452 |
[1] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
453 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
454 |
branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
455 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
456 |
$ hg heads b |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
457 |
changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
458 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
459 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
460 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
461 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
462 |
summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
463 |
|
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
464 |
$ hg heads --closed b |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
465 |
changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
466 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
467 |
tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
468 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
469 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
470 |
summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
471 |
|
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
472 |
changeset: 11:d3f163457ebf |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
473 |
branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
474 |
user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
475 |
date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
476 |
summary: prune bad branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
477 |
|
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
478 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
479 |
reclose branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
480 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
481 |
$ hg up -C c |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
482 |
3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
483 |
$ hg commit -d '9 0' --close-branch -m 'reclosing this branch' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
484 |
$ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
485 |
b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
486 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
487 |
a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
488 |
default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
489 |
$ hg branches --closed |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
490 |
b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
491 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
492 |
c 14:f894c25619d3 (closed) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
493 |
a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
494 |
default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
495 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
496 |
multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
497 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
498 |
$ hg up -C default |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
499 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
500 |
$ hg branch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
501 |
marked working directory as branch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
502 |
$ touch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
503 |
$ hg add m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
504 |
$ hg commit -d '10 0' -m 'multihead base' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
505 |
$ echo "m1" >m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
506 |
$ hg commit -d '10 0' -m 'head 1' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
507 |
$ hg up -C '.^' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
508 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
509 |
$ echo "m2" >m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
510 |
$ hg commit -d '10 0' -m 'head 2' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
511 |
created new head |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
512 |
$ hg log -b m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
513 |
changeset: 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
514 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
515 |
tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
516 |
parent: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
517 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
518 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
519 |
summary: head 2 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
520 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
521 |
changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
522 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
523 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
524 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
525 |
summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
526 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
527 |
changeset: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
528 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
529 |
parent: 0:19709c5a4e75 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
530 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
531 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
532 |
summary: multihead base |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
533 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
534 |
$ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
535 |
changeset: 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
536 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
537 |
tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
538 |
parent: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
539 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
540 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
541 |
summary: head 2 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
542 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
543 |
changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
544 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
545 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
546 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
547 |
summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
548 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
549 |
$ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
550 |
m 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
551 |
b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
552 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
553 |
a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
554 |
default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
555 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
556 |
partially merge multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
557 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
558 |
$ hg up -C default |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
559 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
560 |
$ hg branch md |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
561 |
marked working directory as branch md |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
562 |
$ hg merge m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
563 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
564 |
(branch merge, don't forget to commit) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
565 |
$ hg commit -d '11 0' -m 'merge head 2' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
566 |
$ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
567 |
changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
568 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
569 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
570 |
date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
571 |
summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
572 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
573 |
$ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
574 |
md 18:c914c99f1fbb |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
575 |
m 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
576 |
b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
577 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
578 |
a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
579 |
default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
580 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
581 |
partially close multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
582 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
583 |
$ hg up -C a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
584 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
585 |
$ hg commit -d '12 0' -m 'close head 1' --close-branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
586 |
$ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
587 |
changeset: 19:cd21a80baa3d |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
588 |
branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
589 |
tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
590 |
parent: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
591 |
user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
592 |
date: Thu Jan 01 00:00:12 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
593 |
summary: close head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
594 |
|
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
595 |
$ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
596 |
md 18:c914c99f1fbb |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
597 |
b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
598 |
a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
599 |
m 17:df343b0df04f (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
600 |
a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
601 |
default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
602 |
|
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
603 |
default branch colors: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
604 |
|
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
605 |
$ cat <<EOF >> $HGRCPATH |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
606 |
> [extensions] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
607 |
> color = |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
608 |
> [color] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
609 |
> mode = ansi |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
610 |
> EOF |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
611 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
612 |
$ hg up -C b |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
613 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
614 |
$ hg branches --color=always |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
615 |
\x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
616 |
\x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
617 |
\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
618 |
\x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
619 |
\x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
620 |
\x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
621 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
622 |
default closed branch color: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
623 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
624 |
$ hg branches --color=always --closed |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
625 |
\x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
626 |
\x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
627 |
\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
628 |
\x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
629 |
\x1b[0;30;1mc\x1b[0m\x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
630 |
\x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
631 |
\x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
632 |
|
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
633 |
$ cat <<EOF >> $HGRCPATH |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
634 |
> [extensions] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
635 |
> color = |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
636 |
> [color] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
637 |
> branches.active = green |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
638 |
> branches.closed = blue |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
639 |
> branches.current = red |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
640 |
> branches.inactive = magenta |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
641 |
> log.changeset = cyan |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
642 |
> EOF |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
643 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
644 |
custom branch colors: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
645 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
646 |
$ hg branches --color=always |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
647 |
\x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
648 |
\x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
649 |
\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
650 |
\x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
651 |
\x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
652 |
\x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
653 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
654 |
custom closed branch color: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
655 |
|
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
656 |
$ hg branches --color=always --closed |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
657 |
\x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
658 |
\x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
659 |
\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
660 |
\x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) |
22704
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
661 |
\x1b[0;34mc\x1b[0m\x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
662 |
\x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
386339ffe421
branches: merge white space to format string
Yuya Nishihara <yuya@tcha.org>
parents:
22703
diff
changeset
|
663 |
\x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16612
diff
changeset
|
664 |
|
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
665 |
template output: |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
666 |
|
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
667 |
$ hg branches -Tjson --closed |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
668 |
[ |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
669 |
{ |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
670 |
"active": true, |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
671 |
"branch": "md", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
672 |
"closed": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
673 |
"current": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
674 |
"node": "c914c99f1fbb2b1d785a0a939ed3f67275df18e9", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
675 |
"rev": 18 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
676 |
}, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
677 |
{ |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
678 |
"active": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
679 |
"branch": "b", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
680 |
"closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
681 |
"current": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
682 |
"node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
683 |
"rev": 13 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
684 |
}, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
685 |
{ |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
686 |
"active": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
687 |
"branch": "a branch name much longer than the default justification used by branches", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
688 |
"closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
689 |
"current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
690 |
"node": "10ff5895aa5793bd378da574af8cec8ea408d831", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
691 |
"rev": 7 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
692 |
}, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
693 |
{ |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
694 |
"active": false, |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
695 |
"branch": "m", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
696 |
"closed": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
697 |
"current": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
698 |
"node": "df343b0df04feb2a946cd4b6e9520e552fef14ee", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
699 |
"rev": 17 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
700 |
}, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
701 |
{ |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
702 |
"active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
703 |
"branch": "c", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
704 |
"closed": true, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
705 |
"current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
706 |
"node": "f894c25619d3f1484639d81be950e0a07bc6f1f6", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
707 |
"rev": 14 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
708 |
}, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
709 |
{ |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
710 |
"active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
711 |
"branch": "a", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
712 |
"closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
713 |
"current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
714 |
"node": "d8cbc61dbaa6dc817175d1e301eecb863f280832", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
715 |
"rev": 5 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
716 |
}, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
717 |
{ |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
718 |
"active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
719 |
"branch": "default", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
720 |
"closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
721 |
"current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
722 |
"node": "19709c5a4e75bf938f8e349aff97438539bb729e", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
723 |
"rev": 0 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
724 |
} |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
725 |
] |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
726 |
|
29816
034412ca28c3
templater: fix if() to not evaluate False as bool('False')
Yuya Nishihara <yuya@tcha.org>
parents:
29744
diff
changeset
|
727 |
$ hg branches --closed -T '{if(closed, "{branch}\n")}' |
034412ca28c3
templater: fix if() to not evaluate False as bool('False')
Yuya Nishihara <yuya@tcha.org>
parents:
29744
diff
changeset
|
728 |
c |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
729 |
|
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
730 |
$ hg branches -T '{word(0, branch)}: {desc|firstline}\n' |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
731 |
md: merge head 2 |
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
732 |
b: reopen branch with a change |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
733 |
a: Adding d branch |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
734 |
m: head 2 |
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
735 |
a: Adding b branch head 2 |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
736 |
default: Adding root node |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
737 |
|
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
738 |
$ cat <<'EOF' > "$TESTTMP/map-myjson" |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
739 |
> docheader = '\{\n' |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
740 |
> docfooter = '\n}\n' |
32950
5100ce217dfa
formatter: add support for separator template
Yuya Nishihara <yuya@tcha.org>
parents:
32949
diff
changeset
|
741 |
> separator = ',\n' |
5100ce217dfa
formatter: add support for separator template
Yuya Nishihara <yuya@tcha.org>
parents:
32949
diff
changeset
|
742 |
> branches = ' {dict(branch, node|short)|json}' |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
743 |
> EOF |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
744 |
$ hg branches -T "$TESTTMP/map-myjson" |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
745 |
{ |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
746 |
{"branch": "md", "node": "c914c99f1fbb"}, |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
747 |
{"branch": "b", "node": "e23b5505d1ad"}, |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
748 |
{"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
749 |
{"branch": "m", "node": "df343b0df04f"}, |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
750 |
{"branch": "a", "node": "d8cbc61dbaa6"}, |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
751 |
{"branch": "default", "node": "19709c5a4e75"} |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
752 |
} |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
753 |
|
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
754 |
$ cat <<'EOF' >> .hg/hgrc |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
755 |
> [templates] |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
756 |
> myjson = ' {dict(branch, node|short)|json}' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
757 |
> myjson:docheader = '\{\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
758 |
> myjson:docfooter = '\n}\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
759 |
> myjson:separator = ',\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
760 |
> EOF |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
761 |
$ hg branches -T myjson |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
762 |
{ |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
763 |
{"branch": "md", "node": "c914c99f1fbb"}, |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
764 |
{"branch": "b", "node": "e23b5505d1ad"}, |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
765 |
{"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
766 |
{"branch": "m", "node": "df343b0df04f"}, |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
767 |
{"branch": "a", "node": "d8cbc61dbaa6"}, |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
768 |
{"branch": "default", "node": "19709c5a4e75"} |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
769 |
} |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
770 |
|
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
771 |
$ cat <<'EOF' >> .hg/hgrc |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
772 |
> [templates] |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
773 |
> :docheader = 'should not be selected as a docheader for literal templates\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
774 |
> EOF |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
775 |
$ hg branches -T '{branch}\n' |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
776 |
md |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
777 |
b |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
778 |
a branch name much longer than the default justification used by branches |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
779 |
m |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
780 |
a |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
781 |
default |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
782 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
783 |
Tests of revision branch name caching |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
784 |
|
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
785 |
We rev branch cache is updated automatically. In these tests we use a trick to |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
786 |
trigger rebuilds. We remove the branch head cache and run 'hg head' to cause a |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
787 |
rebuild that also will populate the rev branch cache. |
23787
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
788 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
789 |
revision branch cache is created when building the branch head cache |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
790 |
$ rm -rf .hg/cache; hg head a -T '{rev}\n' |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
791 |
5 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
792 |
$ f --hexdump --size .hg/cache/rbc-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
793 |
.hg/cache/rbc-names-v1: size=92 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
794 |
0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a | |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
795 |
0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
796 |
0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
797 |
0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
798 |
0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b| |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
799 |
0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 |ranches.m.md| |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
800 |
.hg/cache/rbc-revs-v1: size=160 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
801 |
0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
802 |
0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
803 |
0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
804 |
0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 |X.6.......X.....| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
805 |
0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 |...D...._@a.....| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
806 |
0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 |..........cE....| |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
807 |
0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 |.........;U.....| |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
808 |
0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 |...V.....Dv7....| |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
809 |
0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 |.........4;.....| |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
810 |
0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 |.........!......| |
24372
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
811 |
|
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
812 |
no errors when revbranchcache is not writable |
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
813 |
|
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
814 |
$ echo >> .hg/cache/rbc-revs-v1 |
28145
cfa0037448f4
tests: change branches test to work cross platform
timeless <timeless@mozdev.org>
parents:
25295
diff
changeset
|
815 |
$ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ |
cfa0037448f4
tests: change branches test to work cross platform
timeless <timeless@mozdev.org>
parents:
25295
diff
changeset
|
816 |
$ mkdir .hg/cache/rbc-revs-v1 |
24372
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
817 |
$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' |
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
818 |
5 |
28145
cfa0037448f4
tests: change branches test to work cross platform
timeless <timeless@mozdev.org>
parents:
25295
diff
changeset
|
819 |
$ rmdir .hg/cache/rbc-revs-v1 |
cfa0037448f4
tests: change branches test to work cross platform
timeless <timeless@mozdev.org>
parents:
25295
diff
changeset
|
820 |
$ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 |
24372
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
821 |
|
29744
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
822 |
no errors when wlock cannot be acquired |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
823 |
|
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
824 |
#if unix-permissions |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
825 |
$ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
826 |
$ rm -f .hg/cache/branch* |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
827 |
$ chmod 555 .hg |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
828 |
$ hg head a -T '{rev}\n' |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
829 |
5 |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
830 |
$ chmod 755 .hg |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
831 |
$ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
832 |
#endif |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
833 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
834 |
recovery from invalid cache revs file with trailing data |
23787
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
835 |
$ echo >> .hg/cache/rbc-revs-v1 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
836 |
$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
837 |
5 |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
838 |
truncating cache/rbc-revs-v1 to 160 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
839 |
$ f --size .hg/cache/rbc-revs* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
840 |
.hg/cache/rbc-revs-v1: size=160 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
841 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
842 |
recovery from invalid cache file with partial last record |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
843 |
$ mv .hg/cache/rbc-revs-v1 . |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
844 |
$ f -qDB 119 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
845 |
$ f --size .hg/cache/rbc-revs* |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
846 |
.hg/cache/rbc-revs-v1: size=119 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
847 |
$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
848 |
5 |
23862
7aa1405528a3
branchcache: add debug output whenever cache files use truncate
Mads Kiilerich <madski@unity3d.com>
parents:
23861
diff
changeset
|
849 |
truncating cache/rbc-revs-v1 to 112 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
850 |
$ f --size .hg/cache/rbc-revs* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
851 |
.hg/cache/rbc-revs-v1: size=160 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
852 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
853 |
recovery from invalid cache file with missing record - no truncation |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
854 |
$ mv .hg/cache/rbc-revs-v1 . |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
855 |
$ f -qDB 112 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
856 |
$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
857 |
5 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
858 |
$ f --size .hg/cache/rbc-revs* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
859 |
.hg/cache/rbc-revs-v1: size=160 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
860 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
861 |
recovery from invalid cache file with some bad records |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
862 |
$ mv .hg/cache/rbc-revs-v1 . |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
863 |
$ f -qDB 8 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
864 |
$ f --size .hg/cache/rbc-revs* |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
865 |
.hg/cache/rbc-revs-v1: size=8 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
866 |
$ f -qDB 112 rbc-revs-v1 >> .hg/cache/rbc-revs-v1 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
867 |
$ f --size .hg/cache/rbc-revs* |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
868 |
.hg/cache/rbc-revs-v1: size=120 |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
869 |
$ hg log -r 'branch(.)' -T '{rev} ' --debug |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
870 |
history modification detected - truncating revision branch cache to revision * (glob) |
29615
a2a380e2750f
rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount
Mads Kiilerich <madski@unity3d.com>
parents:
29614
diff
changeset
|
871 |
history modification detected - truncating revision branch cache to revision 1 |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
872 |
3 4 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 8 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
873 |
$ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
874 |
5 |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
875 |
truncating cache/rbc-revs-v1 to 104 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
876 |
$ f --size --hexdump --bytes=16 .hg/cache/rbc-revs* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
877 |
.hg/cache/rbc-revs-v1: size=160 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
878 |
0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
879 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
880 |
cache is updated when committing |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
881 |
$ hg branch i-will-regret-this |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
882 |
marked working directory as branch i-will-regret-this |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
883 |
$ hg ci -m regrets |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
884 |
$ f --size .hg/cache/rbc-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
885 |
.hg/cache/rbc-names-v1: size=111 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
886 |
.hg/cache/rbc-revs-v1: size=168 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
887 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
888 |
update after rollback - the cache will be correct but rbc-names will will still |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
889 |
contain the branch name even though it no longer is used |
23787
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
890 |
$ hg up -qr '.^' |
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
891 |
$ hg rollback -qf |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
892 |
$ f --size .hg/cache/rbc-names-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
893 |
.hg/cache/rbc-names-v1: size=111 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
894 |
$ grep "i-will-regret-this" .hg/cache/rbc-names-* > /dev/null |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
895 |
$ f --size .hg/cache/rbc-revs-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
896 |
.hg/cache/rbc-revs-v1: size=160 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
897 |
|
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
898 |
cache is updated/truncated when stripping - it is thus very hard to get in a |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
899 |
situation where the cache is out of sync and the hash check detects it |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
900 |
$ hg --config extensions.strip= strip -r tip --nob |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
901 |
$ f --size .hg/cache/rbc-revs* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
902 |
.hg/cache/rbc-revs-v1: size=152 |
23787
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
903 |
|
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
904 |
cache is rebuilt when corruption is detected |
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
905 |
$ echo > .hg/cache/rbc-names-v1 |
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
906 |
$ hg log -r '5:&branch(.)' -T '{rev} ' --debug |
29615
a2a380e2750f
rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount
Mads Kiilerich <madski@unity3d.com>
parents:
29614
diff
changeset
|
907 |
referenced branch names not found - rebuilding revision branch cache from scratch |
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
908 |
8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
909 |
$ f --size .hg/cache/rbc-names-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
910 |
.hg/cache/rbc-names-v1: size=84 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
911 |
$ grep "i-will-regret-this" .hg/cache/rbc-names-* > /dev/null |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
912 |
[1] |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
913 |
$ f --size .hg/cache/rbc-revs-* |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
914 |
.hg/cache/rbc-revs-v1: size=152 |
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
915 |
|
29603
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
916 |
Test that cache files are created and grows correctly: |
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
917 |
|
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
918 |
$ rm .hg/cache/rbc* |
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
919 |
$ hg log -r "5 & branch(5)" -T "{rev}\n" |
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
920 |
5 |
51531
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
921 |
|
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
922 |
(here v3 is querying branch info for heads so it warm much more of the cache) |
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
923 |
|
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
924 |
#if v2 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
925 |
$ f --size .hg/cache/rbc-* |
29603
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
926 |
.hg/cache/rbc-names-v1: size=1 |
51375
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
927 |
.hg/cache/rbc-revs-v1: size=48 |
51531
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
928 |
#else |
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
929 |
$ f --size .hg/cache/rbc-* |
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
930 |
.hg/cache/rbc-names-v1: size=84 |
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
931 |
.hg/cache/rbc-revs-v1: size=152 |
f85f23f1479b
branchcache: skip entries that are topological heads in the on disk file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51530
diff
changeset
|
932 |
#endif |
29603
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
933 |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16612
diff
changeset
|
934 |
$ cd .. |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
935 |
|
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
936 |
Test for multiple incorrect branch cache entries: |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
937 |
|
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
938 |
$ hg init b |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
939 |
$ cd b |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
940 |
$ touch f |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
941 |
$ hg ci -Aqmf |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
942 |
$ echo >> f |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
943 |
$ hg ci -Amf |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
944 |
$ hg branch -q branch |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
945 |
$ hg ci -Amf |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
946 |
|
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
947 |
#if v2 |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
948 |
|
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
949 |
$ f --size --sha256 .hg/cache/rbc-* |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
950 |
.hg/cache/rbc-names-v1: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
951 |
.hg/cache/rbc-revs-v1: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779 |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
952 |
|
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
953 |
$ : > .hg/cache/rbc-revs-v1 |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
954 |
|
29615
a2a380e2750f
rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount
Mads Kiilerich <madski@unity3d.com>
parents:
29614
diff
changeset
|
955 |
No superfluous rebuilding of cache: |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
956 |
$ hg log -r "branch(null)&branch(branch)" --debug |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
957 |
$ f --size --sha256 .hg/cache/rbc-* |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
958 |
.hg/cache/rbc-names-v1: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
959 |
.hg/cache/rbc-revs-v1: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779 |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
960 |
#endif |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
961 |
|
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
962 |
$ cd .. |
42201
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
963 |
|
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
964 |
Test to make sure that `--close-branch` only works on a branch head: |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
965 |
-------------------------------------------------------------------- |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
966 |
$ hg init closebranch |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
967 |
$ cd closebranch |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
968 |
$ for ch in a b c; do |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
969 |
> echo $ch > $ch |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
970 |
> hg add $ch |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
971 |
> hg ci -m "added "$ch |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
972 |
> done; |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
973 |
|
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
974 |
$ hg up -r "desc('added b')" |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
975 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
976 |
|
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
977 |
trying to close branch from a cset which is not a branch head |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
978 |
it should abort: |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
979 |
$ hg ci -m "closing branch" --close-branch |
42202
8d14d91584f1
branch: abort if closing branch from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42201
diff
changeset
|
980 |
abort: can only close branch heads |
42542
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
981 |
(use --force-close-branch to close branch from a non-head changeset) |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
42542
diff
changeset
|
982 |
[10] |
42201
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
983 |
|
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
984 |
$ hg up 0 |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
985 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
986 |
$ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" |
42202
8d14d91584f1
branch: abort if closing branch from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42201
diff
changeset
|
987 |
o 2: 155349b645be added c |
42201
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
988 |
| default |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
989 |
| |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
990 |
o 1: 5f6d8a4bf34a added b |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
991 |
| default |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
992 |
| |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
993 |
@ 0: 9092f1db7931 added a |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
994 |
default |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
995 |
|
42542
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
996 |
Test --force-close-branch to close a branch from a non-head changeset: |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
997 |
--------------------------------------------------------------------- |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
998 |
|
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
999 |
$ hg show stack --config extensions.show= |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1000 |
o 1553 added c |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1001 |
o 5f6d added b |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1002 |
@ 9092 added a |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1003 |
|
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1004 |
$ hg ci -m "branch closed" --close-branch |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1005 |
abort: can only close branch heads |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1006 |
(use --force-close-branch to close branch from a non-head changeset) |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
42542
diff
changeset
|
1007 |
[10] |
42542
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1008 |
|
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1009 |
$ hg ci -m "branch closed" --force-close-branch |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1010 |
created new head |
46254
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1011 |
$ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1012 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1013 |
Test various special cases for the branchmap |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1014 |
-------------------------------------------- |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1015 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1016 |
Basic fork of the same branch |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1017 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1018 |
$ hg init branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1019 |
$ cd branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1020 |
$ hg debugbuild '@A . :base . :p1 *base /p1' |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1021 |
$ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1022 |
o changeset: 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1023 |
|\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1024 |
| | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1025 |
| | parent: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1026 |
| | parent: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1027 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1028 |
| | date: Thu Jan 01 00:00:03 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1029 |
| | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1030 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1031 |
| o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1032 |
| | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1033 |
| | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1034 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1035 |
| | date: Thu Jan 01 00:00:02 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1036 |
| | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1037 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1038 |
o | changeset: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1039 |
|/ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1040 |
| tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1041 |
| user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1042 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1043 |
| summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1044 |
| |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1045 |
o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1046 |
branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1047 |
tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1048 |
user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1049 |
date: Thu Jan 01 00:00:00 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1050 |
summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1051 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1052 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1053 |
A 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1054 |
$ hg clone -r 1 -r 2 . ../branchmap-testing1-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1055 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1056 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1057 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1058 |
added 3 changesets with 0 changes to 0 files (+1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1059 |
new changesets 2ab8003a1750:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1060 |
updating to branch A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1061 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1062 |
$ cd ../branchmap-testing1-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1063 |
$ hg pull ../branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1064 |
pulling from ../branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1065 |
searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1066 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1067 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1068 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1069 |
added 1 changesets with 0 changes to 0 files (-1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1070 |
new changesets 71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1071 |
(run 'hg update' to get a working copy) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1072 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1073 |
A 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1074 |
$ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1075 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1076 |
Switching to a different branch and back |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1077 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1078 |
$ hg init branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1079 |
$ cd branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1080 |
$ hg debugbuild '@A . @B . @A .' |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1081 |
$ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1082 |
o changeset: 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1083 |
| branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1084 |
| tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1085 |
| user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1086 |
| date: Thu Jan 01 00:00:02 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1087 |
| summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1088 |
| |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1089 |
o changeset: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1090 |
| branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1091 |
| user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1092 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1093 |
| summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1094 |
| |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1095 |
o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1096 |
branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1097 |
user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1098 |
date: Thu Jan 01 00:00:00 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1099 |
summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1100 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1101 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1102 |
A 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1103 |
B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1104 |
$ hg clone -r 1 . ../branchmap-testing2-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1105 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1106 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1107 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1108 |
added 2 changesets with 0 changes to 0 files |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1109 |
new changesets 2ab8003a1750:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1110 |
updating to branch B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1111 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1112 |
$ cd ../branchmap-testing2-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1113 |
$ hg pull ../branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1114 |
pulling from ../branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1115 |
searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1116 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1117 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1118 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1119 |
added 1 changesets with 0 changes to 0 files |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1120 |
new changesets 9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1121 |
(run 'hg update' to get a working copy) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1122 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1123 |
A 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1124 |
B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1125 |
$ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1126 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1127 |
A fork on a branch switching to a different branch and back |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1128 |
is still collecting the fork. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1129 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1130 |
$ hg init branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1131 |
$ cd branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1132 |
$ hg debugbuild '@A . :base . :p1 *base @B . @A /p1' |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1133 |
$ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1134 |
o changeset: 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1135 |
|\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1136 |
| | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1137 |
| | parent: 3:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1138 |
| | parent: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1139 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1140 |
| | date: Thu Jan 01 00:00:04 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1141 |
| | summary: r4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1142 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1143 |
| o changeset: 3:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1144 |
| | branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1145 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1146 |
| | date: Thu Jan 01 00:00:03 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1147 |
| | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1148 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1149 |
| o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1150 |
| | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1151 |
| | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1152 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1153 |
| | date: Thu Jan 01 00:00:02 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1154 |
| | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1155 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1156 |
o | changeset: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1157 |
|/ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1158 |
| tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1159 |
| user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1160 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1161 |
| summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1162 |
| |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1163 |
o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1164 |
branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1165 |
tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1166 |
user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1167 |
date: Thu Jan 01 00:00:00 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1168 |
summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1169 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1170 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1171 |
A 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1172 |
B 3:e9c8abcf65aa (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1173 |
$ hg clone -r 1 -r 3 . ../branchmap-testing3-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1174 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1175 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1176 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1177 |
added 4 changesets with 0 changes to 0 files (+1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1178 |
new changesets 2ab8003a1750:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1179 |
updating to branch A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1180 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1181 |
$ cd ../branchmap-testing3-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1182 |
$ hg pull ../branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1183 |
pulling from ../branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1184 |
searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1185 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1186 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1187 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1188 |
added 1 changesets with 0 changes to 0 files (-1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1189 |
new changesets 3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1190 |
(run 'hg update' to get a working copy) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1191 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1192 |
A 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1193 |
B 3:e9c8abcf65aa (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1194 |
$ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1195 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1196 |
Intermediary parents are on different branches. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1197 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1198 |
$ hg init branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1199 |
$ cd branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1200 |
$ hg debugbuild '@A . @B :base . @A :p1 *base @C . @A /p1' |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1201 |
$ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1202 |
o changeset: 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1203 |
|\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1204 |
| | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1205 |
| | parent: 3:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1206 |
| | parent: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1207 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1208 |
| | date: Thu Jan 01 00:00:04 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1209 |
| | summary: r4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1210 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1211 |
| o changeset: 3:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1212 |
| | branch: C |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1213 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1214 |
| | date: Thu Jan 01 00:00:03 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1215 |
| | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1216 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1217 |
| o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1218 |
| | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1219 |
| | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1220 |
| | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1221 |
| | date: Thu Jan 01 00:00:02 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1222 |
| | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1223 |
| | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1224 |
o | changeset: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1225 |
|/ branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1226 |
| tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1227 |
| user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1228 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1229 |
| summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1230 |
| |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1231 |
o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1232 |
branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1233 |
tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1234 |
user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1235 |
date: Thu Jan 01 00:00:00 1970 +0000 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1236 |
summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1237 |
|
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1238 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1239 |
A 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1240 |
C 3:4a546028fa8f (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1241 |
B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1242 |
$ hg clone -r 1 -r 3 . ../branchmap-testing4-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1243 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1244 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1245 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1246 |
added 4 changesets with 0 changes to 0 files (+1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1247 |
new changesets 2ab8003a1750:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1248 |
updating to branch B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1249 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1250 |
$ cd ../branchmap-testing4-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1251 |
$ hg pull ../branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1252 |
pulling from ../branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1253 |
searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1254 |
adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1255 |
adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1256 |
adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1257 |
added 1 changesets with 0 changes to 0 files (-1 heads) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1258 |
new changesets 4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1259 |
(run 'hg update' to get a working copy) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1260 |
$ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1261 |
A 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1262 |
C 3:4a546028fa8f (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1263 |
B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1264 |
$ cd .. |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1265 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1266 |
Check that the cache are not written too early |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1267 |
---------------------------------------------- |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1268 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1269 |
$ hg log -R branchmap-testing1 -G |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1270 |
o changeset: 3:71ca9a6d524e |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1271 |
|\ branch: A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1272 |
| | tag: tip |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1273 |
| | parent: 2:a3b807b3ff0b |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1274 |
| | parent: 1:99ba08759bc7 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1275 |
| | user: debugbuilddag |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1276 |
| | date: Thu Jan 01 00:00:03 1970 +0000 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1277 |
| | summary: r3 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1278 |
| | |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1279 |
| o changeset: 2:a3b807b3ff0b |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1280 |
| | branch: A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1281 |
| | parent: 0:2ab8003a1750 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1282 |
| | user: debugbuilddag |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1283 |
| | date: Thu Jan 01 00:00:02 1970 +0000 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1284 |
| | summary: r2 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1285 |
| | |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1286 |
o | changeset: 1:99ba08759bc7 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1287 |
|/ branch: A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1288 |
| tag: p1 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1289 |
| user: debugbuilddag |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1290 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1291 |
| summary: r1 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1292 |
| |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1293 |
o changeset: 0:2ab8003a1750 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1294 |
branch: A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1295 |
tag: base |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1296 |
user: debugbuilddag |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1297 |
date: Thu Jan 01 00:00:00 1970 +0000 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1298 |
summary: r0 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1299 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1300 |
$ hg bundle -R branchmap-testing1 --base 1 bundle.hg --rev 'head()' |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1301 |
2 changesets found |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1302 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1303 |
Unbundling revision should warm the served cache |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1304 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1305 |
$ hg clone branchmap-testing1 --rev 1 branchmap-update-01 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1306 |
adding changesets |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1307 |
adding manifests |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1308 |
adding file changes |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1309 |
added 2 changesets with 0 changes to 0 files |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1310 |
new changesets 2ab8003a1750:99ba08759bc7 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1311 |
updating to branch A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1312 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1313 |
#if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1314 |
$ cat branchmap-update-01/.hg/cache/branch3-exp-base |
51536
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1315 |
tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1316 |
A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1317 |
#else |
51492
2e8a88e5809f
branchcache: stop writing more branchcache file on disk than needed
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51375
diff
changeset
|
1318 |
$ cat branchmap-update-01/.hg/cache/branch2-base |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1319 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1320 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1321 |
#endif |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1322 |
$ hg -R branchmap-update-01 unbundle bundle.hg |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1323 |
adding changesets |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1324 |
adding manifests |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1325 |
adding file changes |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1326 |
added 2 changesets with 0 changes to 0 files |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1327 |
new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1328 |
(run 'hg update' to get a working copy) |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1329 |
#if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1330 |
$ cat branchmap-update-01/.hg/cache/branch3-exp-served |
51536
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1331 |
tip-node=71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 tip-rev=3 topo-mode=pure |
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1332 |
A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1333 |
#else |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1334 |
$ cat branchmap-update-01/.hg/cache/branch2-served |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1335 |
71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1336 |
71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1337 |
#endif |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1338 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1339 |
aborted Unbundle should not update the on disk cache |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1340 |
|
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1341 |
$ cat >> simplehook.py << EOF |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1342 |
> import sys |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1343 |
> from mercurial import node |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1344 |
> from mercurial import branchmap |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1345 |
> def hook(ui, repo, *args, **kwargs): |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1346 |
> s = repo.filtered(b"served") |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1347 |
> s.branchmap() |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1348 |
> return 1 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1349 |
> EOF |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1350 |
$ hg clone branchmap-testing1 --rev 1 branchmap-update-02 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1351 |
adding changesets |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1352 |
adding manifests |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1353 |
adding file changes |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1354 |
added 2 changesets with 0 changes to 0 files |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1355 |
new changesets 2ab8003a1750:99ba08759bc7 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1356 |
updating to branch A |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1357 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1358 |
|
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1359 |
#if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1360 |
$ cat branchmap-update-02/.hg/cache/branch3-exp-base |
51536
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1361 |
tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1362 |
A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1363 |
#else |
51492
2e8a88e5809f
branchcache: stop writing more branchcache file on disk than needed
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51375
diff
changeset
|
1364 |
$ cat branchmap-update-02/.hg/cache/branch2-base |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1365 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1366 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1367 |
#endif |
48675
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1368 |
$ hg -R branchmap-update-02 unbundle bundle.hg --config "hooks.pretxnclose=python:$TESTTMP/simplehook.py:hook" |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1369 |
adding changesets |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1370 |
adding manifests |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1371 |
adding file changes |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1372 |
transaction abort! |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1373 |
rollback completed |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1374 |
abort: pretxnclose hook failed |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1375 |
[40] |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1376 |
#if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1377 |
$ cat branchmap-update-02/.hg/cache/branch3-exp-base |
51536
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1378 |
tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure |
718f28ea3af4
branchcache: add a "pure topological head" fast path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51531
diff
changeset
|
1379 |
A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1380 |
#else |
51492
2e8a88e5809f
branchcache: stop writing more branchcache file on disk than needed
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51375
diff
changeset
|
1381 |
$ cat branchmap-update-02/.hg/cache/branch2-base |
48677
8e5effbf52d0
branchmap: stop writing cache for uncommitted data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48675
diff
changeset
|
1382 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
8e5effbf52d0
branchmap: stop writing cache for uncommitted data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48675
diff
changeset
|
1383 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1384 |
#endif |