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