author | C?dric Duval <cedricduval@free.fr> |
Mon, 22 Jun 2009 15:48:08 +0200 | |
branch | stable |
changeset 584 | 763d20224433 |
parent 579 | 1dc66cff9dd5 |
child 586 | 8718bbaf4000 |
permissions | -rw-r--r-- |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
1 |
% help |
584
763d20224433
extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents:
579
diff
changeset
|
2 |
keyword extension - expand keywords in tracked files |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
3 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
4 |
This extension expands RCS/CVS-like or self-customized $Keywords$ in |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
5 |
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 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
7 |
Keywords are only expanded in local repositories and not stored in the |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
8 |
change history. The mechanism can be regarded as a convenience for the |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
9 |
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 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
11 |
Configuration is done in the [keyword] and [keywordmaps] sections of |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
12 |
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 |
529
7197324dfa4d
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents:
527
diff
changeset
|
22 |
the less you lose speed in huge repositories. |
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 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
29 |
The default template mappings (view with "hg kwdemo -d") can be |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
30 |
replaced with customized keywords and templates. Again, run "hg |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
31 |
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 |
554
2fc480f3e148
fixed typos found in translatable strings
Martin Geisler <mg@lazybytes.net>
parents:
547
diff
changeset
|
34 |
the risk of inadvertently storing expanded keywords in the change |
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
35 |
history. |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
36 |
|
211
110c76a94d1c
help: no need for kwexpand after import, but after config change
Christian Ebert <blacktrash@gmx.net>
parents:
210
diff
changeset
|
37 |
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
|
38 |
"hg kwexpand". |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
39 |
|
527
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
40 |
Also, when committing with the record extension or using mq's qrecord, |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
41 |
be aware that keywords cannot be updated. Again, run "hg kwexpand" on |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
42 |
the files in question to update keyword expansions after all changes |
59cb740ebf83
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
521
diff
changeset
|
43 |
have been checked in. |
340
9e9f6cbcf20b
Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
44 |
|
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
45 |
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
|
46 |
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
|
47 |
"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
|
48 |
|
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
49 |
list of commands: |
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
50 |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
51 |
kwdemo print [keywordmaps] configuration and an expansion example |
573 | 52 |
kwexpand expand keywords in the working directory |
247 | 53 |
kwfiles print files currently configured for keyword expansion |
573 | 54 |
kwshrink revert expanded keywords in the working directory |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
55 |
|
497
1c881f07bcb1
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
493
diff
changeset
|
56 |
enabled extensions: |
1c881f07bcb1
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
493
diff
changeset
|
57 |
|
584
763d20224433
extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents:
579
diff
changeset
|
58 |
keyword expand keywords in tracked files |
763d20224433
extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents:
579
diff
changeset
|
59 |
mq work with a stack of patches |
763d20224433
extensions: improve the consistency of synopses
C?dric Duval <cedricduval@free.fr>
parents:
579
diff
changeset
|
60 |
notify send e-mail notifications for commits/pushes |
497
1c881f07bcb1
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
493
diff
changeset
|
61 |
|
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
62 |
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
|
63 |
% hg kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
64 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
65 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
66 |
[keyword] |
210
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 = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
70 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
71 |
RCSFile = {file|basename},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
72 |
Author = {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
73 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
74 |
Source = {root}/{file},v |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
75 |
Date = {date|utcdate} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
76 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
77 |
Revision = {node|short} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
78 |
$RCSFile: demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
79 |
$Author: test $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
80 |
$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
|
81 |
$Source: /TMP/demo.txt,v $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
82 |
$Date: 2000/00/00 00:00:00 $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
83 |
$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
|
84 |
$Revision: xxxxxxxxxxxx $ |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
85 |
[extensions] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
86 |
hgext.keyword = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
87 |
[keyword] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
88 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
89 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
90 |
demo.txt = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
91 |
[keywordmaps] |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
92 |
Branch = {branches} |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
93 |
$Branch: demobranch $ |
250
b28a2832cba4
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents:
249
diff
changeset
|
94 |
% kwshrink should exit silently in empty/invalid repo |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
95 |
pulling from test-keyword.hg |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
96 |
requesting all changes |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
97 |
adding changesets |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
98 |
adding manifests |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
99 |
adding file changes |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
100 |
added 1 changesets with 1 changes to 1 files |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
101 |
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
|
102 |
% cat |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
103 |
expand $Id$ |
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$ |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
107 |
% addremove |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
108 |
adding a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
109 |
adding b |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
110 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
111 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
112 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
113 |
% 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
|
114 |
% interrupted commit should not change state or run commit hook |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
115 |
abort: empty commit message |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
116 |
% status |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
117 |
A a |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
118 |
A b |
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
119 |
% commit |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
120 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
121 |
b |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
122 |
overwriting a expanding keywords |
294 | 123 |
running hook commit.test: cp a hooktest |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
124 |
committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 |
% status |
294 | 126 |
? hooktest |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
127 |
% identify |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
128 |
ef63ca68695b |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
129 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
130 |
expand $Id: a,v ef63ca68695b 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$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
134 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
135 |
expand $Id: a,v ef63ca68695b 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
|
136 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
137 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
138 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
139 |
a |
294 | 140 |
% diff a hooktest |
141 |
% removing commit hook from config |
|
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
142 |
% bundle |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
143 |
2 changesets found |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
144 |
% notify on pull to check whether keywords stay as is in email |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
145 |
% ie. if patch.diff wrapper acts as it should |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
146 |
% pull from bundle |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
147 |
pulling from ../kw.hg |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
148 |
requesting all changes |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
149 |
adding changesets |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
150 |
adding manifests |
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
151 |
adding file changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
152 |
added 2 changesets with 3 changes to 3 files |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
153 |
|
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
154 |
diff -r 000000000000 -r a2392c293916 sym |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
155 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
156 |
+++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
157 |
@@ -0,0 +1,1 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
158 |
+a |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
159 |
\ No newline at end of file |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
160 |
|
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
161 |
diff -r a2392c293916 -r ef63ca68695b a |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
162 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
163 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
164 |
@@ -0,0 +1,3 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
165 |
+expand $Id$ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
166 |
+do not process $Id: |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
167 |
+xxx $ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
168 |
diff -r a2392c293916 -r ef63ca68695b b |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
169 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
170 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
171 |
@@ -0,0 +1,1 @@ |
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
172 |
+ignore $Id$ |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
173 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
174 |
% remove notify config |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
175 |
% touch |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
176 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
177 |
% update |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
178 |
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
|
179 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
180 |
expand $Id: a,v ef63ca68695b 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
|
181 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
182 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
183 |
ignore $Id$ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
184 |
% check whether expansion is filewise |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
185 |
% commit c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
186 |
adding c |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
187 |
% force expansion |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
188 |
overwriting a expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
189 |
overwriting c expanding keywords |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
190 |
% compare changenodes in a c |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
191 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
192 |
do not process $Id: |
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
193 |
xxx $ |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
194 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
323
diff
changeset
|
195 |
tests for different changenodes |
381
17e94f77de6a
Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents:
378
diff
changeset
|
196 |
% qinit -c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
197 |
% qimport |
381
17e94f77de6a
Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents:
378
diff
changeset
|
198 |
% qcommit |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
199 |
% keywords should not be expanded in patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
200 |
# HG changeset patch |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
201 |
# User User Name <user@example.com> |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
202 |
# Date 1 0 |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
203 |
# Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
204 |
# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
205 |
cndiff |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
206 |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
207 |
diff -r ef63ca68695b -r 40a904bbbe4c c |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
208 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
209 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
210 |
@@ -0,0 +1,2 @@ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
211 |
+$Id$ |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
212 |
+tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
213 |
% qpop |
520 | 214 |
patch queue now empty |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
215 |
% qgoto - should imply qpush |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
216 |
applying mqtest.diff |
520 | 217 |
now at: mqtest.diff |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
218 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
219 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
220 |
tests for different changenodes |
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
341
diff
changeset
|
221 |
% qpop and move on |
520 | 222 |
patch queue now empty |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
223 |
% copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
224 |
% kwfiles added |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
225 |
a |
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
256
diff
changeset
|
226 |
c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
227 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
228 |
c |
223
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
229 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
230 |
overwriting c expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
231 |
committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
232 |
% cat a c |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
233 |
expand $Id: a,v ef63ca68695b 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
|
234 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
235 |
xxx $ |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
236 |
expand $Id: c,v e22d299ac0c2 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
|
237 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
238 |
xxx $ |
426
671d2e27d388
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
409
diff
changeset
|
239 |
% touch copied c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
240 |
% status |
247 | 241 |
% kwfiles |
242 |
a |
|
243 |
c |
|
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
244 |
% diff --rev |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
245 |
diff -r ef63ca68695b c |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
246 |
--- /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
|
247 |
@@ -0,0 +1,3 @@ |
341
5ef2b11df3d3
Avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
340
diff
changeset
|
248 |
+expand $Id$ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
249 |
+do not process $Id: |
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
250 |
+xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
251 |
% rollback |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
252 |
rolling back last transaction |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
253 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
254 |
A c |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
255 |
% update -C |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
256 |
0 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
|
257 |
% custom keyword expansion |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
258 |
% try with kwdemo |
208
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
259 |
[extensions] |
5afdcec8a01f
Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents:
203
diff
changeset
|
260 |
hgext.keyword = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
261 |
[keyword] |
210
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
262 |
* = |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
263 |
b = ignore |
304f9ac35869
kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents:
209
diff
changeset
|
264 |
demo.txt = |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
265 |
[keywordmaps] |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
266 |
Xinfo = {author}: {desc} |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
267 |
$Xinfo: test: hg keyword config and expansion example $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
268 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
269 |
expand $Id: a,v ef63ca68695b 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
|
270 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
271 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
272 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
273 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
274 |
expand $Id: a ef63ca68695b 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
|
275 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
276 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
277 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
278 |
a |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
279 |
% interrupted commit should not change state |
337
67b4decdee67
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
323
diff
changeset
|
280 |
abort: empty commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 |
% status |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
282 |
M a |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
283 |
? c |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
284 |
? log |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
285 |
% commit |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
286 |
a |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
287 |
overwriting a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
288 |
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
% status |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
290 |
? c |
479
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
291 |
% verify |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
292 |
checking changesets |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
293 |
checking manifests |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
294 |
crosschecking files in changesets and manifests |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
295 |
checking files |
18f235294dda
Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
476
diff
changeset
|
296 |
3 files, 3 changesets, 4 total revisions |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
297 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
298 |
expand $Id: a bb948857c743 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
|
299 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
300 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
301 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
302 |
ignore $Id$ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
303 |
% hg cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
304 |
expand $Id: a bb948857c743 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
|
305 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
306 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
307 |
$Xinfo: User Name <user@example.com>: firstline $ |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
308 |
ignore $Id$ |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
309 |
a |
463
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
310 |
% annotate |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
311 |
1: expand $Id$ |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
312 |
1: do not process $Id: |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
313 |
1: xxx $ |
55f535bc13bc
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
429
diff
changeset
|
314 |
2: $Xinfo$ |
215 | 315 |
% remove |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
316 |
committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
215 | 317 |
% status |
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
318 |
? c |
215 | 319 |
% rollback |
320 |
rolling back last transaction |
|
321 |
% status |
|
322 |
R a |
|
547
e44b46c85b72
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
545
diff
changeset
|
323 |
? c |
215 | 324 |
% revert a |
325 |
% cat a |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
326 |
expand $Id: a bb948857c743 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
|
327 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
328 |
xxx $ |
215 | 329 |
$Xinfo: User Name <user@example.com>: firstline $ |
330 |
% clone to test incoming |
|
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
331 |
requesting all changes |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
332 |
adding changesets |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
333 |
adding manifests |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
334 |
adding file changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
335 |
added 2 changesets with 3 changes to 3 files |
427
39fef460b62c
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
426
diff
changeset
|
336 |
updating working directory |
290
b05795ad5632
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents:
281
diff
changeset
|
337 |
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
|
338 |
% incoming |
362
3ea0cbaf3535
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
342
diff
changeset
|
339 |
comparing with test-keyword/Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
340 |
searching for changes |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
341 |
changeset: 2:bb948857c743 |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
342 |
tag: tip |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
343 |
user: User Name <user@example.com> |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
344 |
date: Thu Jan 01 00:00:02 1970 +0000 |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
345 |
summary: firstline |
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
346 |
|
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
347 |
% commit rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
348 |
a |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
349 |
overwriting a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
350 |
committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
351 |
% export |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
352 |
% import |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
353 |
applying ../rejecttest.diff |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
354 |
% cat |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
355 |
expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
356 |
do not process $Id: rejecttest |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
357 |
xxx $ |
323
9107f7a3fd12
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents:
316
diff
changeset
|
358 |
$Xinfo: User Name <user@example.com>: rejects? $ |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
359 |
ignore $Id$ |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
360 |
|
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
361 |
% rollback |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
362 |
rolling back last transaction |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
363 |
% clean update |
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
364 |
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
|
365 |
% kwexpand/kwshrink on selected files |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
366 |
% copy a x/a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
367 |
% kwexpand a |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
368 |
overwriting a expanding keywords |
c6314b110e67
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents:
280
diff
changeset
|
369 |
% kwexpand x/a should abort |
465
2f017ca736ce
(stable) mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
463
diff
changeset
|
370 |
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
|
371 |
x/a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
372 |
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
|
373 |
overwriting x/a expanding keywords |
491
9cf55f18adad
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
490
diff
changeset
|
374 |
committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
375 |
% cat a |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
376 |
expand $Id: x/a cfa68229c116 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
|
377 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
378 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
379 |
$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
|
380 |
% 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
|
381 |
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
|
382 |
% cat a |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
383 |
expand $Id$ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
384 |
do not process $Id: |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
385 |
xxx $ |
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
386 |
$Xinfo$ |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
387 |
% kwexpand nonexistent |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
388 |
nonexistent: |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
389 |
% hg serve |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
390 |
% expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
391 |
% hgweb file |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
392 |
200 Script output follows |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
393 |
|
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
394 |
expand $Id: a bb948857c743 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
|
395 |
do not process $Id: |
65a01675a944
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents:
215
diff
changeset
|
396 |
xxx $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
397 |
$Xinfo: User Name <user@example.com>: firstline $ |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
398 |
% no expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
399 |
% hgweb annotate |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
400 |
200 Script output follows |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
401 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
402 |
|
493
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
403 |
user@1: expand $Id$ |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
404 |
user@1: do not process $Id: |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
405 |
user@1: xxx $ |
6a75bd9be8ef
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
491
diff
changeset
|
406 |
user@2: $Xinfo$ |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
407 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
408 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
409 |
|
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
410 |
|
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
411 |
% hgweb changeset |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
412 |
200 Script output follows |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
413 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
414 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
415 |
# HG changeset patch |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
416 |
# User User Name <user@example.com> |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
417 |
# Date 3 0 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
418 |
# Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
512
7d0a5e7b279d
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
498
diff
changeset
|
419 |
# Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
429
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
420 |
xa |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
421 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
422 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
423 |
+++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
424 |
@@ -0,0 +1,4 @@ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
425 |
+expand $Id$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
426 |
+do not process $Id: |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
427 |
+xxx $ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
428 |
+$Xinfo$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
429 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
430 |
% hgweb filediff |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
431 |
200 Script output follows |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
432 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
433 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
434 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
435 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
436 |
@@ -1,3 +1,4 @@ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
437 |
expand $Id$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
438 |
do not process $Id: |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
439 |
xxx $ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
440 |
+$Xinfo$ |
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
441 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
442 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
443 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
444 |
|
688d71563c07
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
427
diff
changeset
|
445 |
% errors encountered |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
446 |
% merge/resolve |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
447 |
% simplemerge |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
448 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
449 |
created new head |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
450 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
451 |
(branch merge, don't forget to commit) |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
452 |
$Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
453 |
foo |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
454 |
% conflict |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
455 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
456 |
created new head |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
457 |
merging m |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
458 |
warning: conflicts during merge. |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
459 |
merging m failed! |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
460 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
521
20abfd844367
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
520
diff
changeset
|
461 |
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
462 |
% keyword stays outside conflict zone |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
463 |
$Id$ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
464 |
<<<<<<< local |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
465 |
bar |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
466 |
======= |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
467 |
foo |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
468 |
>>>>>>> other |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
469 |
% resolve to local |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
470 |
$Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
471 |
bar |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
472 |
% switch off expansion |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
473 |
% kwshrink with unknown file u |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
474 |
overwriting a shrinking keywords |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
475 |
overwriting m shrinking keywords |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
476 |
overwriting x/a shrinking keywords |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
477 |
% cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
478 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
479 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
480 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
481 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
482 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
483 |
% hg cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
484 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
485 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
486 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
487 |
$Xinfo: User Name <user@example.com>: firstline $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
488 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
489 |
a |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
490 |
% cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
491 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
492 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
493 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
494 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
495 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
496 |
% hg cat |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
497 |
expand $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
498 |
do not process $Id: |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
499 |
xxx $ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
500 |
$Xinfo$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
501 |
ignore $Id$ |
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
502 |
a |