Mercurial > hg
annotate tests/test-log-bookmark.t @ 48393:1a8a70b4b0ad
dirstate: cleanup remaining of "now" during write
Since the whole `need_delay` have been removed, we no longer need this.
Differential Revision: https://phab.mercurial-scm.org/D11797
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 19 Nov 2021 03:03:01 +0100 |
parents | 8c4881c07f57 |
children |
rev | line source |
---|---|
45900
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
1 Test 'hg log' with a bookmark |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
2 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
3 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
4 Create the repository |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
5 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
6 $ hg init Test-D8973 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
7 $ cd Test-D8973 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
8 $ echo "bar" > foo.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
9 $ hg add foo.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
10 $ hg commit -m "Add foo in 'default'" |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
11 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
12 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
13 Add a bookmark for topic X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
14 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
15 $ hg branch -f sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
16 marked working directory as branch sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
17 (branches are permanent and global, did you want a bookmark?) |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
18 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
19 $ hg bookmark sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
20 $ hg up sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
21 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
22 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
23 $ echo "X" > x.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
24 $ hg add x.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
25 $ hg commit -m "Add x.txt in 'sebhtml/99991-topic-X'" |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
26 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
27 $ hg log -B sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
28 changeset: 1:29f39dea9bf9 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
29 branch: sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
30 bookmark: sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
31 tag: tip |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
32 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
33 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
34 summary: Add x.txt in 'sebhtml/99991-topic-X' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
35 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
36 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
37 Add a bookmark for topic Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
38 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
39 $ hg update default |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
41 (leaving bookmark sebhtml/99991-topic-X) |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
42 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
43 $ echo "Y" > y.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
44 $ hg add y.txt |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
45 $ hg branch -f sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
46 marked working directory as branch sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
47 $ hg bookmark sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
48 $ hg up sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
50 $ hg commit -m "Add y.txt in 'sebhtml/99992-topic-Y'" |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
51 created new head |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
52 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
53 $ hg log -B sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
54 changeset: 2:11df7969cf8d |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
55 branch: sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
56 bookmark: sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
57 tag: tip |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
58 parent: 0:eaea25376a59 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
59 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
60 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
61 summary: Add y.txt in 'sebhtml/99992-topic-Y' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
62 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
63 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
64 The log of topic Y does not interfere with the log of topic X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
65 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
66 $ hg log -B sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
67 changeset: 1:29f39dea9bf9 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
68 branch: sebhtml |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
69 bookmark: sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
70 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
71 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
72 summary: Add x.txt in 'sebhtml/99991-topic-X' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
73 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
74 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
75 Merge topics Y and X in the default branch |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
76 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
77 $ hg update default |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
78 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
79 (leaving bookmark sebhtml/99992-topic-Y) |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
80 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
81 $ hg bookmark |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
82 sebhtml/99991-topic-X 1:29f39dea9bf9 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
83 sebhtml/99992-topic-Y 2:11df7969cf8d |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
84 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
85 $ hg merge sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
87 (branch merge, don't forget to commit) |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
88 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
89 $ hg commit -m "Merge branch 'sebhtml/99992-topic-Y' into 'default'" |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
90 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
91 $ hg update default |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
92 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
93 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
94 $ hg merge sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
96 (branch merge, don't forget to commit) |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
97 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
98 $ hg commit -m "Merge branch 'sebhtml/99991-topic-X' into 'default'" |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
99 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
100 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
101 Check the log of topic X, topic Y, and default branch |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
102 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
103 $ hg log -B sebhtml/99992-topic-Y |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
104 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
105 $ hg log -B sebhtml/99991-topic-X |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
106 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
107 $ hg log -b default |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
108 changeset: 4:c26ba8c1e1cb |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
109 tag: tip |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
110 parent: 3:2189f3fb90d6 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
111 parent: 1:29f39dea9bf9 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
112 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
113 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
114 summary: Merge branch 'sebhtml/99991-topic-X' into 'default' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
115 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
116 changeset: 3:2189f3fb90d6 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
117 parent: 0:eaea25376a59 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
118 parent: 2:11df7969cf8d |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
119 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
120 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
121 summary: Merge branch 'sebhtml/99992-topic-Y' into 'default' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
122 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
123 changeset: 0:eaea25376a59 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
124 user: test |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
125 date: Thu Jan 01 00:00:00 1970 +0000 |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
126 summary: Add foo in 'default' |
0aa118f18d4b
log: add bookmark option to "hg log"
Sebastien Boisvert <sebhtml@protonmail.com>
parents:
diff
changeset
|
127 |
46041
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
128 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
129 Set up multiple bookmarked heads: |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
130 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
131 $ hg bookmark merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
132 $ hg up 1 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
133 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
134 (leaving bookmark merged-head) |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
135 $ echo "Z" > z.txt |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
136 $ hg ci -Am 'Add Z' |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
137 adding z.txt |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
138 $ hg bookmark topic-Z |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
139 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
140 $ hg log -GT '{rev}: {branch}, {bookmarks}\n' |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
141 @ 5: sebhtml, topic-Z |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
142 | |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
143 | o 4: default, merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
144 |/| |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
145 | o 3: default, |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
146 | |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
147 | | o 2: sebhtml, sebhtml/99992-topic-Y |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
148 | |/ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
149 o | 1: sebhtml, sebhtml/99991-topic-X |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
150 |/ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
151 o 0: default, |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
152 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
153 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
154 Multiple revisions under bookmarked head: |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
155 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
156 $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
157 o 4: default, merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
158 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
159 | ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
160 o 3: default, |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
161 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
162 ~ ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
163 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
164 Follows multiple bookmarks: |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
165 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
166 $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head -B topic-Z |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
167 @ 5: sebhtml, topic-Z |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
168 | |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
169 ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
170 o 4: default, merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
171 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
172 | ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
173 o 3: default, |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
174 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
175 ~ ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
176 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
177 Filter by bookmark and branch: |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
178 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
179 $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head -B topic-Z -b default |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
180 o 4: default, merged-head |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
181 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
182 | ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
183 o 3: default, |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
184 |\ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
185 ~ ~ |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
186 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
187 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
188 Unknown bookmark: |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
189 |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
190 $ hg log -B unknown |
9c0db3671008
log: do not override other filtering and sorting options by --bookmark
Yuya Nishihara <yuya@tcha.org>
parents:
45900
diff
changeset
|
191 abort: bookmark 'unknown' does not exist |
48368
8c4881c07f57
errors: use detailed exit code for RepoLookupError
Martin von Zweigbergk <martinvonz@google.com>
parents:
46042
diff
changeset
|
192 [10] |
46042
1bf2b44c4007
log: do not accept string-matcher pattern as -u/-b/-B parameter
Yuya Nishihara <yuya@tcha.org>
parents:
46041
diff
changeset
|
193 |
1bf2b44c4007
log: do not accept string-matcher pattern as -u/-b/-B parameter
Yuya Nishihara <yuya@tcha.org>
parents:
46041
diff
changeset
|
194 Shouldn't accept string-matcher syntax: |
1bf2b44c4007
log: do not accept string-matcher pattern as -u/-b/-B parameter
Yuya Nishihara <yuya@tcha.org>
parents:
46041
diff
changeset
|
195 |
1bf2b44c4007
log: do not accept string-matcher pattern as -u/-b/-B parameter
Yuya Nishihara <yuya@tcha.org>
parents:
46041
diff
changeset
|
196 $ hg log -B 're:.*' |
1bf2b44c4007
log: do not accept string-matcher pattern as -u/-b/-B parameter
Yuya Nishihara <yuya@tcha.org>
parents:
46041
diff
changeset
|
197 abort: bookmark 're:.*' does not exist |
48368
8c4881c07f57
errors: use detailed exit code for RepoLookupError
Martin von Zweigbergk <martinvonz@google.com>
parents:
46042
diff
changeset
|
198 [10] |