Mercurial > hg
annotate tests/test-keyword.out @ 9066:11b111e9acd3
keyword: wrapped docstrings at 78 characters
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 07 Jul 2009 23:54:42 +0200 |
parents | 7672d8e13d0d |
children | 7705d184faa1 |
rev | line source |
---|---|
5816 | 1 % help |
8894
868670dbc237
extensions: improve the consistency of synopses
Cédric Duval <cedricduval@free.fr>
parents:
8825
diff
changeset
|
2 keyword extension - expand keywords in tracked files |
5816 | 3 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
4 This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
5 text files selected by your configuration. |
5816 | 6 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
7 Keywords are only expanded in local repositories and not stored in the change |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
8 history. The mechanism can be regarded as a convenience for the current user |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
9 or for archive distribution. |
5816 | 10 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
11 Configuration is done in the [keyword] and [keywordmaps] sections of hgrc |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
12 files. |
5816 | 13 |
14 Example: | |
15 | |
16 [keyword] | |
17 # expand keywords in every python file except those matching "x*" | |
18 **.py = | |
19 x* = ignore | |
20 | |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
21 Note: the more specific you are in your filename patterns the less you lose |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
22 speed in huge repositories. |
5816 | 23 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
24 For [keywordmaps] template mapping and expansion demonstration and control run |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
25 "hg kwdemo". |
5816 | 26 |
27 An additional date template filter {date|utcdate} is provided. | |
28 | |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
29 The default template mappings (view with "hg kwdemo -d") can be replaced with |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
30 customized keywords and templates. Again, run "hg kwdemo" to control the |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
31 results of your config changes. |
5816 | 32 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
33 Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
34 of inadvertently storing expanded keywords in the change history. |
5816 | 35 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
36 To force expansion after enabling it, or a configuration change, run "hg |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
37 kwexpand". |
5816 | 38 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
39 Also, when committing with the record extension or using mq's qrecord, be |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
40 aware that keywords cannot be updated. Again, run "hg kwexpand" on the files |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
41 in question to update keyword expansions after all changes have been checked |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
42 in. |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
43 |
9066
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
44 Expansions spanning more than one line and incremental expansions, like CVS' |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
45 $Log$, are not supported. A keyword template map "Log = {desc}" expands to the |
11b111e9acd3
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
46 first line of the changeset description. |
5816 | 47 |
48 list of commands: | |
49 | |
50 kwdemo print [keywordmaps] configuration and an expansion example | |
8763 | 51 kwexpand expand keywords in the working directory |
8957
7672d8e13d0d
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net>
parents:
8950
diff
changeset
|
52 kwfiles show files configured for keyword expansion |
8763 | 53 kwshrink revert expanded keywords in the working directory |
5816 | 54 |
7125
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
55 enabled extensions: |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
56 |
8894
868670dbc237
extensions: improve the consistency of synopses
Cédric Duval <cedricduval@free.fr>
parents:
8825
diff
changeset
|
57 keyword expand keywords in tracked files |
8932
f87884329419
extensions: fix up description lines some more
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8894
diff
changeset
|
58 mq manage a stack of patches |
8935
f4f0e902b750
extensions: change descriptions for hook-providing extensions
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8932
diff
changeset
|
59 notify hooks for sending email notifications at commit/push time |
7125
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
60 |
5816 | 61 use "hg -v help keyword" to show aliases and global options |
62 % hg kwdemo | |
63 [extensions] | |
64 hgext.keyword = | |
65 [keyword] | |
66 * = | |
67 b = ignore | |
68 demo.txt = | |
69 [keywordmaps] | |
70 RCSFile = {file|basename},v | |
71 Author = {author|user} | |
72 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | |
73 Source = {root}/{file},v | |
74 Date = {date|utcdate} | |
75 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
76 Revision = {node|short} | |
77 $RCSFile: demo.txt,v $ | |
78 $Author: test $ | |
79 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
80 $Source: /TMP/demo.txt,v $ | |
81 $Date: 2000/00/00 00:00:00 $ | |
82 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
83 $Revision: xxxxxxxxxxxx $ | |
84 [extensions] | |
85 hgext.keyword = | |
86 [keyword] | |
87 * = | |
88 b = ignore | |
89 demo.txt = | |
90 [keywordmaps] | |
91 Branch = {branches} | |
92 $Branch: demobranch $ | |
93 % kwshrink should exit silently in empty/invalid repo | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
94 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
95 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
96 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
97 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
98 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
99 added 1 changesets with 1 changes to 1 files |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 101 % cat |
102 expand $Id$ | |
103 do not process $Id: | |
104 xxx $ | |
105 ignore $Id$ | |
106 % addremove | |
107 adding a | |
108 adding b | |
109 % status | |
110 A a | |
111 A b | |
112 % default keyword expansion including commit hook | |
113 % interrupted commit should not change state or run commit hook | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
114 abort: empty commit message |
5816 | 115 % status |
116 A a | |
117 A b | |
118 % commit | |
119 a | |
120 b | |
121 overwriting a expanding keywords | |
122 running hook commit.test: cp a hooktest | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
123 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5816 | 124 % status |
125 ? hooktest | |
126 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
127 ef63ca68695b |
5816 | 128 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
129 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 130 do not process $Id: |
131 xxx $ | |
132 ignore $Id$ | |
133 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
134 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 135 do not process $Id: |
136 xxx $ | |
137 ignore $Id$ | |
138 a | |
139 % diff a hooktest | |
140 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
141 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
142 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
143 % notify on pull to check whether keywords stay as is in email |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
144 % ie. if patch.diff wrapper acts as it should |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
145 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
146 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
147 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
148 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
149 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
150 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
151 added 2 changesets with 3 changes to 3 files |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
152 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
153 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
154 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
155 +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
156 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
157 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
158 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
159 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
160 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
161 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
162 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
163 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
164 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
165 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
166 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
167 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
168 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
169 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
170 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
171 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
172 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
173 % remove notify config |
5816 | 174 % touch |
175 % status | |
176 % update | |
177 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
178 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
179 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 180 do not process $Id: |
181 xxx $ | |
182 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
183 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
184 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
185 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
186 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
187 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
188 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
189 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
190 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
191 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
192 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
193 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
194 tests for different changenodes |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
195 % qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
196 % qimport |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
197 % qcommit |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
198 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
199 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
200 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
201 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
202 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
203 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
204 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
205 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
206 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
207 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
208 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
209 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
210 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
211 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
212 % qpop |
7627 | 213 patch queue now empty |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
214 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
215 applying mqtest.diff |
7627 | 216 now at: mqtest.diff |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
217 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
218 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
219 tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
220 % qpop and move on |
7627 | 221 patch queue now empty |
5816 | 222 % copy |
223 % kwfiles added | |
224 a | |
225 c | |
226 % commit | |
227 c | |
228 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
229 overwriting c expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
230 committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
5816 | 231 % cat a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
232 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 233 do not process $Id: |
234 xxx $ | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
235 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
5816 | 236 do not process $Id: |
237 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
238 % touch copied c |
5816 | 239 % status |
240 % kwfiles | |
241 a | |
242 c | |
243 % diff --rev | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
244 diff -r ef63ca68695b c |
5816 | 245 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
246 @@ -0,0 +1,3 @@ | |
5885
53be157543d4
keyword: avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
5884
diff
changeset
|
247 +expand $Id$ |
5816 | 248 +do not process $Id: |
249 +xxx $ | |
250 % rollback | |
251 rolling back last transaction | |
252 % status | |
253 A c | |
254 % update -C | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
255 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 256 % custom keyword expansion |
257 % try with kwdemo | |
258 [extensions] | |
259 hgext.keyword = | |
260 [keyword] | |
261 * = | |
262 b = ignore | |
263 demo.txt = | |
264 [keywordmaps] | |
265 Xinfo = {author}: {desc} | |
266 $Xinfo: test: hg keyword config and expansion example $ | |
267 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
268 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 269 do not process $Id: |
270 xxx $ | |
271 ignore $Id$ | |
272 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
273 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 274 do not process $Id: |
275 xxx $ | |
276 ignore $Id$ | |
277 a | |
278 % interrupted commit should not change state | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
279 abort: empty commit message |
5816 | 280 % status |
281 M a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
282 ? c |
5816 | 283 ? log |
284 % commit | |
285 a | |
286 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
287 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
5816 | 288 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
289 ? c |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
290 % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
291 checking changesets |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
292 checking manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
293 crosschecking files in changesets and manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
294 checking files |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
295 3 files, 3 changesets, 4 total revisions |
5816 | 296 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
297 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 298 do not process $Id: |
299 xxx $ | |
300 $Xinfo: User Name <user@example.com>: firstline $ | |
301 ignore $Id$ | |
302 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
303 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 304 do not process $Id: |
305 xxx $ | |
306 $Xinfo: User Name <user@example.com>: firstline $ | |
307 ignore $Id$ | |
308 a | |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
309 % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
310 1: expand $Id$ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
311 1: do not process $Id: |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
312 1: xxx $ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
313 2: $Xinfo$ |
5816 | 314 % remove |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
315 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
5816 | 316 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
317 ? c |
5816 | 318 % rollback |
319 rolling back last transaction | |
320 % status | |
321 R a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
322 ? c |
5816 | 323 % revert a |
324 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
325 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 326 do not process $Id: |
327 xxx $ | |
328 $Xinfo: User Name <user@example.com>: firstline $ | |
329 % clone to test incoming | |
330 requesting all changes | |
331 adding changesets | |
332 adding manifests | |
333 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
334 added 2 changesets with 3 changes to 3 files |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6328
diff
changeset
|
335 updating working directory |
5816 | 336 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
338 comparing with test-keyword/Test |
5816 | 339 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
340 changeset: 2:bb948857c743 |
5816 | 341 tag: tip |
342 user: User Name <user@example.com> | |
343 date: Thu Jan 01 00:00:02 1970 +0000 | |
344 summary: firstline | |
345 | |
346 % commit rejecttest | |
347 a | |
348 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
349 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
5816 | 350 % export |
351 % import | |
352 applying ../rejecttest.diff | |
353 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
354 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 355 do not process $Id: rejecttest |
356 xxx $ | |
357 $Xinfo: User Name <user@example.com>: rejects? $ | |
358 ignore $Id$ | |
359 | |
360 % rollback | |
361 rolling back last transaction | |
362 % clean update | |
363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
364 % kwexpand/kwshrink on selected files | |
365 % copy a x/a | |
366 % kwexpand a | |
367 overwriting a expanding keywords | |
368 % kwexpand x/a should abort | |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
369 abort: outstanding uncommitted changes |
5816 | 370 x/a |
371 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
372 overwriting x/a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
373 committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
5816 | 374 % cat a |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
375 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 376 do not process $Id: |
377 xxx $ | |
378 $Xinfo: User Name <user@example.com>: xa $ | |
379 % kwshrink a inside directory x | |
380 overwriting x/a shrinking keywords | |
381 % cat a | |
382 expand $Id$ | |
383 do not process $Id: | |
384 xxx $ | |
385 $Xinfo$ | |
386 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
387 nonexistent: |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
388 % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
389 % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
390 % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
391 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
392 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
393 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 394 do not process $Id: |
395 xxx $ | |
396 $Xinfo: User Name <user@example.com>: firstline $ | |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
397 % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
398 % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
399 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
400 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
401 |
6968
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
402 user@1: expand $Id$ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
403 user@1: do not process $Id: |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
404 user@1: xxx $ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
405 user@2: $Xinfo$ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
406 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
407 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
408 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
409 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
410 % hgweb changeset |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
411 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
412 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
413 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
414 # HG changeset patch |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
415 # User User Name <user@example.com> |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
416 # Date 3 0 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
417 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
7166
fb3df69aa785
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7127
diff
changeset
|
418 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
419 xa |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
420 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
421 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
422 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
423 @@ -0,0 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
424 +expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
425 +do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
426 +xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
427 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
428 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
429 % hgweb filediff |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
430 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
431 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
432 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
433 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
434 +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
435 @@ -1,3 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
436 expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
437 do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
438 xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
439 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
440 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
441 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
442 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
443 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
444 % errors encountered |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
445 % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
446 % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
447 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
448 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
449 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
450 (branch merge, don't forget to commit) |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
451 $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
452 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
453 % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
454 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
455 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
456 merging m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
457 warning: conflicts during merge. |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
458 merging m failed! |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
459 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7627
diff
changeset
|
460 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
461 % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
462 $Id$ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
463 <<<<<<< local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
464 bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
465 ======= |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
466 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
467 >>>>>>> other |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
468 % resolve to local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
469 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
470 bar |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
471 % switch off expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
472 % kwshrink with unknown file u |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
473 overwriting a shrinking keywords |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
474 overwriting m shrinking keywords |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
475 overwriting x/a shrinking keywords |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
476 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
477 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
478 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
479 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
480 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
481 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
482 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
483 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
484 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
485 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
486 $Xinfo: User Name <user@example.com>: firstline $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
487 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
488 a |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
489 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
490 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
491 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
492 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
493 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
494 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
495 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
496 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
497 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
498 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
499 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
500 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
501 a |