author | Christian Ebert <blacktrash@gmx.net> |
Fri, 10 Jul 2009 12:37:34 +0200 | |
branch | 0.9.2compat |
changeset 615 | 36de1c074e13 |
parent 607 | 783774a5eff3 |
child 638 | 439e096ce144 |
permissions | -rw-r--r-- |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 |
% help |
589
3cad5778d217
(0.9.2compat) update synopsis
Christian Ebert <blacktrash@gmx.net>
parents:
581
diff
changeset
|
2 |
keyword extension - expand keywords in tracked files |
607
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
3 |
This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
4 |
text files selected by your configuration. |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
5 |
Keywords are only expanded in local repositories and not stored in the change |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
6 |
history. The mechanism can be regarded as a convenience for the current user |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
7 |
or for archive distribution. |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
8 |
Configuration is done in the [keyword] and [keywordmaps] sections of hgrc |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
9 |
files. |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
10 |
Example: |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
11 |
[keyword] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
12 |
# expand keywords in every python file except those matching "x*" |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
13 |
**.py = |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
14 |
x* = ignore |
615
36de1c074e13
(0.9.2compat) use all caps NOTE: in help string
Christian Ebert <blacktrash@gmx.net>
parents:
607
diff
changeset
|
15 |
NOTE: the more specific you are in your filename patterns the less you lose |
36de1c074e13
(0.9.2compat) use all caps NOTE: in help string
Christian Ebert <blacktrash@gmx.net>
parents:
607
diff
changeset
|
16 |
speed in huge repositories. |
607
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
17 |
For [keywordmaps] template mapping and expansion demonstration and control run |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
18 |
"hg kwdemo". |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
19 |
An additional date template filter {date|utcdate} is provided. |
607
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
20 |
The default template mappings (view with "hg kwdemo -d") can be replaced with |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
21 |
customized keywords and templates. Again, run "hg kwdemo" to control the |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
22 |
results of your config changes. |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
23 |
Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
24 |
of inadvertently storing expanded keywords in the change history. |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
25 |
To force expansion after enabling it, or a configuration change, run "hg |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
26 |
kwexpand". |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
27 |
Also, when committing with the record extension or using mq's qrecord, be |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
28 |
aware that keywords cannot be updated. Again, run "hg kwexpand" on the files |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
29 |
in question to update keyword expansions after all changes have been checked |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
30 |
in. |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
31 |
Expansions spanning more than one line and incremental expansions, like CVS' |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
32 |
$Log$, are not supported. A keyword template map "Log = {desc}" expands to the |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
33 |
first line of the changeset description. |
360
ed06223f88fc
(0.9.2compat) clean import handling when patchfile class available
Christian Ebert <blacktrash@gmx.net>
parents:
359
diff
changeset
|
34 |
Caveat: With Mercurial versions prior to 4574925db5c0 "hg import" might |
607
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
35 |
cause rejects if the patch context contains an active keyword. In that |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
36 |
case run "hg kwshrink", and then reimport. Or, better, use |
783774a5eff3
(0.9.2compat) warp docstrings at 78 chars
Christian Ebert <blacktrash@gmx.net>
parents:
598
diff
changeset
|
37 |
bundle/unbundle to share changes. |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
38 |
kwdemo print [keywordmaps] configuration and an expansion example |
574
9353633b1611
(0.9.2compat) improve English; from stable
Christian Ebert <blacktrash@gmx.net>
parents:
483
diff
changeset
|
39 |
kwexpand expand keywords in the working directory |
598
2b1565ab7db3
(0.9.2compat) lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net>
parents:
594
diff
changeset
|
40 |
kwfiles show files configured for keyword expansion |
574
9353633b1611
(0.9.2compat) improve English; from stable
Christian Ebert <blacktrash@gmx.net>
parents:
483
diff
changeset
|
41 |
kwshrink revert expanded keywords in the working directory |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
42 |
% hg kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
43 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
44 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
45 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
46 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
47 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
48 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
49 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
50 |
RCSFile = {file|basename},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
51 |
Author = {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
52 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
53 |
Source = {root}/{file},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
54 |
Date = {date|utcdate} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
55 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
56 |
Revision = {node|short} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
57 |
$RCSFile: demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
58 |
$Author: test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
59 |
$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
|
60 |
$Source: /TMP/demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
61 |
$Date: 2000/00/00 00:00:00 $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
62 |
$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
|
63 |
$Revision: xxxxxxxxxxxx $ |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
64 |
[extensions] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
65 |
hgext.keyword = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
66 |
[keyword] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
67 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
68 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
69 |
demo.txt = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
70 |
[keywordmaps] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
71 |
Branch = {branches} |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
72 |
$Branch: demobranch $ |
250
b28a2832cba4
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
249
diff
changeset
|
73 |
% kwshrink should exit silently in empty/invalid repo |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
74 |
pulling from test-keyword.hg |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
75 |
requesting all changes |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
76 |
adding changesets |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
77 |
adding manifests |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
78 |
adding file changes |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
79 |
added 1 changesets with 1 changes to 1 files |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
80 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
81 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
82 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
83 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
84 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
85 |
ignore $Id$ |
311
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
86 |
% addremove |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
87 |
adding a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
88 |
adding b |
311
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
89 |
% status |
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
90 |
A a |
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
91 |
A b |
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
92 |
% default keyword expansion including commit hook |
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
93 |
% commit |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
94 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
95 |
b |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
96 |
overwriting a expanding keywords |
311
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
97 |
running hook commit.test: cp a hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
98 |
% status |
311
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
99 |
? hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
100 |
% identify |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
101 |
475643d17242 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
102 |
% cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
103 |
expand $Id: a,v 475643d17242 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
|
104 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
105 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
106 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
107 |
% hg cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
108 |
expand $Id: a,v 475643d17242 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
|
109 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
110 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
111 |
ignore $Id$ |
311
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
112 |
|
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
113 |
% diff a hooktest |
6160401f94f2
(0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
303
diff
changeset
|
114 |
% removing commit hook from config |
387
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
115 |
% bundle |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
116 |
% pull from bundle |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
117 |
pulling from ../kw.hg |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
118 |
requesting all changes |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
119 |
adding changesets |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
120 |
adding manifests |
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
121 |
adding file changes |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
122 |
added 2 changesets with 3 changes to 3 files |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
123 |
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
|
124 |
% touch |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
126 |
% update |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
127 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
128 |
% cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
129 |
expand $Id: a,v 475643d17242 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$ |
339
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
133 |
% check whether expansion is filewise |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
134 |
% commit c |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
135 |
adding c |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
136 |
% force expansion |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
137 |
overwriting a expanding keywords |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
138 |
overwriting c expanding keywords |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
139 |
% compare changenodes in a c |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
140 |
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $ |
339
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
141 |
do not process $Id: |
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
142 |
xxx $ |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
143 |
$Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $ |
339
98336da24c5e
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
311
diff
changeset
|
144 |
tests for different changenodes |
387
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
145 |
% qinit -c |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
146 |
% qimport |
387
ecb2935f9bb8
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
380
diff
changeset
|
147 |
% qcommit |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
148 |
% keywords should not be expanded in patch |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
149 |
# HG changeset patch |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
150 |
# User User Name <user@example.com> |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
151 |
# Date 1 0 |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
152 |
# Node ID c08ff8b9d54ebf87b428631bd34b3d8b69cbf72f |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
153 |
# Parent 475643d17242703d20c30af0fc52b30fd231c6f6 |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
154 |
cndiff |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
155 |
|
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
156 |
diff -r 475643d17242 -r c08ff8b9d54e c |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
157 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
158 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
159 |
@@ -0,0 +1,2 @@ |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
160 |
+$Id$ |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
161 |
+tests for different changenodes |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
162 |
% qpop |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
163 |
Patch queue now empty |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
164 |
% qpush |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
165 |
applying mqtest.diff |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
166 |
Now at: mqtest.diff |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
167 |
% cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
168 |
$Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $ |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
169 |
tests for different changenodes |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
170 |
% qpop and move on |
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
171 |
Patch queue now empty |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
172 |
% copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
173 |
% kwfiles added |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
174 |
a |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
175 |
c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
176 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
177 |
c |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
178 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
179 |
overwriting c expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
180 |
% cat a c |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
181 |
expand $Id: a,v 475643d17242 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
|
182 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
183 |
xxx $ |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
184 |
expand $Id: c,v 1acf8f3ab611 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
|
185 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
186 |
xxx $ |
249
8df281c5ca8b
Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents:
247
diff
changeset
|
187 |
% touch copied c after 1 second |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
188 |
% status |
247 | 189 |
% kwfiles |
190 |
a |
|
191 |
c |
|
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
192 |
% diff --rev |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
193 |
diff -r 475643d17242 c |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
194 |
--- /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
|
195 |
@@ -0,0 +1,3 @@ |
348
63ebc698d06b
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents:
339
diff
changeset
|
196 |
+expand $Id$ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
197 |
+do not process $Id: |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
198 |
+xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
199 |
% rollback |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
200 |
rolling back last transaction |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
201 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
202 |
A c |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
203 |
% update -C |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
204 |
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
|
205 |
% custom keyword expansion |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
206 |
% try with kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
207 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
208 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
209 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
210 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
211 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
212 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
213 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
214 |
Xinfo = {author}: {desc} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
215 |
$Xinfo: test: hg keyword config and expansion example $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
216 |
% cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
217 |
expand $Id: a,v 475643d17242 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
|
218 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
219 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
220 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
221 |
% hg cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
222 |
expand $Id: a 475643d17242 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
|
223 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
224 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
225 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
226 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
227 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
228 |
overwriting a expanding keywords |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
229 |
% status |
480
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
230 |
% verify |
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
231 |
checking changesets |
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
232 |
checking manifests |
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
233 |
crosschecking files in changesets and manifests |
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
234 |
checking files |
c5e1178401c5
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents:
462
diff
changeset
|
235 |
3 files, 3 changesets, 4 total revisions |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
236 |
% cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
237 |
expand $Id: a 9ea11ce3ca13 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
|
238 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
239 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
240 |
$Xinfo: User Name <user@example.com>: firstline $ |
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 |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
243 |
expand $Id: a 9ea11ce3ca13 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 $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
246 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
247 |
ignore $Id$ |
462
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
248 |
a |
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
249 |
% annotate |
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
250 |
1: expand $Id$ |
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
251 |
1: do not process $Id: |
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
252 |
1: xxx $ |
f65280d03582
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
458
diff
changeset
|
253 |
2: $Xinfo$ |
215 | 254 |
% remove |
255 |
% status |
|
256 |
% rollback |
|
257 |
rolling back last transaction |
|
258 |
% status |
|
259 |
R a |
|
260 |
% revert a |
|
261 |
% cat a |
|
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
262 |
expand $Id: a 9ea11ce3ca13 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
|
263 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
264 |
xxx $ |
215 | 265 |
$Xinfo: User Name <user@example.com>: firstline $ |
266 |
% clone to test incoming |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 |
requesting all changes |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
268 |
adding changesets |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
269 |
adding manifests |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
270 |
adding file changes |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
271 |
added 2 changesets with 3 changes to 3 files |
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
272 |
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
|
273 |
% incoming |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
274 |
searching for changes |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
275 |
changeset: 2:9ea11ce3ca13 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
276 |
tag: tip |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
277 |
user: User Name <user@example.com> |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
278 |
date: Thu Jan 01 00:00:02 1970 +0000 |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
279 |
summary: firstline |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
280 |
|
281
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
281 |
% kwexpand/kwshrink on selected files |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
282 |
% copy a x/a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
283 |
% kwexpand a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
284 |
overwriting a expanding keywords |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
285 |
% kwexpand x/a should abort |
458
dd5eca480af6
(0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
434
diff
changeset
|
286 |
abort: outstanding uncommitted changes |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
287 |
x/a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
288 |
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
|
289 |
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
|
290 |
% cat a |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
291 |
expand $Id: x/a 93c8b61c99cd 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
|
292 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
293 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
294 |
$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
|
295 |
% 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
|
296 |
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
|
297 |
% cat a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
298 |
expand $Id$ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
299 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
300 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
301 |
$Xinfo$ |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
302 |
% kwexpand nonexistent |
483
ad766066d1bc
(0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents:
480
diff
changeset
|
303 |
nonexistent: |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
304 |
% switch off expansion |
267
4a24c3acd4f2
Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents:
259
diff
changeset
|
305 |
% kwshrink with unknown file u |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
306 |
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
|
307 |
overwriting x/a shrinking keywords |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
308 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
309 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
310 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
311 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
312 |
$Xinfo$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
313 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
314 |
% hg cat |
397
db7cc16560d4
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents:
387
diff
changeset
|
315 |
expand $Id: a 9ea11ce3ca13 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
|
316 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
317 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
318 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
319 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
320 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
321 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
322 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
323 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
324 |
$Xinfo$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
325 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
326 |
% hg cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
327 |
expand $Id$ |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
328 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
329 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
330 |
$Xinfo$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
331 |
ignore $Id$ |