Mercurial > hg
annotate tests/test-branches.t @ 52316:a820a7a1fce0 default tip
setup: require TLS 1.2 support from the Python interpreter (BC)
Before it was optional, and either 1.1 or 1.2 was sufficient. Now that the
default minimum is 1.2, it needs to be present to work out of the box.
The code here is more convoluted than the corresponding checks in `sslutil.py`,
but I'm leaving it alone because it can all be simplified when py38 is dropped.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 21 Nov 2024 11:46:10 -0500 |
parents | 1bebe07bfd40 |
children |
rev | line source |
---|---|
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 |
52116
c424df1248a3
tests: actually test the non-mmap case in `test-branches.t`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51975
diff
changeset
|
9 #else |
c424df1248a3
tests: actually test the non-mmap case in `test-branches.t`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51975
diff
changeset
|
10 $ cat <<EOF >> $HGRCPATH |
c424df1248a3
tests: actually test the non-mmap case in `test-branches.t`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51975
diff
changeset
|
11 > [storage] |
c424df1248a3
tests: actually test the non-mmap case in `test-branches.t`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51975
diff
changeset
|
12 > revbranchcache.mmap=false |
c424df1248a3
tests: actually test the non-mmap case in `test-branches.t`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51975
diff
changeset
|
13 > EOF |
51375
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
14 #endif |
02e7d79edf62
branchmap: use mmap for faster revbranchcache loading
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49968
diff
changeset
|
15 |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
16 #if v3 |
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=yes |
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 #else |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
22 $ cat <<EOF >> $HGRCPATH |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
23 > [experimental] |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
24 > branch-cache-v3=no |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
25 > EOF |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
26 #endif |
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
27 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
28 $ hg init a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
29 $ cd a |
31454
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
30 |
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
31 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
|
32 $ hg log -r 'branch(.)' -T '{branch}\n' |
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
33 |
a5bad127128d
branchmap: handle nullrev in setcachedata
Durham Goode <durham@fb.com>
parents:
31173
diff
changeset
|
34 Basic test |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
35 $ echo 'root' >root |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
36 $ hg add root |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
37 $ 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
|
38 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
39 $ echo 'a' >a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
40 $ hg add a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
41 $ hg branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
42 marked working directory as branch a |
15615 | 43 (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
|
44 $ hg commit -d '1 0' -m "Adding a branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
45 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
46 $ hg branch q |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
47 marked working directory as branch q |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
48 $ echo 'aa' >a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
49 $ hg branch -C |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
50 reset working directory to branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
51 $ 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
|
52 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
53 $ hg update -C 0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
54 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
|
55 $ echo 'b' >b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
56 $ hg add b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
57 $ hg branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
58 marked working directory as branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
59 $ hg commit -d '2 0' -m "Adding b branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
60 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
61 $ echo 'bh1' >bh1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
62 $ hg add bh1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
63 $ 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
|
64 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
65 $ hg update -C 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
66 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
|
67 $ echo 'bh2' >bh2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
68 $ hg add bh2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
69 $ 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
|
70 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
71 $ echo 'c' >c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
72 $ hg add c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
73 $ hg branch c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
74 marked working directory as branch c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
75 $ hg commit -d '5 0' -m "Adding c branch" |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
76 |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
77 reserved names |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
78 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
79 $ hg branch tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
80 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
|
81 [10] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
82 $ hg branch null |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
83 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
|
84 [10] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
85 $ hg branch . |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
86 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
|
87 [10] |
7006
92d44ec32430
branch: added more support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6815
diff
changeset
|
88 |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
89 invalid characters |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
90 |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
91 $ hg branch 'foo:bar' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17821
diff
changeset
|
92 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
|
93 [10] |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
94 |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
95 $ hg branch 'foo |
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
96 > bar' |
17850
71c1513fd560
scmutil: generalize message to make it more i18n-friendly
Wagner Bruna <wbruna@yahoo.com>
parents:
17821
diff
changeset
|
97 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
|
98 [10] |
17821
361ab1e2086f
scmutil: add bad character checking to checknewlabel
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
99 |
19180
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
100 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
|
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 |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
107 $ hg branch ' b' |
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
108 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
|
109 (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
|
110 [10] |
19180
12dbdd348bb0
branch: strip whitespace before testing known branch name
Yuya Nishihara <yuya@tcha.org>
parents:
18955
diff
changeset
|
111 |
49968
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
112 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
|
113 |
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
114 $ hg branch 2700_210 |
566f7dd563c1
scmutil: make checknewlabel() allow "_" in otherwise numeric names (issue6737)
Anton Shestakov <av6@dwimlabs.net>
parents:
49618
diff
changeset
|
115 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
|
116 |
17984
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
117 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
|
118 |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
119 $ 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
|
120 $ 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
|
121 $ 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
|
122 adding changesets |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
123 adding manifests |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
124 adding file changes |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
125 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
|
126 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
|
127 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
|
128 |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
129 $ 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
|
130 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
|
131 $ cd .. |
b74361cf7c0a
update: allow update to existing branches with invalid names (issue3710)
Tim Henigan <tim.henigan@gmail.com>
parents:
17850
diff
changeset
|
132 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
133 $ echo 'd' >d |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
134 $ hg add d |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
135 $ 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
|
136 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
|
137 $ 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
|
138 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
139 $ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
140 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
|
141 b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
142 c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
143 a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
144 default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
145 |
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 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
148 $ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
149 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
|
150 b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
151 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
152 --- 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
|
153 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
154 $ hg log -b a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
155 changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
156 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
157 parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
158 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
159 date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
160 summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
161 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
162 changeset: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
163 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
164 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
165 date: Thu Jan 01 00:00:02 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
166 summary: Adding to a branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
167 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
168 changeset: 1:dd6b440dd85a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
169 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
170 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
171 date: Thu Jan 01 00:00:01 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
172 summary: Adding a branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
173 |
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
|
174 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
175 ---- 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
|
176 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
177 $ hg log -b b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
178 changeset: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
179 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
180 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
181 date: Thu Jan 01 00:00:03 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
182 summary: Adding b branch head 1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
183 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
184 changeset: 3:ac22033332d1 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
185 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
186 parent: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
187 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
188 date: Thu Jan 01 00:00:02 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
189 summary: Adding b branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
190 |
10417
58e040c51231
branch: avoid using reserved tag names
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
8991
diff
changeset
|
191 |
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
|
192 ---- 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
|
193 $ 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
|
194 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
|
195 $ 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
|
196 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
|
197 --- 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
|
198 $ 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
|
199 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
|
200 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
|
201 $ 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
|
202 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
|
203 a |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
204 ---- going to test branch closing |
6631
a2b13cac0922
Active branches fix (issue1104)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6067
diff
changeset
|
205 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
206 $ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
207 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
|
208 b 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
209 c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
210 a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
211 default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
212 $ hg up -C b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
213 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
|
214 $ echo 'xxx1' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
215 $ 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
|
216 $ hg up -C aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
217 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
|
218 $ echo 'xxx2' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
219 $ 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
|
220 created new head |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
221 $ echo 'xxx3' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
222 $ 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
|
223 $ hg branches |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
224 b 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
225 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
|
226 c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
227 a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
228 default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
229 $ hg heads --closed |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
230 changeset: 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
231 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
232 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
233 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
234 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
235 summary: adding another cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
236 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
237 changeset: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
238 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
239 parent: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
240 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
241 date: Thu Jan 01 00:00:07 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
242 summary: adding cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
243 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
244 changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
245 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
|
246 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
247 date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
248 summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
249 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
250 changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
251 branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
252 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
253 date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
254 summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
255 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
256 changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
257 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
258 parent: 2:881fe2b92ad0 |
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:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
261 summary: Adding b branch head 2 |
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 changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
264 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
265 date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
266 summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
267 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
268 $ hg heads |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
269 changeset: 10:bfbe841b666e |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
270 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
271 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
272 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
273 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
274 summary: adding another cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
275 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
276 changeset: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
277 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
278 parent: 4:aee39cd168d0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
279 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
280 date: Thu Jan 01 00:00:07 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
281 summary: adding cset to branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
282 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
283 changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
284 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
|
285 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
286 date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
287 summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
288 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
289 changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
290 branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
291 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
292 date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
293 summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
294 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
295 changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
296 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
297 parent: 2:881fe2b92ad0 |
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:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
300 summary: Adding b branch head 2 |
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 changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
303 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
304 date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
305 summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
306 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
307 $ 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
|
308 $ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
309 b 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
310 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
|
311 $ hg up -C b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
312 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
|
313 $ 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
|
314 $ 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
|
315 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
|
316 [10] |
6067
57c1a7052982
Option to log to only show changesets within a specified branch.
Dustin Sallings <dustin@spy.net>
parents:
4675
diff
changeset
|
317 |
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
|
318 $ 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
|
319 $ 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
|
320 |
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 $ 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
|
322 $ 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
|
323 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
|
324 [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
|
325 $ 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
|
326 |
49617
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
327 $ echo baz > b |
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
328 $ 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
|
329 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
|
330 [10] |
49617
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
331 $ hg revert b |
7ddbb3623a07
tests: demonstrate a bug blocking a redundant branch close
Matt Harbison <matt_harbison@yahoo.com>
parents:
49320
diff
changeset
|
332 |
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
|
333 $ 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
|
334 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
|
335 $ 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
|
336 |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
337 $ hg log -r tip --debug |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
338 changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
339 branch: b |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
340 tag: tip |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
341 phase: draft |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
342 parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
343 parent: -1:0000000000000000000000000000000000000000 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
344 manifest: 8:6f9ed32d2b310e391a4f107d5f0f071df785bfee |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
345 user: test |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
346 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
|
347 extra: branch=b |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
348 extra: close=1 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
349 description: |
19305
b500a663a2c7
commit: amending with --close-branch (issue3445)
Iulian Stana <julian.stana@gmail.com>
parents:
19180
diff
changeset
|
350 close this part branch too |
18955
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
351 |
f3245f22771c
commit: allow closing "non-head" changesets
Mads Kiilerich <madski@unity3d.com>
parents:
17984
diff
changeset
|
352 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
353 --- 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
|
354 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
355 $ hg branches |
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 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
357 c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
358 a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
359 default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
360 $ hg branches -c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
361 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
|
362 b 12:e3d49c0575d8 (closed) |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
363 c 6:589736a22561 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
364 a 5:d8cbc61dbaa6 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
365 default 0:19709c5a4e75 (inactive) |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
366 $ hg branches -a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
367 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
|
368 $ hg branches -q |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
369 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
|
370 c |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
371 a |
726dd0fc7cfe
branches: quiet option observes other parameters
Travis Herrick <tthetoad@gmail.com>
parents:
15615
diff
changeset
|
372 default |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
373 $ hg heads b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
374 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
|
375 [1] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
376 $ 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
|
377 changeset: 12:e3d49c0575d8 |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
378 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
379 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
380 parent: 8:eebb944467c9 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
381 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
382 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
383 summary: close this part branch too |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
384 |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
385 changeset: 11:d3f163457ebf |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
386 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
387 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
388 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
389 summary: prune bad branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
390 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
391 $ echo 'xxx4' >> b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
392 $ 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
|
393 reopening closed branch head 12 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
394 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
395 --- branch b is back in action |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
396 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
397 $ 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
|
398 b 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
399 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
|
400 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
401 ---- test heads listings |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
402 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
403 $ 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
|
404 changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
405 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
406 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
407 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
408 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
409 summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
410 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
411 changeset: 7:10ff5895aa57 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
412 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
|
413 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
414 date: Thu Jan 01 00:00:06 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
415 summary: Adding d branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
416 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
417 changeset: 6:589736a22561 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
418 branch: c |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
419 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
420 date: Thu Jan 01 00:00:05 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
421 summary: Adding c branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
422 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
423 changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
424 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
425 parent: 2:881fe2b92ad0 |
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:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
428 summary: Adding b branch head 2 |
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 changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
431 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
432 date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
433 summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
434 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
435 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
436 branch default |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
437 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
438 $ hg heads default |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
439 changeset: 0:19709c5a4e75 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
440 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
441 date: Thu Jan 01 00:00:00 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
442 summary: Adding root node |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
443 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
444 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
445 branch a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
446 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
447 $ hg heads a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
448 changeset: 5:d8cbc61dbaa6 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
449 branch: a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
450 parent: 2:881fe2b92ad0 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
451 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
452 date: Thu Jan 01 00:00:04 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
453 summary: Adding b branch head 2 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
454 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
455 $ hg heads --active a |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
456 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
|
457 [1] |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
458 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
459 branch b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
460 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
461 $ 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
|
462 changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
463 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
464 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
465 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
466 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
467 summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
468 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
469 $ 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
|
470 changeset: 13:e23b5505d1ad |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
471 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
472 tag: tip |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
473 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
474 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
475 summary: reopen branch with a change |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
476 |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13987
diff
changeset
|
477 changeset: 11:d3f163457ebf |
11868
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
478 branch: b |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
479 user: test |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
480 date: Thu Jan 01 00:00:09 1970 +0000 |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
481 summary: prune bad branch |
062052b0d737
tests: unify test-branches
Martin Geisler <mg@lazybytes.net>
parents:
10417
diff
changeset
|
482 |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
483 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
484 reclose branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
485 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
486 $ hg up -C c |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
487 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
|
488 $ 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
|
489 $ hg branches |
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 a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
493 default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
494 $ hg branches --closed |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
495 b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
496 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
|
497 c 14:f894c25619d3 (closed) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
498 a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
499 default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
500 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
501 multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
502 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
503 $ hg up -C default |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
504 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
|
505 $ hg branch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
506 marked working directory as branch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
507 $ touch m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
508 $ hg add m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
509 $ hg commit -d '10 0' -m 'multihead base' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
510 $ echo "m1" >m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
511 $ hg commit -d '10 0' -m 'head 1' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
512 $ hg up -C '.^' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
513 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
|
514 $ echo "m2" >m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
515 $ hg commit -d '10 0' -m 'head 2' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
516 created new head |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
517 $ hg log -b m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
518 changeset: 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
519 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
520 tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
521 parent: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
522 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
523 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
524 summary: head 2 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
525 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
526 changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
527 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
528 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
529 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
530 summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
531 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
532 changeset: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
533 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
534 parent: 0:19709c5a4e75 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
535 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
536 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
537 summary: multihead base |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
538 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
539 $ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
540 changeset: 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
541 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
542 tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
543 parent: 15:f3447637f53e |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
544 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
545 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
546 summary: head 2 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
547 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
548 changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
549 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
550 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
551 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
552 summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
553 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
554 $ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
555 m 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
556 b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
557 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
|
558 a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
559 default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
560 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
561 partially merge multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
562 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
563 $ hg up -C default |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
564 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
|
565 $ hg branch md |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
566 marked working directory as branch md |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
567 $ hg merge m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
568 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
|
569 (branch merge, don't forget to commit) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
570 $ hg commit -d '11 0' -m 'merge head 2' |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
571 $ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
572 changeset: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
573 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
574 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
575 date: Thu Jan 01 00:00:10 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
576 summary: head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
577 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
578 $ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
579 md 18:c914c99f1fbb |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
580 m 17:df343b0df04f |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
581 b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
582 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
|
583 a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
584 default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
585 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
586 partially close multihead branch |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
587 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
588 $ hg up -C a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
589 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
|
590 $ 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
|
591 $ hg heads --topo m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
592 changeset: 19:cd21a80baa3d |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
593 branch: m |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
594 tag: tip |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
595 parent: 16:a58ca5d3bdf3 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
596 user: test |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
597 date: Thu Jan 01 00:00:12 1970 +0000 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
598 summary: close head 1 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
599 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
600 $ hg branches |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
601 md 18:c914c99f1fbb |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
602 b 13:e23b5505d1ad |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
603 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
|
604 m 17:df343b0df04f (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
605 a 5:d8cbc61dbaa6 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
606 default 0:19709c5a4e75 (inactive) |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
607 |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
608 default branch colors: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
609 |
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
610 $ 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
|
611 > [extensions] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
612 > color = |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
613 > [color] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
614 > mode = ansi |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
615 > EOF |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
616 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
617 $ hg up -C b |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
618 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
|
619 $ hg branches --color=always |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
620 \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
|
621 \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
|
622 \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
|
623 \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
|
624 \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
|
625 \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
|
626 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
627 default closed branch color: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
628 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
629 $ hg branches --color=always --closed |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
630 \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
|
631 \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
|
632 \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
|
633 \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
|
634 \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
|
635 \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
|
636 \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
|
637 |
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
638 $ 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
|
639 > [extensions] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
640 > color = |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
641 > [color] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22705
diff
changeset
|
642 > 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
|
643 > 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
|
644 > 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
|
645 > 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
|
646 > 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
|
647 > EOF |
11969
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
648 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
649 custom branch colors: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
650 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
651 $ hg branches --color=always |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
652 \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
|
653 \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
|
654 \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
|
655 \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
|
656 \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
|
657 \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
|
658 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
659 custom closed branch color: |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
660 |
52ec5c813723
color: enable branches support
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
11868
diff
changeset
|
661 $ hg branches --color=always --closed |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
662 \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
|
663 \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
|
664 \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
|
665 \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
|
666 \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
|
667 \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
|
668 \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
|
669 |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
670 template output: |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
671 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
672 $ hg branches -Tjson --closed |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
673 [ |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
674 { |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
675 "active": true, |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
676 "branch": "md", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
677 "closed": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
678 "current": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
679 "node": "c914c99f1fbb2b1d785a0a939ed3f67275df18e9", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
680 "rev": 18 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
681 }, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
682 { |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
683 "active": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
684 "branch": "b", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
685 "closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
686 "current": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
687 "node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
688 "rev": 13 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
689 }, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
690 { |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
691 "active": true, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
692 "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
|
693 "closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
694 "current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
695 "node": "10ff5895aa5793bd378da574af8cec8ea408d831", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
696 "rev": 7 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
697 }, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
698 { |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
699 "active": false, |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
700 "branch": "m", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
701 "closed": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
702 "current": false, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
703 "node": "df343b0df04feb2a946cd4b6e9520e552fef14ee", |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
704 "rev": 17 |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
705 }, |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
706 { |
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
707 "active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
708 "branch": "c", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
709 "closed": true, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
710 "current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
711 "node": "f894c25619d3f1484639d81be950e0a07bc6f1f6", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
712 "rev": 14 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
713 }, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
714 { |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
715 "active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
716 "branch": "a", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
717 "closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
718 "current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
719 "node": "d8cbc61dbaa6dc817175d1e301eecb863f280832", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
720 "rev": 5 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
721 }, |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
722 { |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
723 "active": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
724 "branch": "default", |
22705
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
725 "closed": false, |
d4869b280cd6
branches: include active, closed and current flags in template output
Yuya Nishihara <yuya@tcha.org>
parents:
22704
diff
changeset
|
726 "current": false, |
22703
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
727 "node": "19709c5a4e75bf938f8e349aff97438539bb729e", |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
728 "rev": 0 |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
729 } |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
730 ] |
bd6e95cb82b4
branches: port to generic templater
Yuya Nishihara <yuya@tcha.org>
parents:
19305
diff
changeset
|
731 |
29816
034412ca28c3
templater: fix if() to not evaluate False as bool('False')
Yuya Nishihara <yuya@tcha.org>
parents:
29744
diff
changeset
|
732 $ 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
|
733 c |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
734 |
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
735 $ 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
|
736 md: merge head 2 |
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
737 b: reopen branch with a change |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
738 a: Adding d branch |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
739 m: head 2 |
31173
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
740 a: Adding b branch head 2 |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
741 default: Adding root node |
052e4f1ffce9
branches: populate all template keywords in formatter
Yuya Nishihara <yuya@tcha.org>
parents:
29816
diff
changeset
|
742 |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
743 $ cat <<'EOF' > "$TESTTMP/map-myjson" |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
744 > docheader = '\{\n' |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
745 > docfooter = '\n}\n' |
32950
5100ce217dfa
formatter: add support for separator template
Yuya Nishihara <yuya@tcha.org>
parents:
32949
diff
changeset
|
746 > separator = ',\n' |
5100ce217dfa
formatter: add support for separator template
Yuya Nishihara <yuya@tcha.org>
parents:
32949
diff
changeset
|
747 > 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
|
748 > EOF |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
749 $ hg branches -T "$TESTTMP/map-myjson" |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
750 { |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
751 {"branch": "md", "node": "c914c99f1fbb"}, |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
752 {"branch": "b", "node": "e23b5505d1ad"}, |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
753 {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
754 {"branch": "m", "node": "df343b0df04f"}, |
32949
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
755 {"branch": "a", "node": "d8cbc61dbaa6"}, |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
756 {"branch": "default", "node": "19709c5a4e75"} |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
757 } |
13eebc189ff3
formatter: add support for docheader and docfooter templates
Yuya Nishihara <yuya@tcha.org>
parents:
31454
diff
changeset
|
758 |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
759 $ cat <<'EOF' >> .hg/hgrc |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
760 > [templates] |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
761 > 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
|
762 > myjson:docheader = '\{\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
763 > myjson:docfooter = '\n}\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
764 > myjson:separator = ',\n' |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
765 > EOF |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
766 $ hg branches -T myjson |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
767 { |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
768 {"branch": "md", "node": "c914c99f1fbb"}, |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
769 {"branch": "b", "node": "e23b5505d1ad"}, |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
770 {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
771 {"branch": "m", "node": "df343b0df04f"}, |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
772 {"branch": "a", "node": "d8cbc61dbaa6"}, |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
773 {"branch": "default", "node": "19709c5a4e75"} |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
774 } |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
775 |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
776 $ cat <<'EOF' >> .hg/hgrc |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
777 > [templates] |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
778 > :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
|
779 > EOF |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
780 $ hg branches -T '{branch}\n' |
34074
abf91c4f9608
branches: correctly show inactive multiheaded branches
the31k <the31k@thethirty.one>
parents:
32952
diff
changeset
|
781 md |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
782 b |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
783 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
|
784 m |
32952
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
785 a |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
786 default |
61b60b28c381
formatter: add support for parts map of [templates] section
Yuya Nishihara <yuya@tcha.org>
parents:
32950
diff
changeset
|
787 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
788 Tests of revision branch name caching |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
789 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
790 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
|
791 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
|
792 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
|
793 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
794 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
|
795 $ 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
|
796 5 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
797 $ f --hexdump --size .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
798 .hg/cache/rbc-names-v2: size=92 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
799 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
|
800 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
|
801 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
|
802 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
|
803 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
|
804 0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 |ranches.m.md| |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
805 .hg/cache/rbc-revs-v2: size=160 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 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
|
813 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
|
814 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
|
815 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
|
816 |
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
817 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
|
818 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
819 $ echo >> .hg/cache/rbc-revs-v2 |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
820 $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v2_ |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
821 $ mkdir .hg/cache/rbc-revs-v2 |
24372
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
822 $ 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
|
823 5 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
824 $ rmdir .hg/cache/rbc-revs-v2 |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
825 $ mv .hg/cache/rbc-revs-v2_ .hg/cache/rbc-revs-v2 |
24372
577f65cf1a57
revbranchcache: add test for when the cache is not writable
Durham Goode <durham@fb.com>
parents:
23862
diff
changeset
|
826 |
29744
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
827 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
|
828 |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
829 #if unix-permissions |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
830 $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v2_ |
29744
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
831 $ 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
|
832 $ 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
|
833 $ 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
|
834 5 |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
835 $ chmod 755 .hg |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
836 $ mv .hg/cache/rbc-revs-v2_ .hg/cache/rbc-revs-v2 |
29744
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
837 #endif |
0d588332ad2c
branchmap: acquires lock before writting the rev branch cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29615
diff
changeset
|
838 |
51975
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
839 dealing with valid cache revs file but for extra trailing data |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
840 -------------------------------------------------------------- |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
841 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
842 When the trailing data are smaller than a record, they are practically |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
843 invisible to the cache and ignored. No warning is issued about them. |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
844 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
845 $ echo '42' >> .hg/cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
846 $ 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
|
847 5 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
848 $ f --size .hg/cache/rbc-revs* |
51975
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
849 .hg/cache/rbc-revs-v2: size=164 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
850 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
851 When the trailing data are larger than a record, they are seens as extra |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
852 (probably invalid) data. We warn about them when writing. |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
853 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
854 $ echo 'abracadabra!' >> .hg/cache/rbc-revs-v2 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
855 $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
856 5 |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
857 cache/rbc-revs-v2 contains 17 unknown trailing bytes |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
858 $ f --size .hg/cache/rbc-revs* |
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
859 .hg/cache/rbc-revs-v2: size=177 |
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 partial last record |
51975
76416b6e9d9b
rev-branch-cache: properly ignores unaligned trailing data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51974
diff
changeset
|
862 --------------------------------------------------------- |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
863 $ mv .hg/cache/rbc-revs-v2 . |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
864 $ f -qDB 119 rbc-revs-v2 > .hg/cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
865 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
866 .hg/cache/rbc-revs-v2: size=119 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
867 $ 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
|
868 5 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
869 resetting content of cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
870 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
871 .hg/cache/rbc-revs-v2: size=160 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
872 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
873 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
874 recovery from invalid cache file with missing record - no truncation |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
875 $ mv .hg/cache/rbc-revs-v2 . |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
876 $ f -qDB 112 rbc-revs-v2 > .hg/cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
877 $ 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
|
878 5 |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
879 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
880 .hg/cache/rbc-revs-v2: size=160 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
881 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
882 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
883 recovery from invalid cache file with some bad records |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
884 $ mv .hg/cache/rbc-revs-v2 . |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
885 $ f -qDB 8 rbc-revs-v2 > .hg/cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
886 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
887 .hg/cache/rbc-revs-v2: size=8 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
888 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
889 $ f -qDB 112 rbc-revs-v2 >> .hg/cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
890 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
891 .hg/cache/rbc-revs-v2: size=120 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
892 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
24378
9347c15d8136
revbranchcache: write cache even during read operations
Durham Goode <durham@fb.com>
parents:
24372
diff
changeset
|
893 $ 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
|
894 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
|
895 history modification detected - truncating revision branch cache to revision 1 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
896 3 4 8 9 10 11 12 13 resetting content of cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
897 $ 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
|
898 5 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
899 resetting content of cache/rbc-revs-v2 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
900 $ f --size --hexdump --bytes=16 .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
901 .hg/cache/rbc-revs-v2: size=160 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
902 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
903 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
904 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| (known-bad-output mmap windows !) |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
905 |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
906 Smoothly reuse "v1" format if no v2 exists |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
907 ------------------------------------------ |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
908 |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
909 read only operation with valid data |
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
910 (actively rewrite data) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
911 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
912 $ rm .hg/cache/rbc-names-v2 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
913 $ rm .hg/cache/rbc-revs-v2 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
914 $ rm .hg/cache/branch* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
915 $ hg head a -T '{rev}\n' --debug |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
916 5 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
917 $ mv .hg/cache/rbc-names-v2 .hg/cache/rbc-names-v1 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
918 $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v1 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
919 $ rm .hg/cache/branch* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
920 $ hg head a -T '{rev}\n' --debug |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
921 5 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
922 $ f --size .hg/cache/rbc-*-* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
923 .hg/cache/rbc-names-v1: size=92 |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
924 .hg/cache/rbc-names-v2: size=92 |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
925 .hg/cache/rbc-revs-v1: size=160 |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
926 .hg/cache/rbc-revs-v2: size=160 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
927 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
928 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
929 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
930 Write operation write a full v2 files |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
931 |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
932 $ mv .hg/cache/rbc-names-v2 .hg/cache/rbc-names-v1 |
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
933 $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v1 |
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
934 $ f --size .hg/cache/rbc-* |
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
935 .hg/cache/rbc-names-v1: size=92 |
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
936 .hg/cache/rbc-revs-v1: size=160 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
937 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
938 $ hg branch not-here-for-long |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
939 marked working directory as branch not-here-for-long |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
940 $ hg ci -m not-long --debug |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
941 reusing manifest from p1 (no file change) |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
942 committing changelog |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
943 updating the branch cache |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
944 committed changeset * (glob) |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
945 $ f --size .hg/cache/rbc-* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
946 .hg/cache/rbc-names-v1: size=92 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
947 .hg/cache/rbc-names-v2: size=110 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
948 .hg/cache/rbc-revs-v1: size=160 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
949 .hg/cache/rbc-revs-v2: size=168 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
950 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
951 |
51909
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
952 So does explicit cache upgrade |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
953 $ mv .hg/cache/rbc-names-v2 .hg/cache/rbc-names-v1 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
954 $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v1 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
955 $ f --size .hg/cache/rbc-* |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
956 .hg/cache/rbc-names-v1: size=110 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
957 .hg/cache/rbc-revs-v1: size=168 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
958 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51909
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
959 $ hg debugupdatecache |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
960 $ f --size .hg/cache/rbc-* |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
961 .hg/cache/rbc-names-v1: size=110 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
962 .hg/cache/rbc-names-v2: size=110 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
963 .hg/cache/rbc-revs-v1: size=168 |
e51161b12c7e
rev-branch-cache: have debugupdatecache warm rbc too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51908
diff
changeset
|
964 .hg/cache/rbc-revs-v2: size=168 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
965 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
966 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
967 With invalid v1 data, we rewrite it too (as v2) |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
968 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
969 $ cp .hg/cache/rbc-names-v2 .hg/cache/rbc-names-v1 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
970 $ mv .hg/cache/rbc-names-v2 .hg/cache/rbc-revs-v1 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
971 $ rm .hg/cache/rbc-revs-v2 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
972 $ rm .hg/cache/branch* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
973 $ |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
974 $ hg head a -T '{rev}\n' --debug |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
975 history modification detected - truncating revision branch cache to revision 0 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
976 5 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
977 $ f --size .hg/cache/rbc-*-* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
978 .hg/cache/rbc-names-v1: size=110 |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
979 .hg/cache/rbc-names-v2: size=110 |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
980 .hg/cache/rbc-revs-v1: size=110 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
981 .hg/cache/rbc-revs-v2: size=168 |
52118
1bebe07bfd40
tests: conditionalize undesired output on Windows for rbc the mmap cases
Matt Harbison <matt_harbison@yahoo.com>
parents:
52116
diff
changeset
|
982 .hg/cache/rbc-revs-v2-*: size=119 (glob) (known-bad-output mmap windows !) |
51907
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
983 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
984 cleanup |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
985 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
986 $ hg up -qr '.^' |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
987 $ hg rollback -qf |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
988 $ rm .hg/cache/* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
989 $ hg debugupdatecache |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
990 $ f --size .hg/cache/rbc-* |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
991 .hg/cache/rbc-names-v2: size=92 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
992 .hg/cache/rbc-revs-v2: size=160 |
bd7359c18d69
rev-branch-cache: fallback on "v1" data if no v2 is found
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51906
diff
changeset
|
993 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
994 cache is updated when committing |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
995 $ hg branch i-will-regret-this |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
996 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
|
997 $ hg ci -m regrets |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
998 $ f --size .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
999 .hg/cache/rbc-names-v2: size=111 |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1000 .hg/cache/rbc-revs-v2: size=168 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
1001 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
1002 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
|
1003 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
|
1004 $ hg up -qr '.^' |
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
1005 $ hg rollback -qf |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1006 $ f --size .hg/cache/rbc-names-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1007 .hg/cache/rbc-names-v2: size=111 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1008 $ 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
|
1009 $ f --size .hg/cache/rbc-revs-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1010 .hg/cache/rbc-revs-v2: size=168 |
51518
c7e81615b5c4
branchcache: add some blank line in a test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51508
diff
changeset
|
1011 |
23861
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
1012 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
|
1013 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
|
1014 $ hg --config extensions.strip= strip -r tip --nob |
01426cad66dc
tests: rework revision branch cache tests
Mads Kiilerich <madski@unity3d.com>
parents:
23787
diff
changeset
|
1015 $ f --size .hg/cache/rbc-revs* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1016 .hg/cache/rbc-revs-v2: size=152 |
23787
678f53865c68
revset: use localrepo revbranchcache for branch name filtering
Mads Kiilerich <madski@unity3d.com>
parents:
23172
diff
changeset
|
1017 |
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
1018 cache is rebuilt when corruption is detected |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1019 $ echo > .hg/cache/rbc-names-v2 |
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
1020 $ 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
|
1021 referenced branch names not found - rebuilding revision branch cache from scratch |
51908
16efed18ae4e
rev-branch-cache: schedule a write of the "v2" format if we read from "v1"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51907
diff
changeset
|
1022 8 9 10 11 12 13 resetting content of rbc-names-v2 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1023 $ f --size .hg/cache/rbc-names-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1024 .hg/cache/rbc-names-v2: size=84 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1025 $ 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
|
1026 [1] |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1027 $ f --size .hg/cache/rbc-revs-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1028 .hg/cache/rbc-revs-v2: size=152 |
28558
bcd106d456c4
cache: rebuild branch cache from scratch when inconsistencies are detected
Mads Kiilerich <madski@unity3d.com>
parents:
28145
diff
changeset
|
1029 |
29603
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
1030 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
|
1031 |
b181a650a886
rbc: test case for cache file not growing correctly, causing bad new entries
Mads Kiilerich <madski@unity3d.com>
parents:
28558
diff
changeset
|
1032 $ 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
|
1033 $ 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
|
1034 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
|
1035 |
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
|
1036 (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
|
1037 |
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
|
1038 #if v2 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1039 $ f --size .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1040 .hg/cache/rbc-names-v2: size=1 |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1041 .hg/cache/rbc-revs-v2: 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
|
1042 #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
|
1043 $ f --size .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1044 .hg/cache/rbc-names-v2: size=84 |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1045 .hg/cache/rbc-revs-v2: size=152 |
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
|
1046 #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
|
1047 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16612
diff
changeset
|
1048 $ cd .. |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1049 |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1050 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
|
1051 |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1052 $ 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
|
1053 $ cd b |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1054 $ touch f |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1055 $ 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
|
1056 $ echo >> f |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1057 $ 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
|
1058 $ 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
|
1059 $ 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
|
1060 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1061 #if v2 |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1062 |
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1063 $ f --size --sha256 .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1064 .hg/cache/rbc-names-v2: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1065 .hg/cache/rbc-revs-v2: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1066 |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1067 $ : > .hg/cache/rbc-revs-v2 |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1068 |
29615
a2a380e2750f
rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount
Mads Kiilerich <madski@unity3d.com>
parents:
29614
diff
changeset
|
1069 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
|
1070 $ 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
|
1071 $ f --size --sha256 .hg/cache/rbc-* |
51906
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1072 .hg/cache/rbc-names-v2: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c |
0f26ee69cf36
rev-branch-cache: increment the version to "v2"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51905
diff
changeset
|
1073 .hg/cache/rbc-revs-v2: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779 |
51530
fc710c993ec9
branchcache: simplify the branch rev cache test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51521
diff
changeset
|
1074 #endif |
29614
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1075 |
5c79bae8166f
rbc: test case for incorrect and too aggressive invalidation of invalid caches
Mads Kiilerich <madski@unity3d.com>
parents:
29604
diff
changeset
|
1076 $ 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
|
1077 |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1078 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
|
1079 -------------------------------------------------------------------- |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1080 $ 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
|
1081 $ 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
|
1082 $ 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
|
1083 > 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
|
1084 > 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
|
1085 > 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
|
1086 > 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
|
1087 |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1088 $ 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
|
1089 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
|
1090 |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1091 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
|
1092 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
|
1093 $ 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
|
1094 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
|
1095 (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
|
1096 [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
|
1097 |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1098 $ 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
|
1099 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
|
1100 $ 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
|
1101 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
|
1102 | 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
|
1103 | |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1104 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
|
1105 | 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
|
1106 | |
258821f2d465
branch: add tests which shows branch can be closed from a non-branchhead cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
41064
diff
changeset
|
1107 @ 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
|
1108 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
|
1109 |
42542
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1110 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
|
1111 --------------------------------------------------------------------- |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1112 |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1113 $ 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
|
1114 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
|
1115 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
|
1116 @ 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
|
1117 |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1118 $ 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
|
1119 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
|
1120 (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
|
1121 [10] |
42542
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1122 |
2e1d9414ff71
commit: add --force-close-branch flag to close a non-head changeset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
42493
diff
changeset
|
1123 $ 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
|
1124 created new head |
46254
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 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
|
1128 -------------------------------------------- |
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 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
|
1131 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1132 $ hg init branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1133 $ cd branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1134 $ 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
|
1135 $ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1136 o changeset: 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1137 |\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1138 | | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1139 | | parent: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1140 | | parent: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1141 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1142 | | 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
|
1143 | | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1144 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1145 | o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1146 | | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1147 | | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1148 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1149 | | 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
|
1150 | | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1151 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1152 o | changeset: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1153 |/ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1154 | tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1155 | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1156 | 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
|
1157 | summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1158 | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1159 o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1160 branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1161 tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1162 user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1163 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
|
1164 summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1165 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1166 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1167 A 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1168 $ 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
|
1169 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1170 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1171 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1172 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
|
1173 new changesets 2ab8003a1750:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1174 updating to branch A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1175 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
|
1176 $ cd ../branchmap-testing1-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1177 $ hg pull ../branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1178 pulling from ../branchmap-testing1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1179 searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1180 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1181 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1182 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1183 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
|
1184 new changesets 71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1185 (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
|
1186 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1187 A 3:71ca9a6d524e |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1188 $ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1189 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1190 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
|
1191 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1192 $ hg init branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1193 $ cd branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1194 $ 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
|
1195 $ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1196 o changeset: 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1197 | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1198 | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1199 | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1200 | 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
|
1201 | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1202 | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1203 o changeset: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1204 | branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1205 | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1206 | 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
|
1207 | summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1208 | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1209 o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1210 branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1211 user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1212 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
|
1213 summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1214 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1215 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1216 A 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1217 B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1218 $ 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
|
1219 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1220 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1221 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1222 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
|
1223 new changesets 2ab8003a1750:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1224 updating to branch B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1225 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
|
1226 $ cd ../branchmap-testing2-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1227 $ hg pull ../branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1228 pulling from ../branchmap-testing2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1229 searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1230 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1231 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1232 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1233 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
|
1234 new changesets 9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1235 (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
|
1236 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1237 A 2:9699e9f260b5 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1238 B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1239 $ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1240 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1241 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
|
1242 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
|
1243 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1244 $ hg init branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1245 $ cd branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1246 $ 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
|
1247 $ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1248 o changeset: 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1249 |\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1250 | | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1251 | | parent: 3:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1252 | | parent: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1253 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1254 | | 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
|
1255 | | summary: r4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1256 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1257 | o changeset: 3:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1258 | | branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1259 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1260 | | 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
|
1261 | | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1262 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1263 | o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1264 | | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1265 | | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1266 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1267 | | 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
|
1268 | | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1269 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1270 o | changeset: 1:99ba08759bc7 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1271 |/ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1272 | tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1273 | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1274 | 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
|
1275 | summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1276 | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1277 o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1278 branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1279 tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1280 user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1281 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
|
1282 summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1283 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1284 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1285 A 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1286 B 3:e9c8abcf65aa (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1287 $ 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
|
1288 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1289 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1290 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1291 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
|
1292 new changesets 2ab8003a1750:e9c8abcf65aa |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1293 updating to branch A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1294 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
|
1295 $ cd ../branchmap-testing3-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1296 $ hg pull ../branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1297 pulling from ../branchmap-testing3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1298 searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1299 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1300 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1301 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1302 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
|
1303 new changesets 3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1304 (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
|
1305 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1306 A 4:3614a1711d23 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1307 B 3:e9c8abcf65aa (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1308 $ cd .. |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1309 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1310 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
|
1311 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1312 $ hg init branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1313 $ cd branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1314 $ 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
|
1315 $ hg log -G |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1316 o changeset: 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1317 |\ branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1318 | | tag: tip |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1319 | | parent: 3:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1320 | | parent: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1321 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1322 | | 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
|
1323 | | summary: r4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1324 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1325 | o changeset: 3:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1326 | | branch: C |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1327 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1328 | | 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
|
1329 | | summary: r3 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1330 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1331 | o changeset: 2:a3b807b3ff0b |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1332 | | branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1333 | | parent: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1334 | | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1335 | | 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
|
1336 | | summary: r2 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1337 | | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1338 o | changeset: 1:0bc7d348d965 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1339 |/ branch: B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1340 | tag: p1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1341 | user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1342 | 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
|
1343 | summary: r1 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1344 | |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1345 o changeset: 0:2ab8003a1750 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1346 branch: A |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1347 tag: base |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1348 user: debugbuilddag |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1349 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
|
1350 summary: r0 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1351 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1352 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1353 A 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1354 C 3:4a546028fa8f (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1355 B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1356 $ 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
|
1357 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1358 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1359 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1360 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
|
1361 new changesets 2ab8003a1750:4a546028fa8f |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1362 updating to branch B |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1363 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
|
1364 $ cd ../branchmap-testing4-clone |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1365 $ hg pull ../branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1366 pulling from ../branchmap-testing4 |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1367 searching for changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1368 adding changesets |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1369 adding manifests |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1370 adding file changes |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1371 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
|
1372 new changesets 4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1373 (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
|
1374 $ hg branches |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1375 A 4:4bf67499b70a |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1376 C 3:4a546028fa8f (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1377 B 1:0bc7d348d965 (inactive) |
c4b792fa109e
branchmap: avoid ancestor computations in absence of non-continous branches
Joerg Sonnenberger <joerg@bec.de>
parents:
45845
diff
changeset
|
1378 $ 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
|
1379 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1380 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
|
1381 ---------------------------------------------- |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1382 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1383 $ 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
|
1384 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
|
1385 |\ 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
|
1386 | | 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
|
1387 | | 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
|
1388 | | 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
|
1389 | | 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
|
1390 | | 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
|
1391 | | 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
|
1392 | | |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1393 | 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
|
1394 | | 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
|
1395 | | 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
|
1396 | | 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
|
1397 | | 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
|
1398 | | 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
|
1399 | | |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1400 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
|
1401 |/ 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
|
1402 | 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
|
1403 | 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
|
1404 | 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
|
1405 | 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
|
1406 | |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1407 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
|
1408 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
|
1409 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
|
1410 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
|
1411 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
|
1412 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
|
1413 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1414 $ 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
|
1415 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
|
1416 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1417 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
|
1418 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1419 $ 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
|
1420 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
|
1421 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
|
1422 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
|
1423 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
|
1424 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
|
1425 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
|
1426 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
|
1427 #if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1428 $ 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
|
1429 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
|
1430 A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1431 #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
|
1432 $ 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
|
1433 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
|
1434 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1435 #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
|
1436 $ 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
|
1437 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
|
1438 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
|
1439 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
|
1440 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
|
1441 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
|
1442 (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
|
1443 #if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1444 $ 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
|
1445 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
|
1446 A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1447 #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
|
1448 $ 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
|
1449 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
|
1450 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1451 #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
|
1452 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1453 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
|
1454 |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1455 $ 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
|
1456 > 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
|
1457 > 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
|
1458 > 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
|
1459 > 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
|
1460 > 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
|
1461 > 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
|
1462 > 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
|
1463 > EOF |
6ed7ee9f44db
branchmap: Add a test about writing branchmap and aborted transaction
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46254
diff
changeset
|
1464 $ 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
|
1465 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
|
1466 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
|
1467 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
|
1468 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
|
1469 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
|
1470 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
|
1471 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
|
1472 |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1473 #if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1474 $ 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
|
1475 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
|
1476 A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1477 #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
|
1478 $ 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
|
1479 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
|
1480 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1481 #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
|
1482 $ 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
|
1483 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
|
1484 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
|
1485 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
|
1486 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
|
1487 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
|
1488 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
|
1489 [40] |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1490 #if v3 |
51646
f02ec1ecb3bf
branch3: use an explicitely experimental name for files
Raphaël Gomès <rgomes@octobus.net>
parents:
51536
diff
changeset
|
1491 $ 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
|
1492 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
|
1493 A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1494 #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
|
1495 $ 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
|
1496 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
8e5effbf52d0
branchmap: stop writing cache for uncommitted data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48675
diff
changeset
|
1497 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
51520
fe8347b984f3
branchcache-v3: introduce a v3 format
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51518
diff
changeset
|
1498 #endif |