| changeset 12375 | 02990e22150b |
| parent 12372 | 5163e3c8aa52 |
| child 12376 | 97ffc68f71d3 |
| 12374:4e7dd28db0dd | 12375:02990e22150b |
|---|---|
25 RCSFile = {file|basename},v |
25 RCSFile = {file|basename},v |
26 RCSfile = {file|basename},v |
26 RCSfile = {file|basename},v |
27 Revision = {node|short} |
27 Revision = {node|short} |
28 Source = {root}/{file},v |
28 Source = {root}/{file},v |
29 $Author: test $ |
29 $Author: test $ |
30 \$Date: ..../../.. ..:..:.. \$ |
30 \$Date: ..../../.. ..:..:.. \$ (re) |
31 \$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ |
31 \$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ (re) |
32 \$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ |
32 \$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ (re) |
33 $RCSFile: demo.txt,v $ |
33 $RCSFile: demo.txt,v $ |
34 $RCSfile: demo.txt,v $ |
34 $RCSfile: demo.txt,v $ |
35 \$Revision: ............ \$ |
35 \$Revision: ............ \$ (re) |
36 \$Source: .*/demo\.txt,v \$ |
36 \$Source: .*/demo.txt,v \$ (re) |
37 |
37 |
38 $ hg --quiet kwdemo "Branch = {branches}" |
38 $ hg --quiet kwdemo "Branch = {branches}" |
39 [extensions] |
39 [extensions] |
40 keyword = |
40 keyword = |
41 [keyword] |
41 [keyword] |
69 hg add sym |
69 hg add sym |
70 hg ci -m addsym -u mercurial |
70 hg ci -m addsym -u mercurial |
71 hg bundle --base null ../test-keyword.hg |
71 hg bundle --base null ../test-keyword.hg |
72 |
72 |
73 $ hg pull -u "$TESTDIR"/test-keyword.hg |
73 $ hg pull -u "$TESTDIR"/test-keyword.hg |
74 pulling from .*test-keyword\.hg |
74 pulling from .*test-keyword\.hg (re) |
75 requesting all changes |
75 requesting all changes |
76 adding changesets |
76 adding changesets |
77 adding manifests |
77 adding manifests |
78 adding file changes |
78 adding file changes |
79 added 1 changesets with 1 changes to 1 files |
79 added 1 changesets with 1 changes to 1 files |
148 $ hg cat sym a b && echo |
148 $ hg cat sym a b && echo |
149 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
149 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
150 do not process $Id: |
150 do not process $Id: |
151 xxx $ |
151 xxx $ |
152 ignore $Id$ |
152 ignore $Id$ |
153 a.* |
153 a.* (re) |
154 |
154 |
155 Test hook execution |
155 Test hook execution |
156 |
156 |
157 $ diff a hooktest |
157 $ diff a hooktest |
158 |
158 |
193 adding file changes |
193 adding file changes |
194 added 2 changesets with 3 changes to 3 files |
194 added 2 changesets with 3 changes to 3 files |
195 Content-Type: text/plain; charset="us-ascii" |
195 Content-Type: text/plain; charset="us-ascii" |
196 MIME-Version: 1.0 |
196 MIME-Version: 1.0 |
197 Content-Transfer-Encoding: 7bit |
197 Content-Transfer-Encoding: 7bit |
198 Date: .* |
198 Date: .* (re) |
199 Subject: changeset in .* |
199 Subject: changeset in .* (re) |
200 From: mercurial |
200 From: mercurial |
201 X-Hg-Notification: changeset a2392c293916 |
201 X-Hg-Notification: changeset a2392c293916 |
202 Message-Id: <hg\.a2392c293916.*> |
202 Message-Id: <hg\.a2392c293916.*> (re) |
203 To: Test |
203 To: Test |
204 |
204 |
205 changeset a2392c293916 in .* |
205 changeset a2392c293916 in .* (re) |
206 details: .*\?cmd=changeset;node=a2392c293916 |
206 details: .*\?cmd=changeset;node=a2392c293916 (re) |
207 description: |
207 description: |
208 addsym |
208 addsym |
209 |
209 |
210 diffs (6 lines): |
210 diffs (6 lines): |
211 |
211 |
216 +a |
216 +a |
217 \ No newline at end of file |
217 \ No newline at end of file |
218 Content-Type: text/plain; charset="us-ascii" |
218 Content-Type: text/plain; charset="us-ascii" |
219 MIME-Version: 1.0 |
219 MIME-Version: 1.0 |
220 Content-Transfer-Encoding: 7bit |
220 Content-Transfer-Encoding: 7bit |
221 Date:.* |
221 Date:.* (re) |
222 Subject: changeset in.* |
222 Subject: changeset in.* (re) |
223 From: User Name <user@example.com> |
223 From: User Name <user@example.com> |
224 X-Hg-Notification: changeset ef63ca68695b |
224 X-Hg-Notification: changeset ef63ca68695b |
225 Message-Id: <hg\.ef63ca68695b.*> |
225 Message-Id: <hg\.ef63ca68695b.*> (re) |
226 To: Test |
226 To: Test |
227 |
227 |
228 changeset ef63ca68695b in .* |
228 changeset ef63ca68695b in .* (re) |
229 details: .*\?cmd=changeset;node=ef63ca68695b |
229 details: .*\?cmd=changeset;node=ef63ca68695b (re) |
230 description: |
230 description: |
231 absym |
231 absym |
232 |
232 |
233 diffs (12 lines): |
233 diffs (12 lines): |
234 |
234 |
333 Diff remaining chunk |
333 Diff remaining chunk |
334 |
334 |
335 $ hg diff |
335 $ hg diff |
336 diff -r d17e03c92c97 a |
336 diff -r d17e03c92c97 a |
337 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
337 --- a/a Wed Dec 31 23:59:51 1969 -0000 |
338 \+\+\+ b/a .* |
338 \+\+\+ b/a .* (re) |
339 @@ -2,3 +2,4 @@ |
339 @@ -2,3 +2,4 @@ |
340 foo |
340 foo |
341 do not process $Id: |
341 do not process $Id: |
342 xxx $ |
342 xxx $ |
343 +bar |
343 +bar |
477 Diff specific revision |
477 Diff specific revision |
478 |
478 |
479 $ hg diff --rev 1 |
479 $ hg diff --rev 1 |
480 diff -r ef63ca68695b c |
480 diff -r ef63ca68695b c |
481 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
481 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
482 \+\+\+ b/c .* |
482 \+\+\+ b/c .* (re) |
483 @@ -0,0 +1,3 @@ |
483 @@ -0,0 +1,3 @@ |
484 +expand $Id$ |
484 +expand $Id$ |
485 +do not process $Id: |
485 +do not process $Id: |
486 +xxx $ |
486 +xxx $ |
487 |
487 |
525 $ hg cat sym a b && echo |
525 $ hg cat sym a b && echo |
526 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
526 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
527 do not process $Id: |
527 do not process $Id: |
528 xxx $ |
528 xxx $ |
529 ignore $Id$ |
529 ignore $Id$ |
530 a.* |
530 a.* (re) |
531 |
531 |
532 Write custom keyword and prepare multiline commit message |
532 Write custom keyword and prepare multiline commit message |
533 |
533 |
534 $ echo '$Xinfo$' >> a |
534 $ echo '$Xinfo$' >> a |
535 $ cat <<EOF >> log |
535 $ cat <<EOF >> log |
575 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
575 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
576 do not process $Id: |
576 do not process $Id: |
577 xxx $ |
577 xxx $ |
578 $Xinfo: User Name <user@example.com>: firstline $ |
578 $Xinfo: User Name <user@example.com>: firstline $ |
579 ignore $Id$ |
579 ignore $Id$ |
580 a.* |
580 a.* (re) |
581 |
581 |
582 annotate |
582 annotate |
583 |
583 |
584 $ hg annotate a |
584 $ hg annotate a |
585 1: expand $Id$ |
585 1: expand $Id$ |
646 $ cat <<EOF >> .hg/hgrc |
646 $ cat <<EOF >> .hg/hgrc |
647 > [paths] |
647 > [paths] |
648 > default = ../Test |
648 > default = ../Test |
649 > EOF |
649 > EOF |
650 $ hg incoming |
650 $ hg incoming |
651 comparing with .*test-keyword\.t/Test |
651 comparing with .*test-keyword\.t/Test (re) |
652 searching for changes |
652 searching for changes |
653 changeset: 2:bb948857c743 |
653 changeset: 2:bb948857c743 |
654 tag: tip |
654 tag: tip |
655 user: User Name <user@example.com> |
655 user: User Name <user@example.com> |
656 date: Thu Jan 01 00:00:02 1970 +0000 |
656 date: Thu Jan 01 00:00:02 1970 +0000 |
716 $ cd .. |
716 $ cd .. |
717 |
717 |
718 kwexpand nonexistent |
718 kwexpand nonexistent |
719 |
719 |
720 $ hg kwexpand nonexistent |
720 $ hg kwexpand nonexistent |
721 nonexistent:.* |
721 nonexistent:.* (re) |
722 |
722 |
723 |
723 |
724 hg serve |
724 hg serve |
725 - expand with hgweb file |
725 - expand with hgweb file |
726 - no expansion with hgweb annotate/changeset/filediff |
726 - no expansion with hgweb annotate/changeset/filediff |
905 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
905 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
906 do not process $Id: |
906 do not process $Id: |
907 xxx $ |
907 xxx $ |
908 $Xinfo: User Name <user@example.com>: firstline $ |
908 $Xinfo: User Name <user@example.com>: firstline $ |
909 ignore $Id$ |
909 ignore $Id$ |
910 a.* |
910 a.* (re) |
911 |
911 |
912 Now disable keyword expansion |
912 Now disable keyword expansion |
913 |
913 |
914 $ rm "$HGRCPATH" |
914 $ rm "$HGRCPATH" |
915 $ cat a b |
915 $ cat a b |
922 expand $Id$ |
922 expand $Id$ |
923 do not process $Id: |
923 do not process $Id: |
924 xxx $ |
924 xxx $ |
925 $Xinfo$ |
925 $Xinfo$ |
926 ignore $Id$ |
926 ignore $Id$ |
927 a.* |
927 a.* (re) |