Mercurial > hg
annotate tests/test-keyword.out @ 6338:0750f11152fe
clone: print "updating working directory" status message
With this change, "hg clone" looks like this:
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
So the user sees
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
while Mercurial is writing to disk to populate the working directory
With this change, "hg clone" looks like this:
% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 21 Mar 2008 14:52:24 +0100 |
parents | 991f7518c3f3 |
children | 57a47660b319 |
rev | line source |
---|---|
5816 | 1 % help |
2 keyword extension - keyword expansion in local repositories | |
3 | |
4 This extension expands RCS/CVS-like or self-customized $Keywords$ | |
5 in tracked text files selected by your configuration. | |
6 | |
7 Keywords are only expanded in local repositories and not stored in | |
8 the change history. The mechanism can be regarded as a convenience | |
9 for the current user or for archive distribution. | |
10 | |
11 Configuration is done in the [keyword] and [keywordmaps] sections | |
12 of hgrc files. | |
13 | |
14 Example: | |
15 | |
16 [keyword] | |
17 # expand keywords in every python file except those matching "x*" | |
18 **.py = | |
19 x* = ignore | |
20 | |
21 Note: the more specific you are in your filename patterns | |
22 the less you lose speed in huge repos. | |
23 | |
24 For [keywordmaps] template mapping and expansion demonstration and | |
25 control run "hg kwdemo". | |
26 | |
27 An additional date template filter {date|utcdate} is provided. | |
28 | |
29 The default template mappings (view with "hg kwdemo -d") can be replaced | |
30 with customized keywords and templates. | |
31 Again, run "hg kwdemo" to control the results of your config changes. | |
32 | |
33 Before changing/disabling active keywords, run "hg kwshrink" to avoid | |
34 the risk of inadvertedly storing expanded keywords in the change history. | |
35 | |
36 To force expansion after enabling it, or a configuration change, run | |
37 "hg kwexpand". | |
38 | |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
39 Also, when committing with the record extension or using mq's qrecord, be aware |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
40 that keywords cannot be updated. Again, run "hg kwexpand" on the files in |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
41 question to update keyword expansions after all changes have been checked in. |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
42 |
5816 | 43 Expansions spanning more than one line and incremental expansions, |
44 like CVS' $Log$, are not supported. A keyword template map | |
45 "Log = {desc}" expands to the first line of the changeset description. | |
46 | |
47 list of commands: | |
48 | |
49 kwdemo print [keywordmaps] configuration and an expansion example | |
50 kwexpand expand keywords in working directory | |
51 kwfiles print files currently configured for keyword expansion | |
52 kwshrink revert expanded keywords in working directory | |
53 | |
54 use "hg -v help keyword" to show aliases and global options | |
55 % hg kwdemo | |
56 [extensions] | |
57 hgext.keyword = | |
58 [keyword] | |
59 * = | |
60 b = ignore | |
61 demo.txt = | |
62 [keywordmaps] | |
63 RCSFile = {file|basename},v | |
64 Author = {author|user} | |
65 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | |
66 Source = {root}/{file},v | |
67 Date = {date|utcdate} | |
68 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
69 Revision = {node|short} | |
70 $RCSFile: demo.txt,v $ | |
71 $Author: test $ | |
72 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
73 $Source: /TMP/demo.txt,v $ | |
74 $Date: 2000/00/00 00:00:00 $ | |
75 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
76 $Revision: xxxxxxxxxxxx $ | |
77 [extensions] | |
78 hgext.keyword = | |
79 [keyword] | |
80 * = | |
81 b = ignore | |
82 demo.txt = | |
83 [keywordmaps] | |
84 Branch = {branches} | |
85 $Branch: demobranch $ | |
86 % 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
|
87 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
88 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
89 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
90 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
91 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
92 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
|
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 94 % cat |
95 expand $Id$ | |
96 do not process $Id: | |
97 xxx $ | |
98 ignore $Id$ | |
99 % addremove | |
100 adding a | |
101 adding b | |
102 % status | |
103 A a | |
104 A b | |
105 % default keyword expansion including commit hook | |
106 % interrupted commit should not change state or run commit hook | |
107 a | |
108 b | |
109 transaction abort! | |
110 rollback completed | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
111 abort: empty commit message |
5816 | 112 % status |
113 A a | |
114 A b | |
115 % commit | |
116 a | |
117 b | |
118 overwriting a expanding keywords | |
119 running hook commit.test: cp a hooktest | |
120 % status | |
121 ? hooktest | |
122 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
123 ef63ca68695b |
5816 | 124 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
125 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 126 do not process $Id: |
127 xxx $ | |
128 ignore $Id$ | |
129 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 131 do not process $Id: |
132 xxx $ | |
133 ignore $Id$ | |
134 a | |
135 % diff a hooktest | |
136 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
137 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
138 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
139 % 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
|
140 % 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
|
141 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
142 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
143 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
144 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
145 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
146 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
147 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
|
148 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
149 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
150 --- /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
|
151 +++ 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
|
152 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
153 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
154 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
155 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
156 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
157 --- /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
|
158 +++ 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
|
159 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
160 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
161 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
162 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
163 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
164 --- /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
|
165 +++ 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
|
166 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
167 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
168 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
|
169 % remove notify config |
5816 | 170 % touch |
171 % status | |
172 % update | |
173 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
174 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
175 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 176 do not process $Id: |
177 xxx $ | |
178 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
179 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
180 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
181 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
182 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
183 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
184 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
185 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
186 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
|
187 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
188 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
189 $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
|
190 tests for different changenodes |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
191 % qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
192 % qimport |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
193 % qcommit |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
194 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
195 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
196 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
197 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
198 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
199 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
200 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
201 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
202 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
203 --- /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
|
204 +++ 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
|
205 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
206 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
207 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
208 % qpop |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
209 Patch queue now empty |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
210 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
211 applying mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
212 Now at: mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
213 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
214 $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
|
215 tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
216 % qpop and move on |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
217 Patch queue now empty |
5816 | 218 % copy |
219 % kwfiles added | |
220 a | |
221 c | |
222 % commit | |
223 c | |
224 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
225 overwriting c expanding keywords | |
226 % cat a c | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
227 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 228 do not process $Id: |
229 xxx $ | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
230 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
5816 | 231 do not process $Id: |
232 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
233 % touch copied c |
5816 | 234 % status |
235 % kwfiles | |
236 a | |
237 c | |
238 % diff --rev | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
239 diff -r ef63ca68695b c |
5816 | 240 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
241 @@ -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
|
242 +expand $Id$ |
5816 | 243 +do not process $Id: |
244 +xxx $ | |
245 % rollback | |
246 rolling back last transaction | |
247 % status | |
248 A c | |
249 % update -C | |
250 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
251 % custom keyword expansion | |
252 % try with kwdemo | |
253 [extensions] | |
254 hgext.keyword = | |
255 [keyword] | |
256 * = | |
257 b = ignore | |
258 demo.txt = | |
259 [keywordmaps] | |
260 Xinfo = {author}: {desc} | |
261 $Xinfo: test: hg keyword config and expansion example $ | |
262 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
263 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 264 do not process $Id: |
265 xxx $ | |
266 ignore $Id$ | |
267 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
268 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 269 do not process $Id: |
270 xxx $ | |
271 ignore $Id$ | |
272 a | |
273 % interrupted commit should not change state | |
274 transaction abort! | |
275 rollback completed | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
276 abort: empty commit message |
5816 | 277 % status |
278 M a | |
279 ? log | |
280 % commit | |
281 a | |
282 overwriting a expanding keywords | |
283 % status | |
284 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
285 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 286 do not process $Id: |
287 xxx $ | |
288 $Xinfo: User Name <user@example.com>: firstline $ | |
289 ignore $Id$ | |
290 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
291 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 292 do not process $Id: |
293 xxx $ | |
294 $Xinfo: User Name <user@example.com>: firstline $ | |
295 ignore $Id$ | |
296 a | |
297 % remove | |
298 % status | |
299 % rollback | |
300 rolling back last transaction | |
301 % status | |
302 R a | |
303 % revert a | |
304 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
305 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 306 do not process $Id: |
307 xxx $ | |
308 $Xinfo: User Name <user@example.com>: firstline $ | |
309 % clone to test incoming | |
310 requesting all changes | |
311 adding changesets | |
312 adding manifests | |
313 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
314 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
|
315 updating working directory |
5816 | 316 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
317 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
318 comparing with test-keyword/Test |
5816 | 319 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
320 changeset: 2:bb948857c743 |
5816 | 321 tag: tip |
322 user: User Name <user@example.com> | |
323 date: Thu Jan 01 00:00:02 1970 +0000 | |
324 summary: firstline | |
325 | |
326 % commit rejecttest | |
327 a | |
328 overwriting a expanding keywords | |
329 % export | |
330 % import | |
331 applying ../rejecttest.diff | |
332 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
333 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 334 do not process $Id: rejecttest |
335 xxx $ | |
336 $Xinfo: User Name <user@example.com>: rejects? $ | |
337 ignore $Id$ | |
338 | |
339 % rollback | |
340 rolling back last transaction | |
341 % clean update | |
342 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
343 % kwexpand/kwshrink on selected files | |
344 % copy a x/a | |
345 % kwexpand a | |
346 overwriting a expanding keywords | |
347 % kwexpand x/a should abort | |
348 abort: outstanding uncommitted changes in given files | |
349 x/a | |
350 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
351 overwriting x/a expanding keywords | |
352 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
353 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 354 do not process $Id: |
355 xxx $ | |
356 $Xinfo: User Name <user@example.com>: xa $ | |
357 % kwshrink a inside directory x | |
358 overwriting x/a shrinking keywords | |
359 % cat a | |
360 expand $Id$ | |
361 do not process $Id: | |
362 xxx $ | |
363 $Xinfo$ | |
364 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
365 nonexistent: |
5816 | 366 % switch off expansion |
367 % kwshrink with unknown file u | |
368 overwriting a shrinking keywords | |
369 overwriting x/a shrinking keywords | |
370 % cat | |
371 expand $Id$ | |
372 do not process $Id: | |
373 xxx $ | |
374 $Xinfo$ | |
375 ignore $Id$ | |
376 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
377 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 378 do not process $Id: |
379 xxx $ | |
380 $Xinfo: User Name <user@example.com>: firstline $ | |
381 ignore $Id$ | |
382 a | |
383 % cat | |
384 expand $Id$ | |
385 do not process $Id: | |
386 xxx $ | |
387 $Xinfo$ | |
388 ignore $Id$ | |
389 % hg cat | |
390 expand $Id$ | |
391 do not process $Id: | |
392 xxx $ | |
393 $Xinfo$ | |
394 ignore $Id$ | |
395 a |