author | Christian Ebert <blacktrash@gmx.net> |
Wed, 23 Jan 2008 09:53:40 +0100 | |
changeset 346 | 2c2b49def9d8 |
parent 342 | abf7ccaf0788 |
child 356 | d0e8910bbb4b |
child 362 | 3ea0cbaf3535 |
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 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
49 |
kwdemo print [keywordmaps] configuration and an expansion example |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
kwexpand expand keywords in working directory |
247 | 51 |
kwfiles print files currently configured for keyword expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
52 |
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
|
53 |
|
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
54 |
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
|
55 |
% hg kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
56 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
57 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
58 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
59 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
60 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
61 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
62 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
63 |
RCSFile = {file|basename},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
64 |
Author = {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
65 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
66 |
Source = {root}/{file},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
67 |
Date = {date|utcdate} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
68 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
69 |
Revision = {node|short} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
70 |
$RCSFile: demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
71 |
$Author: test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
72 |
$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
|
73 |
$Source: /TMP/demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
74 |
$Date: 2000/00/00 00:00:00 $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
75 |
$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
|
76 |
$Revision: xxxxxxxxxxxx $ |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
77 |
[extensions] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
78 |
hgext.keyword = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
79 |
[keyword] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
80 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
81 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
82 |
demo.txt = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
83 |
[keywordmaps] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
84 |
Branch = {branches} |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
85 |
$Branch: demobranch $ |
250
b28a2832cba4
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
249
diff
changeset
|
86 |
% kwshrink should exit silently in empty/invalid repo |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
87 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
88 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
89 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
90 |
xxx $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
91 |
expand $Id$ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
92 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
93 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
94 |
ignore $Id$ |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
95 |
% addremove |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
96 |
adding a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
97 |
adding b |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
98 |
adding sym |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
99 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
100 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
101 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
102 |
A sym |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
103 |
% 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
|
104 |
% 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
|
105 |
a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
106 |
b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
107 |
sym |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
108 |
transaction abort! |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
109 |
rollback completed |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
110 |
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
|
111 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
112 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
113 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
114 |
A sym |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
115 |
% commit |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
116 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
117 |
b |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
118 |
sym |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
119 |
overwriting a expanding keywords |
294 | 120 |
running hook commit.test: cp a hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
121 |
% status |
294 | 122 |
? hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
123 |
% identify |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
124 |
f782df5f9602 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 |
% cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
126 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
127 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
128 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
129 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
130 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
131 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
132 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
133 |
% hg cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
134 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
135 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
136 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
137 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
138 |
a |
294 | 139 |
% diff a hooktest |
140 |
% removing commit hook from config |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
141 |
% touch |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
142 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
143 |
% update |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
144 |
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
|
145 |
% cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
146 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
147 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
148 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
149 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
150 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
151 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
152 |
ignore $Id$ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
153 |
% check whether expansion is filewise |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
154 |
% commit c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
155 |
adding c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
156 |
% force expansion |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
157 |
overwriting a expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
158 |
overwriting c expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
159 |
% compare changenodes in a c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
160 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
161 |
do not process $Id: |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
162 |
xxx $ |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
163 |
$Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
164 |
tests for different changenodes |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
165 |
% qimport |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
166 |
% keywords should not be expanded in patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
167 |
# HG changeset patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
168 |
# User User Name <user@example.com> |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
169 |
# Date 1 0 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
170 |
# Node ID ba4426d1938ec9673e03ab274d88c44e24618f7f |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
171 |
# Parent f782df5f9602483b4e51c31a12315f353bba380c |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
172 |
cndiff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
173 |
|
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
174 |
diff -r f782df5f9602 -r ba4426d1938e c |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
175 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
176 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
177 |
@@ -0,0 +1,2 @@ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
178 |
+$Id$ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
179 |
+tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
180 |
% qpop |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
181 |
Patch queue now empty |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
182 |
% qgoto - should imply qpush |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
183 |
applying mqtest.diff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
184 |
Now at: mqtest.diff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
185 |
% cat |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
186 |
$Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
187 |
tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
188 |
% qpop and move on |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
189 |
Patch queue now empty |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
190 |
% copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
191 |
% kwfiles added |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
192 |
a |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
193 |
c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
194 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
195 |
c |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
196 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
197 |
overwriting c expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
198 |
% cat a c |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
199 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
200 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
201 |
xxx $ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
202 |
expand $Id: c,v 0ba462c0f077 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
|
203 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
204 |
xxx $ |
249
8df281c5ca8b
Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents:
247
diff
changeset
|
205 |
% touch copied c after 1 second |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
206 |
% status |
247 | 207 |
% kwfiles |
208 |
a |
|
209 |
c |
|
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
210 |
% diff --rev |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
211 |
diff -r f782df5f9602 c |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
212 |
--- /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
|
213 |
@@ -0,0 +1,3 @@ |
341
5ef2b11df3d3
Avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
340
diff
changeset
|
214 |
+expand $Id$ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
215 |
+do not process $Id: |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
216 |
+xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
217 |
% rollback |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
218 |
rolling back last transaction |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
219 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
220 |
A c |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 |
% update -C |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
222 |
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
|
223 |
% custom keyword expansion |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
224 |
% try with kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
225 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
226 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
227 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
228 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
229 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
230 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
231 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 |
Xinfo = {author}: {desc} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
233 |
$Xinfo: test: hg keyword config and expansion example $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
234 |
% cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
235 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
236 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
237 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
238 |
expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
239 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
240 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
241 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
242 |
% hg cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
243 |
expand $Id: a f782df5f9602 Thu, 01 Jan 1970 00:00:00 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
244 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
245 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
246 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
247 |
a |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
248 |
% interrupted commit should not change state |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
249 |
transaction abort! |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
250 |
rollback completed |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
251 |
abort: empty commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
252 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
253 |
M a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
254 |
? log |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
256 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
257 |
overwriting a expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
258 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
259 |
% cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
260 |
expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
261 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
262 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
263 |
$Xinfo: User Name <user@example.com>: firstline $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
264 |
expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
265 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
266 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
268 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
269 |
% hg cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
270 |
expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
271 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
272 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
275 |
a |
215 | 276 |
% remove |
277 |
% status |
|
278 |
% rollback |
|
279 |
rolling back last transaction |
|
280 |
% status |
|
281 |
R a |
|
282 |
% revert a |
|
283 |
% cat a |
|
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
284 |
expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
285 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
286 |
xxx $ |
215 | 287 |
$Xinfo: User Name <user@example.com>: firstline $ |
288 |
% clone to test incoming |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
requesting all changes |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
290 |
adding changesets |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
291 |
adding manifests |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
292 |
adding file changes |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
293 |
added 1 changesets with 3 changes to 3 files |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
294 |
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
|
295 |
% incoming |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
296 |
comparing with test-keyword/Test-a/../Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
297 |
searching for changes |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
298 |
changeset: 1:0729690beff6 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
299 |
tag: tip |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
300 |
user: User Name <user@example.com> |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
301 |
date: Thu Jan 01 00:00:02 1970 +0000 |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
302 |
summary: firstline |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
303 |
|
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
304 |
% commit rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
305 |
a |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
306 |
overwriting a expanding keywords |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
307 |
% export |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
308 |
% import |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
309 |
applying ../rejecttest.diff |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
310 |
% cat |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
311 |
expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
312 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
313 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
314 |
$Xinfo: User Name <user@example.com>: rejects? $ |
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
315 |
expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
316 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
317 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
318 |
$Xinfo: User Name <user@example.com>: rejects? $ |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
319 |
ignore $Id$ |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
320 |
|
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
321 |
% rollback |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
322 |
rolling back last transaction |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
323 |
% clean update |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
324 |
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
|
325 |
% kwexpand/kwshrink on selected files |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
326 |
% copy a x/a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
327 |
% kwexpand a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
328 |
overwriting a expanding keywords |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
329 |
% kwexpand x/a should abort |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
330 |
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
|
331 |
x/a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
332 |
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
|
333 |
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
|
334 |
% cat a |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
335 |
expand $Id: x/a f27c134d2d9b Thu, 01 Jan 1970 00:00:03 +0000 user $ |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
336 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
337 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
338 |
$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
|
339 |
% 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
|
340 |
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
|
341 |
% cat a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
342 |
expand $Id$ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
343 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
344 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
345 |
$Xinfo$ |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
346 |
% kwexpand nonexistent |
280
2088e409d360
Revert to using status for kw-commands
Christian Ebert <blacktrash@gmx.net>
parents:
279
diff
changeset
|
347 |
nonexistent: No such file or directory |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
348 |
% switch off expansion |
267
4a24c3acd4f2
Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents:
259
diff
changeset
|
349 |
% kwshrink with unknown file u |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
350 |
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
|
351 |
overwriting x/a shrinking keywords |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
352 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
353 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
354 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
355 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
356 |
$Xinfo$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
357 |
expand $Id$ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
358 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
359 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
360 |
$Xinfo$ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
361 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
362 |
% hg cat |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
363 |
expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
364 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
365 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
366 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
367 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
368 |
a |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
369 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
370 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
371 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
372 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
373 |
$Xinfo$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
374 |
expand $Id$ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
375 |
do not process $Id: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
376 |
xxx $ |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
377 |
$Xinfo$ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
378 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
379 |
% hg cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
380 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
381 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
382 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
383 |
$Xinfo$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
384 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
385 |
a |