author | Christian Ebert <blacktrash@gmx.net> |
Wed, 06 Feb 2008 00:24:49 +0100 | |
changeset 376 | f44fb15a0f30 |
parent 369 | 7f3a1076863d |
child 378 | 0683aaf458d8 |
permissions | -rw-r--r-- |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 |
% help |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
2 |
keyword extension - keyword expansion in local repositories |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
3 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
4 |
This extension expands RCS/CVS-like or self-customized $Keywords$ |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
5 |
in tracked text files selected by your configuration. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
6 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
7 |
Keywords are only expanded in local repositories and not stored in |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
8 |
the change history. The mechanism can be regarded as a convenience |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
9 |
for the current user or for archive distribution. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
10 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
11 |
Configuration is done in the [keyword] and [keywordmaps] sections |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
12 |
of hgrc files. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
13 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
14 |
Example: |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
15 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
16 |
[keyword] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
17 |
# expand keywords in every python file except those matching "x*" |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
18 |
**.py = |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
19 |
x* = ignore |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
20 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
21 |
Note: the more specific you are in your filename patterns |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
22 |
the less you lose speed in huge repos. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
23 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
24 |
For [keywordmaps] template mapping and expansion demonstration and |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
25 |
control run "hg kwdemo". |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
26 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
27 |
An additional date template filter {date|utcdate} is provided. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
28 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
29 |
The default template mappings (view with "hg kwdemo -d") can be replaced |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
30 |
with customized keywords and templates. |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
31 |
Again, run "hg kwdemo" to control the results of your config changes. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
32 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
33 |
Before changing/disabling active keywords, run "hg kwshrink" to avoid |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
34 |
the risk of inadvertedly storing expanded keywords in the change history. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
35 |
|
211
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
36 |
To force expansion after enabling it, or a configuration change, run |
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
37 |
"hg kwexpand". |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
38 |
|
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
39 |
Also, when committing with the record extension or using mq's qrecord, be aware |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
40 |
that keywords cannot be updated. Again, run "hg kwexpand" on the files in |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
41 |
question to update keyword expansions after all changes have been checked in. |
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
42 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
43 |
Expansions spanning more than one line and incremental expansions, |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
44 |
like CVS' $Log$, are not supported. A keyword template map |
201
e826c3cdc52d
Make sure there are no newlines in expansion
Christian Ebert <blacktrash@gmx.net>
parents:
189
diff
changeset
|
45 |
"Log = {desc}" expands to the first line of the changeset description. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
46 |
|
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
47 |
list of commands: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
48 |
|
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
49 |
kwcat output the current or given revision of files expanding keywords |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
kwdemo print [keywordmaps] configuration and an expansion example |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
51 |
kwexpand expand keywords in working directory |
247 | 52 |
kwfiles print files currently configured for keyword expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
53 |
kwshrink revert expanded keywords in working directory |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
54 |
|
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
55 |
use "hg -v help keyword" to show aliases and global options |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
56 |
% hg kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
57 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
58 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
59 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
60 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
61 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
62 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
63 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
64 |
RCSFile = {file|basename},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
65 |
Author = {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
66 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
67 |
Source = {root}/{file},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
68 |
Date = {date|utcdate} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
69 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
70 |
Revision = {node|short} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
71 |
$RCSFile: demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
72 |
$Author: test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
73 |
$Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
74 |
$Source: /TMP/demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
75 |
$Date: 2000/00/00 00:00:00 $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
76 |
$Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
77 |
$Revision: xxxxxxxxxxxx $ |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
78 |
[extensions] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
79 |
hgext.keyword = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
80 |
[keyword] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
81 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
82 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
83 |
demo.txt = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
84 |
[keywordmaps] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
85 |
Branch = {branches} |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
86 |
$Branch: demobranch $ |
250
b28a2832cba4
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
249
diff
changeset
|
87 |
% kwshrink should exit silently in empty/invalid repo |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
88 |
% symlink nonexisting file |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
89 |
% commit hook must fail with missing file |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
90 |
cp: a: No such file or directory |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
91 |
adding sym |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
92 |
sym |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
93 |
running hook commit.test: cp a hooktest |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
94 |
warning: commit.test hook exited with status 1 |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
95 |
% bundle null revision containing empty symlink |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
96 |
1 changesets found |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
97 |
% pull from bundle |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
98 |
pulling from ../test-keyword.hg |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
99 |
requesting all changes |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
100 |
adding changesets |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
101 |
adding manifests |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
102 |
adding file changes |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
103 |
added 1 changesets with 1 changes to 1 files |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
104 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
105 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
106 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
107 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
108 |
xxx $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
109 |
expand $Id$ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
110 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
111 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
112 |
ignore $Id$ |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
113 |
% addremove |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
114 |
adding a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
115 |
adding b |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
116 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
117 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
118 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
119 |
% default keyword expansion including commit hook |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
120 |
% interrupted commit should not change state or run commit hook |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
121 |
a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
122 |
b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
123 |
transaction abort! |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
124 |
rollback completed |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
125 |
abort: empty commit message |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
126 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
127 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
128 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
129 |
% commit |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
130 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
131 |
b |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
132 |
overwriting a expanding keywords |
294 | 133 |
running hook commit.test: cp a hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
134 |
% status |
294 | 135 |
? hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
136 |
% identify |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
137 |
cecf1e2cc3d3 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
138 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
139 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
140 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
141 |
xxx $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
142 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
143 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
144 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
145 |
ignore $Id$ |
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
146 |
% hg kwcat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
147 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
148 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
149 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
150 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
151 |
a |
294 | 152 |
% diff a hooktest |
153 |
% removing commit hook from config |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
154 |
% touch |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
155 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
156 |
% update |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
157 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
158 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
159 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
160 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
161 |
xxx $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
162 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
163 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
164 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
165 |
ignore $Id$ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
166 |
% check whether expansion is filewise |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
167 |
% commit c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
168 |
adding c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
169 |
% force expansion |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
170 |
overwriting a expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
171 |
overwriting c expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
172 |
% compare changenodes in a c |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
173 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
174 |
do not process $Id: |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
175 |
xxx $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
176 |
$Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
177 |
tests for different changenodes |
365
e99ace93ded0
Disable expansion in mq directory; add test for qcommit
Christian Ebert <blacktrash@gmx.net>
parents:
356
diff
changeset
|
178 |
% qinit -c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
179 |
% qimport |
365
e99ace93ded0
Disable expansion in mq directory; add test for qcommit
Christian Ebert <blacktrash@gmx.net>
parents:
356
diff
changeset
|
180 |
% qcommit |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
181 |
% keywords should not be expanded in patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
182 |
# HG changeset patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
183 |
# User User Name <user@example.com> |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
184 |
# Date 2 0 |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
185 |
# Node ID c033759cd8fd162b7863dc4e5d1eea433603880f |
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
186 |
# Parent cecf1e2cc3d3447fcc20dd4eac5c4faa8a615df3 |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
187 |
cndiff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
188 |
|
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
189 |
diff -r cecf1e2cc3d3 -r c033759cd8fd c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
190 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
191 |
+++ b/c Thu Jan 01 00:00:02 1970 +0000 |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
192 |
@@ -0,0 +1,2 @@ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
193 |
+$Id$ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
194 |
+tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
195 |
% qpop |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
196 |
Patch queue now empty |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
197 |
% qgoto - should imply qpush |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
198 |
applying mqtest.diff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
199 |
Now at: mqtest.diff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
200 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
201 |
$Id: c,v c033759cd8fd 1970/01/01 00:00:02 user $ |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
202 |
tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
203 |
% qpop and move on |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
204 |
Patch queue now empty |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
205 |
% copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
206 |
% kwfiles added |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
207 |
a |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
208 |
c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
209 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
210 |
c |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
211 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
212 |
overwriting c expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
213 |
% cat a c |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
214 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
215 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
216 |
xxx $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
217 |
expand $Id: c,v 1fed52d26fd0 1970/01/01 00:00:02 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
218 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
219 |
xxx $ |
249
8df281c5ca8b
Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents:
247
diff
changeset
|
220 |
% touch copied c after 1 second |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 |
% status |
247 | 222 |
% kwfiles |
223 |
a |
|
224 |
c |
|
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
225 |
% diff --rev |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
226 |
diff -r cecf1e2cc3d3 c |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
227 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
228 |
@@ -0,0 +1,3 @@ |
341
5ef2b11df3d3
Avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
340
diff
changeset
|
229 |
+expand $Id$ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
230 |
+do not process $Id: |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
231 |
+xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 |
% rollback |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
233 |
rolling back last transaction |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
234 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
235 |
A c |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
236 |
% update -C |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
237 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
238 |
% custom keyword expansion |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
239 |
% try with kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
240 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
241 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
242 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
243 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
244 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
245 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
246 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
247 |
Xinfo = {author}: {desc} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
248 |
$Xinfo: test: hg keyword config and expansion example $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
249 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
250 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
251 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
252 |
xxx $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
253 |
expand $Id: a,v cecf1e2cc3d3 1970/01/01 00:00:01 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
254 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
255 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
256 |
ignore $Id$ |
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
257 |
% hg kwcat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
258 |
expand $Id: a cecf1e2cc3d3 Thu, 01 Jan 1970 00:00:01 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
259 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
260 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
261 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
262 |
a |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
263 |
% interrupted commit should not change state |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
264 |
transaction abort! |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 |
rollback completed |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
266 |
abort: empty commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
268 |
M a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
269 |
? log |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
270 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
271 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
272 |
overwriting a expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
275 |
expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
276 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
277 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
278 |
$Xinfo: User Name <user@example.com>: firstline $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
279 |
expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
280 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
281 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
282 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
283 |
ignore $Id$ |
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
284 |
% hg kwcat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
285 |
expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
286 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
287 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
288 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
290 |
a |
215 | 291 |
% remove |
292 |
% status |
|
293 |
% rollback |
|
294 |
rolling back last transaction |
|
295 |
% status |
|
296 |
R a |
|
297 |
% revert a |
|
298 |
% cat a |
|
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
299 |
expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
300 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
301 |
xxx $ |
215 | 302 |
$Xinfo: User Name <user@example.com>: firstline $ |
303 |
% clone to test incoming |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
304 |
requesting all changes |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
305 |
adding changesets |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
306 |
adding manifests |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
307 |
adding file changes |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
308 |
added 2 changesets with 3 changes to 3 files |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
309 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
310 |
% incoming |
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
311 |
comparing with test-keyword/Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
312 |
searching for changes |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
313 |
changeset: 2:a576e5647736 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
314 |
tag: tip |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
315 |
user: User Name <user@example.com> |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
316 |
date: Thu Jan 01 00:00:03 1970 +0000 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
317 |
summary: firstline |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
318 |
|
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
319 |
% commit rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
320 |
a |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
321 |
overwriting a expanding keywords |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
322 |
% export |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
323 |
% import |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
324 |
applying ../rejecttest.diff |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
325 |
% cat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
326 |
expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
327 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
328 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
329 |
$Xinfo: User Name <user@example.com>: rejects? $ |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
330 |
expand $Id: a 97b8d4afd122 Thu, 01 Jan 1970 00:00:04 +0000 user $ rejecttest |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
331 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
332 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
333 |
$Xinfo: User Name <user@example.com>: rejects? $ |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
334 |
ignore $Id$ |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
335 |
|
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
336 |
% rollback |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
337 |
rolling back last transaction |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
338 |
% clean update |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
339 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
340 |
% kwexpand/kwshrink on selected files |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
341 |
% copy a x/a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
342 |
% kwexpand a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
343 |
overwriting a expanding keywords |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
344 |
% kwexpand x/a should abort |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
345 |
abort: outstanding uncommitted changes in given files |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
346 |
x/a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
347 |
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
348 |
overwriting x/a expanding keywords |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
349 |
% cat a |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
350 |
expand $Id: x/a 6ae8e7fbf16c Thu, 01 Jan 1970 00:00:04 +0000 user $ |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
351 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
352 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
353 |
$Xinfo: User Name <user@example.com>: xa $ |
281
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
354 |
% kwshrink a inside directory x |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
355 |
overwriting x/a shrinking keywords |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
356 |
% cat a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
357 |
expand $Id$ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
358 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
359 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
360 |
$Xinfo$ |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
361 |
% kwexpand nonexistent |
280
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
279
diff
changeset
|
362 |
nonexistent: No such file or directory |
267
4a24c3acd4f2
Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents:
259
diff
changeset
|
363 |
% kwshrink with unknown file u |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
364 |
overwriting a shrinking keywords |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
365 |
overwriting x/a shrinking keywords |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
366 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
367 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
368 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
369 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
370 |
$Xinfo$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
371 |
expand $Id$ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
372 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
373 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
374 |
$Xinfo$ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
375 |
ignore $Id$ |
356
d0e8910bbb4b
Update test using kwcat
Christian Ebert <blacktrash@gmx.net>
parents:
342
diff
changeset
|
376 |
% hg kwcat |
376
f44fb15a0f30
Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net>
parents:
369
diff
changeset
|
377 |
expand $Id: a a576e5647736 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
378 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
379 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
380 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
381 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
382 |
a |