Mercurial > hg
annotate tests/test-keyword.out @ 12252:4481f8a93c7a stable
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | f5aa20e177c0 |
children |
rev | line source |
---|---|
5816 | 1 % hg kwdemo |
2 [extensions] | |
10714
9c0a1887bd4b
keyword: do not bother about detecting extension path in demo
Christian Ebert <blacktrash@gmx.net>
parents:
10499
diff
changeset
|
3 keyword = |
5816 | 4 [keyword] |
5 demo.txt = | |
6 [keywordmaps] | |
7 Author = {author|user} | |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
8 Date = {date|utcdate} |
5816 | 9 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
10 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
11 RCSFile = {file|basename},v |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
12 RCSfile = {file|basename},v |
5816 | 13 Revision = {node|short} |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
14 Source = {root}/{file},v |
5816 | 15 $Author: test $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
16 $Date: 2000/00/00 00:00:00 $ |
5816 | 17 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
18 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
19 $RCSFile: demo.txt,v $ |
9943
f8d779791161
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net>
parents:
9942
diff
changeset
|
20 $RCSfile: demo.txt,v $ |
9942
b6d484168350
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net>
parents:
9611
diff
changeset
|
21 $Revision: xxxxxxxxxxxx $ |
5816 | 22 $Source: /TMP/demo.txt,v $ |
23 [extensions] | |
10714
9c0a1887bd4b
keyword: do not bother about detecting extension path in demo
Christian Ebert <blacktrash@gmx.net>
parents:
10499
diff
changeset
|
24 keyword = |
5816 | 25 [keyword] |
26 demo.txt = | |
27 [keywordmaps] | |
28 Branch = {branches} | |
29 $Branch: demobranch $ | |
30 % kwshrink should exit silently in empty/invalid repo | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
31 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
32 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
33 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
34 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
35 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
36 added 1 changesets with 1 changes to 1 files |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 38 % cat |
39 expand $Id$ | |
40 do not process $Id: | |
41 xxx $ | |
42 ignore $Id$ | |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
43 % no kwfiles |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
44 % untracked candidates |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
45 k a |
5816 | 46 % addremove |
47 adding a | |
48 adding b | |
49 % status | |
50 A a | |
51 A b | |
52 % default keyword expansion including commit hook | |
53 % interrupted commit should not change state or run commit hook | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
54 abort: empty commit message |
5816 | 55 % status |
56 A a | |
57 A b | |
58 % commit | |
59 a | |
60 b | |
61 overwriting a expanding keywords | |
62 running hook commit.test: cp a hooktest | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
63 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5816 | 64 % status |
65 ? hooktest | |
66 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
67 ef63ca68695b |
5816 | 68 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
69 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 70 do not process $Id: |
71 xxx $ | |
72 ignore $Id$ | |
73 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
74 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 75 do not process $Id: |
76 xxx $ | |
77 ignore $Id$ | |
78 a | |
79 % diff a hooktest | |
80 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
81 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
82 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
83 % notify on pull to check whether keywords stay as is in email |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
84 % ie. if patch.diff wrapper acts as it should |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
85 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
86 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
87 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
88 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
89 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
90 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
91 added 2 changesets with 3 changes to 3 files |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
92 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
93 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
94 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
95 +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
96 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
97 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
98 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
99 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
100 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
101 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
102 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
103 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
104 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
105 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
106 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
107 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
109 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
110 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
111 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
112 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
113 % remove notify config |
5816 | 114 % touch |
115 % status | |
116 % update | |
117 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
119 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 120 do not process $Id: |
121 xxx $ | |
122 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
123 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
124 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
125 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
126 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
127 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
128 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
129 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
131 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
132 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
134 tests for different changenodes |
11252
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
135 % record chunk |
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
136 diff --git a/a b/a |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
137 2 hunks, 2 lines changed |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
138 examine changes to 'a'? [Ynsfdaq?] |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
139 @@ -1,3 +1,4 @@ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
140 expand $Id$ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
141 +foo |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
142 do not process $Id: |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
143 xxx $ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
144 record change 1/2 to 'a'? [Ynsfdaq?] |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
145 @@ -2,2 +3,3 @@ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
146 do not process $Id: |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
147 xxx $ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
148 +bar |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
149 record change 2/2 to 'a'? [Ynsfdaq?] |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
150 |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
151 d17e03c92c97+ tip |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
152 M a |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
153 % cat modified file |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
154 expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
155 foo |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
156 do not process $Id: |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
157 xxx $ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
158 bar |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
159 diff -r d17e03c92c97 a |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
160 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
161 @@ -2,3 +2,4 @@ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
162 foo |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
163 do not process $Id: |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
164 xxx $ |
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
165 +bar |
11175 | 166 rolling back to revision 2 (undo commit) |
11252
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
167 % record file |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
168 diff --git a/a b/a |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
169 2 hunks, 2 lines changed |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
170 examine changes to 'a'? [Ynsfdaq?] |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
171 @@ -1,3 +1,4 @@ |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
172 expand $Id$ |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
173 +foo |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
174 do not process $Id: |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
175 xxx $ |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
176 record change 1/2 to 'a'? [Ynsfdaq?] |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
177 @@ -2,2 +3,3 @@ |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
178 do not process $Id: |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
179 xxx $ |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
180 +bar |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
181 record change 2/2 to 'a'? [Ynsfdaq?] |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
182 % a should be clean |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
183 C a |
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11175
diff
changeset
|
184 rolling back to revision 2 (undo commit) |
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10931
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10893
diff
changeset
|
186 % init --mq |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
187 % qimport |
10931
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10893
diff
changeset
|
188 % commit --mq |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
189 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
190 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
191 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
192 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
193 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
194 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
195 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
196 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
197 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
198 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
199 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
200 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
201 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
202 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
203 % qpop |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
204 popping mqtest.diff |
7627 | 205 patch queue now empty |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
206 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
207 applying mqtest.diff |
7627 | 208 now at: mqtest.diff |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
209 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
210 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
211 tests for different changenodes |
11044
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
212 % hg cat |
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
213 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
214 tests for different changenodes |
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
215 % keyword should not be expanded in filelog |
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
216 $Id$ |
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
217 tests for different changenodes |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
218 % qpop and move on |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
219 popping mqtest.diff |
7627 | 220 patch queue now empty |
5816 | 221 % copy |
222 % kwfiles added | |
223 a | |
224 c | |
225 % commit | |
226 c | |
227 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
228 overwriting c expanding keywords | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
229 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
5816 | 230 % cat a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
231 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 232 do not process $Id: |
233 xxx $ | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
234 expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ |
5816 | 235 do not process $Id: |
236 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
237 % touch copied c |
5816 | 238 % status |
239 % kwfiles | |
240 a | |
241 c | |
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
242 % ignored files |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
243 I b |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
244 I sym |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
245 % all files |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
246 K a |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
247 K c |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
248 I b |
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9468
diff
changeset
|
249 I sym |
5816 | 250 % diff --rev |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
251 diff -r ef63ca68695b c |
5816 | 252 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
253 @@ -0,0 +1,3 @@ | |
5885
53be157543d4
keyword: avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
5884
diff
changeset
|
254 +expand $Id$ |
5816 | 255 +do not process $Id: |
256 +xxx $ | |
257 % rollback | |
11175 | 258 rolling back to revision 1 (undo commit) |
5816 | 259 % status |
260 A c | |
261 % update -C | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
262 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 263 % custom keyword expansion |
264 % try with kwdemo | |
265 [extensions] | |
10714
9c0a1887bd4b
keyword: do not bother about detecting extension path in demo
Christian Ebert <blacktrash@gmx.net>
parents:
10499
diff
changeset
|
266 keyword = |
5816 | 267 [keyword] |
11044
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
268 ** = |
5816 | 269 b = ignore |
270 demo.txt = | |
271 [keywordmaps] | |
272 Xinfo = {author}: {desc} | |
10499
4401b0dfee88
keyword: mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net>
parents:
10490
diff
changeset
|
273 $Xinfo: test: hg keyword configuration and expansion example $ |
5816 | 274 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
275 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 276 do not process $Id: |
277 xxx $ | |
278 ignore $Id$ | |
279 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
280 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 281 do not process $Id: |
282 xxx $ | |
283 ignore $Id$ | |
284 a | |
285 % interrupted commit should not change state | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
286 abort: empty commit message |
5816 | 287 % status |
288 M a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
289 ? c |
5816 | 290 ? log |
291 % commit | |
292 a | |
293 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
294 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
5816 | 295 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
296 ? c |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
297 % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
298 checking changesets |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
299 checking manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
300 crosschecking files in changesets and manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
301 checking files |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
302 3 files, 3 changesets, 4 total revisions |
5816 | 303 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
304 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 305 do not process $Id: |
306 xxx $ | |
307 $Xinfo: User Name <user@example.com>: firstline $ | |
308 ignore $Id$ | |
309 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
310 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 311 do not process $Id: |
312 xxx $ | |
313 $Xinfo: User Name <user@example.com>: firstline $ | |
314 ignore $Id$ | |
315 a | |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
316 % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
317 1: expand $Id$ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
318 1: do not process $Id: |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
319 1: xxx $ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
320 2: $Xinfo$ |
5816 | 321 % remove |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
322 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
5816 | 323 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
324 ? c |
5816 | 325 % rollback |
11175 | 326 rolling back to revision 2 (undo commit) |
5816 | 327 % status |
328 R a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
329 ? c |
5816 | 330 % revert a |
331 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
332 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 333 do not process $Id: |
334 xxx $ | |
335 $Xinfo: User Name <user@example.com>: firstline $ | |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
336 % clone |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
337 % expansion in dest |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
338 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
339 do not process $Id: |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
340 xxx $ |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
341 $Xinfo: User Name <user@example.com>: firstline $ |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
342 % no expansion in dest |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
343 expand $Id$ |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
344 do not process $Id: |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
345 xxx $ |
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
346 $Xinfo$ |
5816 | 347 % clone to test incoming |
348 requesting all changes | |
349 adding changesets | |
350 adding manifests | |
351 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
352 added 2 changesets with 3 changes to 3 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9602
diff
changeset
|
353 updating to branch default |
5816 | 354 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
355 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
356 comparing with test-keyword/Test |
5816 | 357 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
358 changeset: 2:bb948857c743 |
5816 | 359 tag: tip |
360 user: User Name <user@example.com> | |
361 date: Thu Jan 01 00:00:02 1970 +0000 | |
362 summary: firstline | |
363 | |
364 % commit rejecttest | |
365 a | |
366 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
367 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
5816 | 368 % export |
369 % import | |
370 applying ../rejecttest.diff | |
371 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
372 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 373 do not process $Id: rejecttest |
374 xxx $ | |
375 $Xinfo: User Name <user@example.com>: rejects? $ | |
376 ignore $Id$ | |
377 | |
378 % rollback | |
11175 | 379 rolling back to revision 2 (undo commit) |
5816 | 380 % clean update |
381 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
382 % kwexpand/kwshrink on selected files | |
383 % copy a x/a | |
384 % kwexpand a | |
385 overwriting a expanding keywords | |
386 % kwexpand x/a should abort | |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
387 abort: outstanding uncommitted changes |
5816 | 388 x/a |
389 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
390 overwriting x/a expanding keywords | |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
391 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
5816 | 392 % cat a |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
393 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 394 do not process $Id: |
395 xxx $ | |
396 $Xinfo: User Name <user@example.com>: xa $ | |
397 % kwshrink a inside directory x | |
398 overwriting x/a shrinking keywords | |
399 % cat a | |
400 expand $Id$ | |
401 do not process $Id: | |
402 xxx $ | |
403 $Xinfo$ | |
404 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
405 nonexistent: |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
406 % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
407 % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
408 % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
409 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
410 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
411 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 412 do not process $Id: |
413 xxx $ | |
414 $Xinfo: User Name <user@example.com>: firstline $ | |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
415 % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
416 % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
417 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
418 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
419 |
6968
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
420 user@1: expand $Id$ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
421 user@1: do not process $Id: |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
422 user@1: xxx $ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
423 user@2: $Xinfo$ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
424 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
425 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
426 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
427 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
428 % hgweb changeset |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
429 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
430 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
431 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
432 # HG changeset patch |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
433 # User User Name <user@example.com> |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
434 # Date 3 0 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
435 # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 |
7166
fb3df69aa785
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7127
diff
changeset
|
436 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
437 xa |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
438 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
439 diff -r bb948857c743 -r b4560182a3f9 x/a |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
440 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
441 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
442 @@ -0,0 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
443 +expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
444 +do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
445 +xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
446 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
447 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
448 % hgweb filediff |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
449 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
450 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
451 |
9403
3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
Martin Geisler <mg@lazybytes.net>
parents:
8957
diff
changeset
|
452 diff -r ef63ca68695b -r bb948857c743 a |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
453 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
454 +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
455 @@ -1,3 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
456 expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
457 do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
458 xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
459 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
460 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
461 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
462 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
463 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
464 % errors encountered |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
465 % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
466 % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
467 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
468 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
469 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
470 (branch merge, don't forget to commit) |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
471 $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
472 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
473 % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
474 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
475 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
476 merging m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
477 warning: conflicts during merge. |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
478 merging m failed! |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
479 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
9404
diff
changeset
|
480 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
481 % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
482 $Id$ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
483 <<<<<<< local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
484 bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
485 ======= |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
486 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
487 >>>>>>> other |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
488 % resolve to local |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
489 $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
490 bar |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
491 % test restricted mode with transplant -b |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
493 marked working directory as branch foo |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
494 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
495 applying 4aa30d025d50 |
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
496 4aa30d025d50 transplanted to 5a4da427c162 |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
497 % no expansion in changeset |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
498 changeset: 11:5a4da427c162 |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
499 tag: tip |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
500 parent: 9:41efa6d38e9b |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
501 user: test |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
502 date: Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
503 summary: 9foobranch |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
504 |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
505 diff -r 41efa6d38e9b -r 5a4da427c162 a |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
506 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
507 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
508 @@ -1,3 +1,4 @@ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
509 +foobranch |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
510 expand $Id$ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
511 do not process $Id: |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
512 xxx $ |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
513 |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
514 % expansion in file |
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9943
diff
changeset
|
515 foobranch |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10125
diff
changeset
|
516 expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
517 % switch off expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
518 % kwshrink with unknown file u |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
519 overwriting a shrinking keywords |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
520 overwriting m shrinking keywords |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
521 overwriting x/a shrinking keywords |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
522 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
523 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
524 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
525 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
526 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
527 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
528 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
529 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
530 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
531 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
532 $Xinfo: User Name <user@example.com>: firstline $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
533 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
534 a |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
535 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
536 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
537 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
538 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
539 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
540 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
541 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
542 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
543 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
544 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
545 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
546 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
547 a |