test-keyword.out
486 lines
| 10.7 KiB
| text/plain
|
TextLexer
/ tests / test-keyword.out
|
r5816 | % hg kwdemo | ||
[extensions] | ||||
|
r10714 | keyword = | ||
|
r5816 | [keyword] | ||
demo.txt = | ||||
[keywordmaps] | ||||
Author = {author|user} | ||||
|
r9942 | Date = {date|utcdate} | ||
|
r5816 | Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | ||
Id = {file|basename},v {node|short} {date|utcdate} {author|user} | ||||
|
r9942 | RCSFile = {file|basename},v | ||
|
r9943 | RCSfile = {file|basename},v | ||
|
r5816 | Revision = {node|short} | ||
|
r9942 | Source = {root}/{file},v | ||
|
r5816 | $Author: test $ | ||
|
r9942 | $Date: 2000/00/00 00:00:00 $ | ||
|
r5816 | $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | ||
|
r9942 | $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | ||
$RCSFile: demo.txt,v $ | ||||
|
r9943 | $RCSfile: demo.txt,v $ | ||
|
r9942 | $Revision: xxxxxxxxxxxx $ | ||
|
r5816 | $Source: /TMP/demo.txt,v $ | ||
[extensions] | ||||
|
r10714 | keyword = | ||
|
r5816 | [keyword] | ||
demo.txt = | ||||
[keywordmaps] | ||||
Branch = {branches} | ||||
$Branch: demobranch $ | ||||
% kwshrink should exit silently in empty/invalid repo | ||||
|
r6061 | pulling from test-keyword.hg | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r5816 | % cat | ||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
ignore $Id$ | ||||
|
r9493 | % no kwfiles | ||
% untracked candidates | ||||
k a | ||||
|
r5816 | % addremove | ||
adding a | ||||
adding b | ||||
% status | ||||
A a | ||||
A b | ||||
% default keyword expansion including commit hook | ||||
% interrupted commit should not change state or run commit hook | ||||
|
r5855 | abort: empty commit message | ||
|
r5816 | % status | ||
A a | ||||
A b | ||||
% commit | ||||
a | ||||
b | ||||
overwriting a expanding keywords | ||||
running hook commit.test: cp a hooktest | ||||
|
r6935 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 | ||
|
r5816 | % status | ||
? hooktest | ||||
% identify | ||||
|
r6061 | ef63ca68695b | ||
|
r5816 | % cat | ||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
ignore $Id$ | ||||
% hg cat | ||||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
ignore $Id$ | ||||
a | ||||
% diff a hooktest | ||||
% removing commit hook from config | ||||
|
r6051 | % bundle | ||
|
r6061 | 2 changesets found | ||
|
r6116 | % notify on pull to check whether keywords stay as is in email | ||
% ie. if patch.diff wrapper acts as it should | ||||
|
r6051 | % pull from bundle | ||
pulling from ../kw.hg | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r6061 | added 2 changesets with 3 changes to 3 files | ||
|
r6116 | |||
diff -r 000000000000 -r a2392c293916 sym | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/sym Sat Feb 09 20:25:47 2008 +0100 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
\ No newline at end of file | ||||
diff -r a2392c293916 -r ef63ca68695b a | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,3 @@ | ||||
+expand $Id$ | ||||
+do not process $Id: | ||||
+xxx $ | ||||
diff -r a2392c293916 -r ef63ca68695b b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/b Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+ignore $Id$ | ||||
|
r6051 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6116 | % remove notify config | ||
|
r5816 | % touch | ||
% status | ||||
% update | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% cat | ||||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
ignore $Id$ | ||||
|
r5856 | % check whether expansion is filewise | ||
% commit c | ||||
adding c | ||||
% force expansion | ||||
overwriting a expanding keywords | ||||
overwriting c expanding keywords | ||||
% compare changenodes in a c | ||||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5856 | do not process $Id: | ||
xxx $ | ||||
|
r6061 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | ||
|
r5856 | tests for different changenodes | ||
|
r10931 | % init --mq | ||
|
r5894 | % qimport | ||
|
r10931 | % commit --mq | ||
|
r5894 | % keywords should not be expanded in patch | ||
# HG changeset patch | ||||
# User User Name <user@example.com> | ||||
# Date 1 0 | ||||
|
r6061 | # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad | ||
# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 | ||||
|
r5894 | cndiff | ||
|
r6061 | diff -r ef63ca68695b -r 40a904bbbe4c c | ||
|
r5894 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/c Thu Jan 01 00:00:01 1970 +0000 | ||||
@@ -0,0 +1,2 @@ | ||||
+$Id$ | ||||
+tests for different changenodes | ||||
% qpop | ||||
|
r9110 | popping mqtest.diff | ||
|
r7627 | patch queue now empty | ||
|
r5894 | % qgoto - should imply qpush | ||
applying mqtest.diff | ||||
|
r7627 | now at: mqtest.diff | ||
|
r5894 | % cat | ||
|
r6061 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | ||
|
r5894 | tests for different changenodes | ||
|
r11044 | % hg cat | ||
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | ||||
tests for different changenodes | ||||
% keyword should not be expanded in filelog | ||||
$Id$ | ||||
tests for different changenodes | ||||
|
r5894 | % qpop and move on | ||
|
r9110 | popping mqtest.diff | ||
|
r7627 | patch queue now empty | ||
|
r5816 | % copy | ||
% kwfiles added | ||||
a | ||||
c | ||||
% commit | ||||
c | ||||
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | ||||
overwriting c expanding keywords | ||||
|
r10490 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d | ||
|
r5816 | % cat a c | ||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
|
r10490 | expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
|
r6328 | % touch copied c | ||
|
r5816 | % status | ||
% kwfiles | ||||
a | ||||
c | ||||
|
r9493 | % ignored files | ||
I b | ||||
I sym | ||||
% all files | ||||
K a | ||||
K c | ||||
I b | ||||
I sym | ||||
|
r5816 | % diff --rev | ||
|
r6061 | diff -r ef63ca68695b c | ||
|
r5816 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
@@ -0,0 +1,3 @@ | ||||
|
r5885 | +expand $Id$ | ||
|
r5816 | +do not process $Id: | ||
+xxx $ | ||||
% rollback | ||||
|
r10893 | rolling back to revision 2 (undo commit) | ||
|
r5816 | % status | ||
A c | ||||
% update -C | ||||
|
r8518 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r5816 | % custom keyword expansion | ||
% try with kwdemo | ||||
[extensions] | ||||
|
r10714 | keyword = | ||
|
r5816 | [keyword] | ||
|
r11044 | ** = | ||
|
r5816 | b = ignore | ||
demo.txt = | ||||
[keywordmaps] | ||||
Xinfo = {author}: {desc} | ||||
|
r10499 | $Xinfo: test: hg keyword configuration and expansion example $ | ||
|
r5816 | % cat | ||
|
r6061 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
ignore $Id$ | ||||
% hg cat | ||||
|
r6061 | expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
ignore $Id$ | ||||
a | ||||
% interrupted commit should not change state | ||||
|
r5855 | abort: empty commit message | ||
|
r5816 | % status | ||
M a | ||||
|
r8518 | ? c | ||
|
r5816 | ? log | ||
% commit | ||||
a | ||||
overwriting a expanding keywords | ||||
|
r6935 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 | ||
|
r5816 | % status | ||
|
r8518 | ? c | ||
|
r6867 | % verify | ||
checking changesets | ||||
checking manifests | ||||
crosschecking files in changesets and manifests | ||||
checking files | ||||
3 files, 3 changesets, 4 total revisions | ||||
|
r5816 | % cat | ||
|
r6061 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: firstline $ | ||||
ignore $Id$ | ||||
% hg cat | ||||
|
r6061 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: firstline $ | ||||
ignore $Id$ | ||||
a | ||||
|
r6667 | % annotate | ||
1: expand $Id$ | ||||
1: do not process $Id: | ||||
1: xxx $ | ||||
2: $Xinfo$ | ||||
|
r5816 | % remove | ||
|
r6935 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 | ||
|
r5816 | % status | ||
|
r8518 | ? c | ||
|
r5816 | % rollback | ||
|
r10893 | rolling back to revision 3 (undo commit) | ||
|
r5816 | % status | ||
R a | ||||
|
r8518 | ? c | ||
|
r5816 | % revert a | ||
% cat a | ||||
|
r6061 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: firstline $ | ||||
% clone to test incoming | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r6061 | added 2 changesets with 3 changes to 3 files | ||
|
r9611 | updating to branch default | ||
|
r5816 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
% incoming | ||||
|
r5943 | comparing with test-keyword/Test | ||
|
r5816 | searching for changes | ||
|
r6061 | changeset: 2:bb948857c743 | ||
|
r5816 | tag: tip | ||
user: User Name <user@example.com> | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: firstline | ||||
% commit rejecttest | ||||
a | ||||
overwriting a expanding keywords | ||||
|
r6935 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 | ||
|
r5816 | % export | ||
% import | ||||
applying ../rejecttest.diff | ||||
% cat | ||||
|
r6061 | expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest | ||
|
r5816 | do not process $Id: rejecttest | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: rejects? $ | ||||
ignore $Id$ | ||||
% rollback | ||||
|
r10893 | rolling back to revision 3 (undo commit) | ||
|
r5816 | % clean update | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% kwexpand/kwshrink on selected files | ||||
% copy a x/a | ||||
% kwexpand a | ||||
overwriting a expanding keywords | ||||
% kwexpand x/a should abort | ||||
|
r6672 | abort: outstanding uncommitted changes | ||
|
r5816 | x/a | ||
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | ||||
overwriting x/a expanding keywords | ||||
|
r10490 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 | ||
|
r5816 | % cat a | ||
|
r10490 | expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: xa $ | ||||
% kwshrink a inside directory x | ||||
overwriting x/a shrinking keywords | ||||
% cat a | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
$Xinfo$ | ||||
% kwexpand nonexistent | ||||
|
r6061 | nonexistent: | ||
|
r6927 | % hg serve | ||
% expansion | ||||
% hgweb file | ||||
200 Script output follows | ||||
|
r6061 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | ||
|
r5816 | do not process $Id: | ||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: firstline $ | ||||
|
r6927 | % no expansion | ||
% hgweb annotate | ||||
200 Script output follows | ||||
|
r6968 | user@1: expand $Id$ | ||
user@1: do not process $Id: | ||||
user@1: xxx $ | ||||
user@2: $Xinfo$ | ||||
|
r6927 | |||
|
r6354 | % hgweb changeset | ||
200 Script output follows | ||||
# HG changeset patch | ||||
# User User Name <user@example.com> | ||||
# Date 3 0 | ||||
|
r10490 | # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 | ||
|
r7166 | # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 | ||
|
r6354 | xa | ||
|
r10490 | diff -r bb948857c743 -r b4560182a3f9 x/a | ||
|
r6354 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/x/a Thu Jan 01 00:00:03 1970 +0000 | ||||
@@ -0,0 +1,4 @@ | ||||
+expand $Id$ | ||||
+do not process $Id: | ||||
+xxx $ | ||||
+$Xinfo$ | ||||
% hgweb filediff | ||||
200 Script output follows | ||||
|
r9403 | diff -r ef63ca68695b -r bb948857c743 a | ||
|
r6354 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:02 1970 +0000 | ||||
@@ -1,3 +1,4 @@ | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
+$Xinfo$ | ||||
% errors encountered | ||||
|
r6933 | % merge/resolve | ||
% simplemerge | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
|
r10490 | $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ | ||
|
r6933 | foo | ||
% conflict | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
merging m | ||||
warning: conflicts during merge. | ||||
merging m failed! | ||||
0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
|
r9468 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||
|
r6933 | % keyword stays outside conflict zone | ||
$Id$ | ||||
<<<<<<< local | ||||
bar | ||||
======= | ||||
foo | ||||
>>>>>>> other | ||||
% resolve to local | ||||
|
r10490 | $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ | ||
|
r6933 | bar | ||
|
r10117 | % test restricted mode with transplant -b | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
marked working directory as branch foo | ||||
created new head | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r10490 | applying 4aa30d025d50 | ||
4aa30d025d50 transplanted to 5a4da427c162 | ||||
|
r10117 | % no expansion in changeset | ||
|
r10490 | changeset: 11:5a4da427c162 | ||
|
r10117 | tag: tip | ||
|
r10490 | parent: 9:41efa6d38e9b | ||
|
r10117 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 9foobranch | ||||
|
r10490 | diff -r 41efa6d38e9b -r 5a4da427c162 a | ||
|
r10117 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,3 +1,4 @@ | ||||
+foobranch | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
% expansion in file | ||||
foobranch | ||||
|
r10490 | expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ | ||
|
r6927 | % switch off expansion | ||
% kwshrink with unknown file u | ||||
overwriting a shrinking keywords | ||||
|
r6933 | overwriting m shrinking keywords | ||
|
r6927 | overwriting x/a shrinking keywords | ||
% cat | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
$Xinfo$ | ||||
ignore $Id$ | ||||
% hg cat | ||||
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | ||||
do not process $Id: | ||||
xxx $ | ||||
$Xinfo: User Name <user@example.com>: firstline $ | ||||
ignore $Id$ | ||||
a | ||||
% cat | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
$Xinfo$ | ||||
ignore $Id$ | ||||
% hg cat | ||||
expand $Id$ | ||||
do not process $Id: | ||||
xxx $ | ||||
$Xinfo$ | ||||
ignore $Id$ | ||||
a | ||||