Show More
@@ -1,343 +1,340 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | cat <<EOF >> $HGRCPATH |
|
4 | 4 | [extensions] |
|
5 | 5 | hgext.keyword = |
|
6 | 6 | hgext.mq = |
|
7 | 7 | hgext.notify = |
|
8 | 8 | [keyword] |
|
9 | 9 | * = |
|
10 | 10 | b = ignore |
|
11 | 11 | [hooks] |
|
12 | 12 | commit= |
|
13 | 13 | commit.test=cp a hooktest |
|
14 | 14 | EOF |
|
15 | 15 | |
|
16 | echo % help | |
|
17 | hg help keyword | |
|
18 | ||
|
19 | 16 | echo % hg kwdemo |
|
20 | 17 | hg --quiet kwdemo --default \ |
|
21 | 18 | | sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \ |
|
22 | 19 | -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \ |
|
23 | 20 | -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \ |
|
24 | 21 | -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!' |
|
25 | 22 | |
|
26 | 23 | hg --quiet kwdemo "Branch = {branches}" |
|
27 | 24 | |
|
28 | 25 | hg init Test-bndl |
|
29 | 26 | cd Test-bndl |
|
30 | 27 | |
|
31 | 28 | echo % kwshrink should exit silently in empty/invalid repo |
|
32 | 29 | hg kwshrink |
|
33 | 30 | |
|
34 | 31 | # Symlinks cannot be created on Windows. The bundle was made with: |
|
35 | 32 | # |
|
36 | 33 | # hg init t |
|
37 | 34 | # cd t |
|
38 | 35 | # echo a > a |
|
39 | 36 | # ln -s a sym |
|
40 | 37 | # hg add sym |
|
41 | 38 | # hg ci -m addsym -u mercurial |
|
42 | 39 | # hg bundle --base null ../test-keyword.hg |
|
43 | 40 | # |
|
44 | 41 | hg pull -u "$TESTDIR/test-keyword.hg" \ |
|
45 | 42 | | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/' |
|
46 | 43 | |
|
47 | 44 | echo 'expand $Id$' > a |
|
48 | 45 | echo 'do not process $Id:' >> a |
|
49 | 46 | echo 'xxx $' >> a |
|
50 | 47 | echo 'ignore $Id$' > b |
|
51 | 48 | echo % cat |
|
52 | 49 | cat a b |
|
53 | 50 | |
|
54 | 51 | echo % addremove |
|
55 | 52 | hg addremove |
|
56 | 53 | echo % status |
|
57 | 54 | hg status |
|
58 | 55 | |
|
59 | 56 | echo % default keyword expansion including commit hook |
|
60 | 57 | echo % interrupted commit should not change state or run commit hook |
|
61 | 58 | hg --debug commit |
|
62 | 59 | echo % status |
|
63 | 60 | hg status |
|
64 | 61 | |
|
65 | 62 | echo % commit |
|
66 | 63 | hg --debug commit -mabsym -u 'User Name <user@example.com>' |
|
67 | 64 | echo % status |
|
68 | 65 | hg status |
|
69 | 66 | echo % identify |
|
70 | 67 | hg debugrebuildstate |
|
71 | 68 | hg --quiet identify |
|
72 | 69 | echo % cat |
|
73 | 70 | cat a b |
|
74 | 71 | echo % hg cat |
|
75 | 72 | hg cat sym a b |
|
76 | 73 | |
|
77 | 74 | echo |
|
78 | 75 | echo % diff a hooktest |
|
79 | 76 | diff a hooktest |
|
80 | 77 | |
|
81 | 78 | echo % removing commit hook from config |
|
82 | 79 | sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook |
|
83 | 80 | mv $HGRCPATH.nohook $HGRCPATH |
|
84 | 81 | rm hooktest |
|
85 | 82 | |
|
86 | 83 | echo % bundle |
|
87 | 84 | hg bundle --base null ../kw.hg |
|
88 | 85 | |
|
89 | 86 | cd .. |
|
90 | 87 | hg init Test |
|
91 | 88 | cd Test |
|
92 | 89 | |
|
93 | 90 | echo % notify on pull to check whether keywords stay as is in email |
|
94 | 91 | echo % ie. if patch.diff wrapper acts as it should |
|
95 | 92 | |
|
96 | 93 | cat <<EOF >> $HGRCPATH |
|
97 | 94 | [hooks] |
|
98 | 95 | incoming.notify = python:hgext.notify.hook |
|
99 | 96 | [notify] |
|
100 | 97 | sources = pull |
|
101 | 98 | diffstat = False |
|
102 | 99 | [reposubs] |
|
103 | 100 | * = Test |
|
104 | 101 | EOF |
|
105 | 102 | |
|
106 | 103 | echo % pull from bundle |
|
107 | 104 | hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d' |
|
108 | 105 | |
|
109 | 106 | echo % remove notify config |
|
110 | 107 | sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify |
|
111 | 108 | mv $HGRCPATH.nonotify $HGRCPATH |
|
112 | 109 | |
|
113 | 110 | echo % touch |
|
114 | 111 | touch a b |
|
115 | 112 | echo % status |
|
116 | 113 | hg status |
|
117 | 114 | |
|
118 | 115 | rm sym a b |
|
119 | 116 | echo % update |
|
120 | 117 | hg update -C |
|
121 | 118 | echo % cat |
|
122 | 119 | cat a b |
|
123 | 120 | |
|
124 | 121 | echo % check whether expansion is filewise |
|
125 | 122 | echo '$Id$' > c |
|
126 | 123 | echo 'tests for different changenodes' >> c |
|
127 | 124 | echo % commit c |
|
128 | 125 | hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
|
129 | 126 | echo % force expansion |
|
130 | 127 | hg -v kwexpand |
|
131 | 128 | echo % compare changenodes in a c |
|
132 | 129 | cat a c |
|
133 | 130 | |
|
134 | 131 | echo % qinit -c |
|
135 | 132 | hg qinit -c |
|
136 | 133 | echo % qimport |
|
137 | 134 | hg qimport -r tip -n mqtest.diff |
|
138 | 135 | echo % qcommit |
|
139 | 136 | hg qcommit -mqtest |
|
140 | 137 | echo % keywords should not be expanded in patch |
|
141 | 138 | cat .hg/patches/mqtest.diff |
|
142 | 139 | echo % qpop |
|
143 | 140 | hg qpop |
|
144 | 141 | echo % qgoto - should imply qpush |
|
145 | 142 | hg qgoto mqtest.diff |
|
146 | 143 | echo % cat |
|
147 | 144 | cat c |
|
148 | 145 | echo % qpop and move on |
|
149 | 146 | hg qpop |
|
150 | 147 | |
|
151 | 148 | echo % copy |
|
152 | 149 | hg cp a c |
|
153 | 150 | |
|
154 | 151 | echo % kwfiles added |
|
155 | 152 | hg kwfiles |
|
156 | 153 | |
|
157 | 154 | echo % commit |
|
158 | 155 | hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
|
159 | 156 | echo % cat a c |
|
160 | 157 | cat a c |
|
161 | 158 | echo % touch copied c |
|
162 | 159 | touch c |
|
163 | 160 | echo % status |
|
164 | 161 | hg status |
|
165 | 162 | |
|
166 | 163 | echo % kwfiles |
|
167 | 164 | hg kwfiles |
|
168 | 165 | |
|
169 | 166 | echo % diff --rev |
|
170 | 167 | hg diff --rev 1 | grep -v 'b/c' |
|
171 | 168 | |
|
172 | 169 | echo % rollback |
|
173 | 170 | hg rollback |
|
174 | 171 | echo % status |
|
175 | 172 | hg status |
|
176 | 173 | echo % update -C |
|
177 | 174 | hg update --clean |
|
178 | 175 | |
|
179 | 176 | echo % custom keyword expansion |
|
180 | 177 | echo % try with kwdemo |
|
181 | 178 | hg --quiet kwdemo "Xinfo = {author}: {desc}" |
|
182 | 179 | |
|
183 | 180 | cat <<EOF >>$HGRCPATH |
|
184 | 181 | [keywordmaps] |
|
185 | 182 | Id = {file} {node|short} {date|rfc822date} {author|user} |
|
186 | 183 | Xinfo = {author}: {desc} |
|
187 | 184 | EOF |
|
188 | 185 | |
|
189 | 186 | echo % cat |
|
190 | 187 | cat a b |
|
191 | 188 | echo % hg cat |
|
192 | 189 | hg cat sym a b |
|
193 | 190 | |
|
194 | 191 | echo |
|
195 | 192 | echo '$Xinfo$' >> a |
|
196 | 193 | cat <<EOF >> log |
|
197 | 194 | firstline |
|
198 | 195 | secondline |
|
199 | 196 | EOF |
|
200 | 197 | |
|
201 | 198 | echo % interrupted commit should not change state |
|
202 | 199 | hg commit |
|
203 | 200 | echo % status |
|
204 | 201 | hg status |
|
205 | 202 | |
|
206 | 203 | echo % commit |
|
207 | 204 | hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
|
208 | 205 | rm log |
|
209 | 206 | echo % status |
|
210 | 207 | hg status |
|
211 | 208 | echo % verify |
|
212 | 209 | hg verify |
|
213 | 210 | |
|
214 | 211 | echo % cat |
|
215 | 212 | cat a b |
|
216 | 213 | echo % hg cat |
|
217 | 214 | hg cat sym a b |
|
218 | 215 | echo |
|
219 | 216 | echo % annotate |
|
220 | 217 | hg annotate a |
|
221 | 218 | |
|
222 | 219 | echo % remove |
|
223 | 220 | hg debugrebuildstate |
|
224 | 221 | hg remove a |
|
225 | 222 | hg --debug commit -m rma |
|
226 | 223 | echo % status |
|
227 | 224 | hg status |
|
228 | 225 | echo % rollback |
|
229 | 226 | hg rollback |
|
230 | 227 | echo % status |
|
231 | 228 | hg status |
|
232 | 229 | echo % revert a |
|
233 | 230 | hg revert --no-backup --rev tip a |
|
234 | 231 | echo % cat a |
|
235 | 232 | cat a |
|
236 | 233 | |
|
237 | 234 | echo % clone to test incoming |
|
238 | 235 | cd .. |
|
239 | 236 | hg clone -r1 Test Test-a |
|
240 | 237 | cd Test-a |
|
241 | 238 | cat <<EOF >> .hg/hgrc |
|
242 | 239 | [paths] |
|
243 | 240 | default = ../Test |
|
244 | 241 | EOF |
|
245 | 242 | echo % incoming |
|
246 | 243 | # remove path to temp dir |
|
247 | 244 | hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/' |
|
248 | 245 | |
|
249 | 246 | sed -e 's/Id.*/& rejecttest/' a > a.new |
|
250 | 247 | mv a.new a |
|
251 | 248 | echo % commit rejecttest |
|
252 | 249 | hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
|
253 | 250 | echo % export |
|
254 | 251 | hg export -o ../rejecttest.diff tip |
|
255 | 252 | |
|
256 | 253 | cd ../Test |
|
257 | 254 | echo % import |
|
258 | 255 | hg import ../rejecttest.diff |
|
259 | 256 | echo % cat |
|
260 | 257 | cat a b |
|
261 | 258 | echo |
|
262 | 259 | echo % rollback |
|
263 | 260 | hg rollback |
|
264 | 261 | echo % clean update |
|
265 | 262 | hg update --clean |
|
266 | 263 | |
|
267 | 264 | echo % kwexpand/kwshrink on selected files |
|
268 | 265 | mkdir x |
|
269 | 266 | echo % copy a x/a |
|
270 | 267 | hg copy a x/a |
|
271 | 268 | echo % kwexpand a |
|
272 | 269 | hg --verbose kwexpand a |
|
273 | 270 | echo % kwexpand x/a should abort |
|
274 | 271 | hg --verbose kwexpand x/a |
|
275 | 272 | cd x |
|
276 | 273 | hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
|
277 | 274 | echo % cat a |
|
278 | 275 | cat a |
|
279 | 276 | echo % kwshrink a inside directory x |
|
280 | 277 | hg --verbose kwshrink a |
|
281 | 278 | echo % cat a |
|
282 | 279 | cat a |
|
283 | 280 | cd .. |
|
284 | 281 | |
|
285 | 282 | echo % kwexpand nonexistent |
|
286 | 283 | hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/' |
|
287 | 284 | |
|
288 | 285 | echo % hg serve |
|
289 | 286 | hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
290 | 287 | cat hg.pid >> $DAEMON_PIDS |
|
291 | 288 | echo % expansion |
|
292 | 289 | echo % hgweb file |
|
293 | 290 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw') |
|
294 | 291 | echo % no expansion |
|
295 | 292 | echo % hgweb annotate |
|
296 | 293 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw') |
|
297 | 294 | echo % hgweb changeset |
|
298 | 295 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw') |
|
299 | 296 | echo % hgweb filediff |
|
300 | 297 | ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw') |
|
301 | 298 | echo % errors encountered |
|
302 | 299 | cat errors.log |
|
303 | 300 | |
|
304 | 301 | echo % merge/resolve |
|
305 | 302 | echo '$Id$' > m |
|
306 | 303 | hg add m |
|
307 | 304 | hg commit -m 4kw |
|
308 | 305 | echo foo >> m |
|
309 | 306 | hg commit -m 5foo |
|
310 | 307 | echo % simplemerge |
|
311 | 308 | hg update 4 |
|
312 | 309 | echo foo >> m |
|
313 | 310 | hg commit -m 6foo |
|
314 | 311 | hg merge |
|
315 | 312 | hg commit -m simplemerge |
|
316 | 313 | cat m |
|
317 | 314 | echo % conflict |
|
318 | 315 | hg update 4 |
|
319 | 316 | echo bar >> m |
|
320 | 317 | hg commit -m 8bar |
|
321 | 318 | hg merge |
|
322 | 319 | echo % keyword stays outside conflict zone |
|
323 | 320 | cat m |
|
324 | 321 | echo % resolve to local |
|
325 | 322 | HGMERGE=internal:local hg resolve -a |
|
326 | 323 | hg commit -m localresolve |
|
327 | 324 | cat m |
|
328 | 325 | |
|
329 | 326 | echo % switch off expansion |
|
330 | 327 | echo % kwshrink with unknown file u |
|
331 | 328 | cp a u |
|
332 | 329 | hg --verbose kwshrink |
|
333 | 330 | echo % cat |
|
334 | 331 | cat a b |
|
335 | 332 | echo % hg cat |
|
336 | 333 | hg cat sym a b |
|
337 | 334 | echo |
|
338 | 335 | rm $HGRCPATH |
|
339 | 336 | echo % cat |
|
340 | 337 | cat a b |
|
341 | 338 | echo % hg cat |
|
342 | 339 | hg cat sym a b |
|
343 | 340 | echo |
@@ -1,503 +1,442 b'' | |||
|
1 | % help | |
|
2 | keyword extension - expand keywords in tracked files | |
|
3 | ||
|
4 | This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked | |
|
5 | text files selected by your configuration. | |
|
6 | ||
|
7 | Keywords are only expanded in local repositories and not stored in the change | |
|
8 | history. The mechanism can be regarded as a convenience for the current user | |
|
9 | or for archive distribution. | |
|
10 | ||
|
11 | Configuration is done in the [keyword] and [keywordmaps] sections of hgrc | |
|
12 | 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 the less you lose | |
|
22 | speed in huge repositories. | |
|
23 | ||
|
24 | For [keywordmaps] template mapping and expansion demonstration and control run | |
|
25 | "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 with | |
|
30 | customized keywords and templates. Again, run "hg kwdemo" to control the | |
|
31 | results of your config changes. | |
|
32 | ||
|
33 | Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk | |
|
34 | of inadvertently storing expanded keywords in the change history. | |
|
35 | ||
|
36 | To force expansion after enabling it, or a configuration change, run "hg | |
|
37 | kwexpand". | |
|
38 | ||
|
39 | Also, when committing with the record extension or using mq's qrecord, be | |
|
40 | aware that keywords cannot be updated. Again, run "hg kwexpand" on the files | |
|
41 | in question to update keyword expansions after all changes have been checked | |
|
42 | in. | |
|
43 | ||
|
44 | Expansions spanning more than one line and incremental expansions, like CVS' | |
|
45 | $Log$, are not supported. A keyword template map "Log = {desc}" expands to the | |
|
46 | first line of the changeset description. | |
|
47 | ||
|
48 | list of commands: | |
|
49 | ||
|
50 | kwdemo print [keywordmaps] configuration and an expansion example | |
|
51 | kwexpand expand keywords in the working directory | |
|
52 | kwfiles show files configured for keyword expansion | |
|
53 | kwshrink revert expanded keywords in the working directory | |
|
54 | ||
|
55 | enabled extensions: | |
|
56 | ||
|
57 | keyword expand keywords in tracked files | |
|
58 | mq manage a stack of patches | |
|
59 | notify hooks for sending email notifications at commit/push time | |
|
60 | ||
|
61 | use "hg -v help keyword" to show aliases and global options | |
|
62 | 1 | % hg kwdemo |
|
63 | 2 | [extensions] |
|
64 | 3 | hgext.keyword = |
|
65 | 4 | [keyword] |
|
66 | 5 | * = |
|
67 | 6 | b = ignore |
|
68 | 7 | demo.txt = |
|
69 | 8 | [keywordmaps] |
|
70 | 9 | RCSFile = {file|basename},v |
|
71 | 10 | Author = {author|user} |
|
72 | 11 | Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
|
73 | 12 | Source = {root}/{file},v |
|
74 | 13 | Date = {date|utcdate} |
|
75 | 14 | Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
|
76 | 15 | Revision = {node|short} |
|
77 | 16 | $RCSFile: demo.txt,v $ |
|
78 | 17 | $Author: test $ |
|
79 | 18 | $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
|
80 | 19 | $Source: /TMP/demo.txt,v $ |
|
81 | 20 | $Date: 2000/00/00 00:00:00 $ |
|
82 | 21 | $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
|
83 | 22 | $Revision: xxxxxxxxxxxx $ |
|
84 | 23 | [extensions] |
|
85 | 24 | hgext.keyword = |
|
86 | 25 | [keyword] |
|
87 | 26 | * = |
|
88 | 27 | b = ignore |
|
89 | 28 | demo.txt = |
|
90 | 29 | [keywordmaps] |
|
91 | 30 | Branch = {branches} |
|
92 | 31 | $Branch: demobranch $ |
|
93 | 32 | % kwshrink should exit silently in empty/invalid repo |
|
94 | 33 | pulling from test-keyword.hg |
|
95 | 34 | requesting all changes |
|
96 | 35 | adding changesets |
|
97 | 36 | adding manifests |
|
98 | 37 | adding file changes |
|
99 | 38 | added 1 changesets with 1 changes to 1 files |
|
100 | 39 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 40 | % cat |
|
102 | 41 | expand $Id$ |
|
103 | 42 | do not process $Id: |
|
104 | 43 | xxx $ |
|
105 | 44 | ignore $Id$ |
|
106 | 45 | % addremove |
|
107 | 46 | adding a |
|
108 | 47 | adding b |
|
109 | 48 | % status |
|
110 | 49 | A a |
|
111 | 50 | A b |
|
112 | 51 | % default keyword expansion including commit hook |
|
113 | 52 | % interrupted commit should not change state or run commit hook |
|
114 | 53 | abort: empty commit message |
|
115 | 54 | % status |
|
116 | 55 | A a |
|
117 | 56 | A b |
|
118 | 57 | % commit |
|
119 | 58 | a |
|
120 | 59 | b |
|
121 | 60 | overwriting a expanding keywords |
|
122 | 61 | running hook commit.test: cp a hooktest |
|
123 | 62 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
124 | 63 | % status |
|
125 | 64 | ? hooktest |
|
126 | 65 | % identify |
|
127 | 66 | ef63ca68695b |
|
128 | 67 | % cat |
|
129 | 68 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
130 | 69 | do not process $Id: |
|
131 | 70 | xxx $ |
|
132 | 71 | ignore $Id$ |
|
133 | 72 | % hg cat |
|
134 | 73 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
135 | 74 | do not process $Id: |
|
136 | 75 | xxx $ |
|
137 | 76 | ignore $Id$ |
|
138 | 77 | a |
|
139 | 78 | % diff a hooktest |
|
140 | 79 | % removing commit hook from config |
|
141 | 80 | % bundle |
|
142 | 81 | 2 changesets found |
|
143 | 82 | % notify on pull to check whether keywords stay as is in email |
|
144 | 83 | % ie. if patch.diff wrapper acts as it should |
|
145 | 84 | % pull from bundle |
|
146 | 85 | pulling from ../kw.hg |
|
147 | 86 | requesting all changes |
|
148 | 87 | adding changesets |
|
149 | 88 | adding manifests |
|
150 | 89 | adding file changes |
|
151 | 90 | added 2 changesets with 3 changes to 3 files |
|
152 | 91 | |
|
153 | 92 | diff -r 000000000000 -r a2392c293916 sym |
|
154 | 93 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
155 | 94 | +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
|
156 | 95 | @@ -0,0 +1,1 @@ |
|
157 | 96 | +a |
|
158 | 97 | \ No newline at end of file |
|
159 | 98 | |
|
160 | 99 | diff -r a2392c293916 -r ef63ca68695b a |
|
161 | 100 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
162 | 101 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
163 | 102 | @@ -0,0 +1,3 @@ |
|
164 | 103 | +expand $Id$ |
|
165 | 104 | +do not process $Id: |
|
166 | 105 | +xxx $ |
|
167 | 106 | diff -r a2392c293916 -r ef63ca68695b b |
|
168 | 107 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
169 | 108 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
170 | 109 | @@ -0,0 +1,1 @@ |
|
171 | 110 | +ignore $Id$ |
|
172 | 111 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
173 | 112 | % remove notify config |
|
174 | 113 | % touch |
|
175 | 114 | % status |
|
176 | 115 | % update |
|
177 | 116 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
178 | 117 | % cat |
|
179 | 118 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
180 | 119 | do not process $Id: |
|
181 | 120 | xxx $ |
|
182 | 121 | ignore $Id$ |
|
183 | 122 | % check whether expansion is filewise |
|
184 | 123 | % commit c |
|
185 | 124 | adding c |
|
186 | 125 | % force expansion |
|
187 | 126 | overwriting a expanding keywords |
|
188 | 127 | overwriting c expanding keywords |
|
189 | 128 | % compare changenodes in a c |
|
190 | 129 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
191 | 130 | do not process $Id: |
|
192 | 131 | xxx $ |
|
193 | 132 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
194 | 133 | tests for different changenodes |
|
195 | 134 | % qinit -c |
|
196 | 135 | % qimport |
|
197 | 136 | % qcommit |
|
198 | 137 | % keywords should not be expanded in patch |
|
199 | 138 | # HG changeset patch |
|
200 | 139 | # User User Name <user@example.com> |
|
201 | 140 | # Date 1 0 |
|
202 | 141 | # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
|
203 | 142 | # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
204 | 143 | cndiff |
|
205 | 144 | |
|
206 | 145 | diff -r ef63ca68695b -r 40a904bbbe4c c |
|
207 | 146 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
208 | 147 | +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
|
209 | 148 | @@ -0,0 +1,2 @@ |
|
210 | 149 | +$Id$ |
|
211 | 150 | +tests for different changenodes |
|
212 | 151 | % qpop |
|
213 | 152 | popping mqtest.diff |
|
214 | 153 | patch queue now empty |
|
215 | 154 | % qgoto - should imply qpush |
|
216 | 155 | applying mqtest.diff |
|
217 | 156 | now at: mqtest.diff |
|
218 | 157 | % cat |
|
219 | 158 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
220 | 159 | tests for different changenodes |
|
221 | 160 | % qpop and move on |
|
222 | 161 | popping mqtest.diff |
|
223 | 162 | patch queue now empty |
|
224 | 163 | % copy |
|
225 | 164 | % kwfiles added |
|
226 | 165 | a |
|
227 | 166 | c |
|
228 | 167 | % commit |
|
229 | 168 | c |
|
230 | 169 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
231 | 170 | overwriting c expanding keywords |
|
232 | 171 | committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
|
233 | 172 | % cat a c |
|
234 | 173 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
235 | 174 | do not process $Id: |
|
236 | 175 | xxx $ |
|
237 | 176 | expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
|
238 | 177 | do not process $Id: |
|
239 | 178 | xxx $ |
|
240 | 179 | % touch copied c |
|
241 | 180 | % status |
|
242 | 181 | % kwfiles |
|
243 | 182 | a |
|
244 | 183 | c |
|
245 | 184 | % diff --rev |
|
246 | 185 | diff -r ef63ca68695b c |
|
247 | 186 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
248 | 187 | @@ -0,0 +1,3 @@ |
|
249 | 188 | +expand $Id$ |
|
250 | 189 | +do not process $Id: |
|
251 | 190 | +xxx $ |
|
252 | 191 | % rollback |
|
253 | 192 | rolling back last transaction |
|
254 | 193 | % status |
|
255 | 194 | A c |
|
256 | 195 | % update -C |
|
257 | 196 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
258 | 197 | % custom keyword expansion |
|
259 | 198 | % try with kwdemo |
|
260 | 199 | [extensions] |
|
261 | 200 | hgext.keyword = |
|
262 | 201 | [keyword] |
|
263 | 202 | * = |
|
264 | 203 | b = ignore |
|
265 | 204 | demo.txt = |
|
266 | 205 | [keywordmaps] |
|
267 | 206 | Xinfo = {author}: {desc} |
|
268 | 207 | $Xinfo: test: hg keyword config and expansion example $ |
|
269 | 208 | % cat |
|
270 | 209 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
271 | 210 | do not process $Id: |
|
272 | 211 | xxx $ |
|
273 | 212 | ignore $Id$ |
|
274 | 213 | % hg cat |
|
275 | 214 | expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
|
276 | 215 | do not process $Id: |
|
277 | 216 | xxx $ |
|
278 | 217 | ignore $Id$ |
|
279 | 218 | a |
|
280 | 219 | % interrupted commit should not change state |
|
281 | 220 | abort: empty commit message |
|
282 | 221 | % status |
|
283 | 222 | M a |
|
284 | 223 | ? c |
|
285 | 224 | ? log |
|
286 | 225 | % commit |
|
287 | 226 | a |
|
288 | 227 | overwriting a expanding keywords |
|
289 | 228 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
290 | 229 | % status |
|
291 | 230 | ? c |
|
292 | 231 | % verify |
|
293 | 232 | checking changesets |
|
294 | 233 | checking manifests |
|
295 | 234 | crosschecking files in changesets and manifests |
|
296 | 235 | checking files |
|
297 | 236 | 3 files, 3 changesets, 4 total revisions |
|
298 | 237 | % cat |
|
299 | 238 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
300 | 239 | do not process $Id: |
|
301 | 240 | xxx $ |
|
302 | 241 | $Xinfo: User Name <user@example.com>: firstline $ |
|
303 | 242 | ignore $Id$ |
|
304 | 243 | % hg cat |
|
305 | 244 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
306 | 245 | do not process $Id: |
|
307 | 246 | xxx $ |
|
308 | 247 | $Xinfo: User Name <user@example.com>: firstline $ |
|
309 | 248 | ignore $Id$ |
|
310 | 249 | a |
|
311 | 250 | % annotate |
|
312 | 251 | 1: expand $Id$ |
|
313 | 252 | 1: do not process $Id: |
|
314 | 253 | 1: xxx $ |
|
315 | 254 | 2: $Xinfo$ |
|
316 | 255 | % remove |
|
317 | 256 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
|
318 | 257 | % status |
|
319 | 258 | ? c |
|
320 | 259 | % rollback |
|
321 | 260 | rolling back last transaction |
|
322 | 261 | % status |
|
323 | 262 | R a |
|
324 | 263 | ? c |
|
325 | 264 | % revert a |
|
326 | 265 | % cat a |
|
327 | 266 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
328 | 267 | do not process $Id: |
|
329 | 268 | xxx $ |
|
330 | 269 | $Xinfo: User Name <user@example.com>: firstline $ |
|
331 | 270 | % clone to test incoming |
|
332 | 271 | requesting all changes |
|
333 | 272 | adding changesets |
|
334 | 273 | adding manifests |
|
335 | 274 | adding file changes |
|
336 | 275 | added 2 changesets with 3 changes to 3 files |
|
337 | 276 | updating working directory |
|
338 | 277 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
339 | 278 | % incoming |
|
340 | 279 | comparing with test-keyword/Test |
|
341 | 280 | searching for changes |
|
342 | 281 | changeset: 2:bb948857c743 |
|
343 | 282 | tag: tip |
|
344 | 283 | user: User Name <user@example.com> |
|
345 | 284 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
346 | 285 | summary: firstline |
|
347 | 286 | |
|
348 | 287 | % commit rejecttest |
|
349 | 288 | a |
|
350 | 289 | overwriting a expanding keywords |
|
351 | 290 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
|
352 | 291 | % export |
|
353 | 292 | % import |
|
354 | 293 | applying ../rejecttest.diff |
|
355 | 294 | % cat |
|
356 | 295 | expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
|
357 | 296 | do not process $Id: rejecttest |
|
358 | 297 | xxx $ |
|
359 | 298 | $Xinfo: User Name <user@example.com>: rejects? $ |
|
360 | 299 | ignore $Id$ |
|
361 | 300 | |
|
362 | 301 | % rollback |
|
363 | 302 | rolling back last transaction |
|
364 | 303 | % clean update |
|
365 | 304 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
366 | 305 | % kwexpand/kwshrink on selected files |
|
367 | 306 | % copy a x/a |
|
368 | 307 | % kwexpand a |
|
369 | 308 | overwriting a expanding keywords |
|
370 | 309 | % kwexpand x/a should abort |
|
371 | 310 | abort: outstanding uncommitted changes |
|
372 | 311 | x/a |
|
373 | 312 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
|
374 | 313 | overwriting x/a expanding keywords |
|
375 | 314 | committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
|
376 | 315 | % cat a |
|
377 | 316 | expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
|
378 | 317 | do not process $Id: |
|
379 | 318 | xxx $ |
|
380 | 319 | $Xinfo: User Name <user@example.com>: xa $ |
|
381 | 320 | % kwshrink a inside directory x |
|
382 | 321 | overwriting x/a shrinking keywords |
|
383 | 322 | % cat a |
|
384 | 323 | expand $Id$ |
|
385 | 324 | do not process $Id: |
|
386 | 325 | xxx $ |
|
387 | 326 | $Xinfo$ |
|
388 | 327 | % kwexpand nonexistent |
|
389 | 328 | nonexistent: |
|
390 | 329 | % hg serve |
|
391 | 330 | % expansion |
|
392 | 331 | % hgweb file |
|
393 | 332 | 200 Script output follows |
|
394 | 333 | |
|
395 | 334 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
396 | 335 | do not process $Id: |
|
397 | 336 | xxx $ |
|
398 | 337 | $Xinfo: User Name <user@example.com>: firstline $ |
|
399 | 338 | % no expansion |
|
400 | 339 | % hgweb annotate |
|
401 | 340 | 200 Script output follows |
|
402 | 341 | |
|
403 | 342 | |
|
404 | 343 | user@1: expand $Id$ |
|
405 | 344 | user@1: do not process $Id: |
|
406 | 345 | user@1: xxx $ |
|
407 | 346 | user@2: $Xinfo$ |
|
408 | 347 | |
|
409 | 348 | |
|
410 | 349 | |
|
411 | 350 | |
|
412 | 351 | % hgweb changeset |
|
413 | 352 | 200 Script output follows |
|
414 | 353 | |
|
415 | 354 | |
|
416 | 355 | # HG changeset patch |
|
417 | 356 | # User User Name <user@example.com> |
|
418 | 357 | # Date 3 0 |
|
419 | 358 | # Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
|
420 | 359 | # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
421 | 360 | xa |
|
422 | 361 | |
|
423 | 362 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
424 | 363 | +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
|
425 | 364 | @@ -0,0 +1,4 @@ |
|
426 | 365 | +expand $Id$ |
|
427 | 366 | +do not process $Id: |
|
428 | 367 | +xxx $ |
|
429 | 368 | +$Xinfo$ |
|
430 | 369 | |
|
431 | 370 | % hgweb filediff |
|
432 | 371 | 200 Script output follows |
|
433 | 372 | |
|
434 | 373 | |
|
435 | 374 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
436 | 375 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
437 | 376 | @@ -1,3 +1,4 @@ |
|
438 | 377 | expand $Id$ |
|
439 | 378 | do not process $Id: |
|
440 | 379 | xxx $ |
|
441 | 380 | +$Xinfo$ |
|
442 | 381 | |
|
443 | 382 | |
|
444 | 383 | |
|
445 | 384 | |
|
446 | 385 | % errors encountered |
|
447 | 386 | % merge/resolve |
|
448 | 387 | % simplemerge |
|
449 | 388 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
450 | 389 | created new head |
|
451 | 390 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
452 | 391 | (branch merge, don't forget to commit) |
|
453 | 392 | $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
|
454 | 393 | foo |
|
455 | 394 | % conflict |
|
456 | 395 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
457 | 396 | created new head |
|
458 | 397 | merging m |
|
459 | 398 | warning: conflicts during merge. |
|
460 | 399 | merging m failed! |
|
461 | 400 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
462 | 401 | use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
|
463 | 402 | % keyword stays outside conflict zone |
|
464 | 403 | $Id$ |
|
465 | 404 | <<<<<<< local |
|
466 | 405 | bar |
|
467 | 406 | ======= |
|
468 | 407 | foo |
|
469 | 408 | >>>>>>> other |
|
470 | 409 | % resolve to local |
|
471 | 410 | $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
|
472 | 411 | bar |
|
473 | 412 | % switch off expansion |
|
474 | 413 | % kwshrink with unknown file u |
|
475 | 414 | overwriting a shrinking keywords |
|
476 | 415 | overwriting m shrinking keywords |
|
477 | 416 | overwriting x/a shrinking keywords |
|
478 | 417 | % cat |
|
479 | 418 | expand $Id$ |
|
480 | 419 | do not process $Id: |
|
481 | 420 | xxx $ |
|
482 | 421 | $Xinfo$ |
|
483 | 422 | ignore $Id$ |
|
484 | 423 | % hg cat |
|
485 | 424 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
486 | 425 | do not process $Id: |
|
487 | 426 | xxx $ |
|
488 | 427 | $Xinfo: User Name <user@example.com>: firstline $ |
|
489 | 428 | ignore $Id$ |
|
490 | 429 | a |
|
491 | 430 | % cat |
|
492 | 431 | expand $Id$ |
|
493 | 432 | do not process $Id: |
|
494 | 433 | xxx $ |
|
495 | 434 | $Xinfo$ |
|
496 | 435 | ignore $Id$ |
|
497 | 436 | % hg cat |
|
498 | 437 | expand $Id$ |
|
499 | 438 | do not process $Id: |
|
500 | 439 | xxx $ |
|
501 | 440 | $Xinfo$ |
|
502 | 441 | ignore $Id$ |
|
503 | 442 | a |
General Comments 0
You need to be logged in to leave comments.
Login now