tests/test-keyword.out
author Christian Ebert <blacktrash@gmx.net>
Mon, 19 Oct 2009 22:40:48 +0200
branch0.9.2compat
changeset 658 efcbed613548
parent 644 b3d3788db7ef
child 664 c339bd5b183b
permissions -rw-r--r--
(0.9.2compat) update wiki url
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
% hg kwdemo
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
     2
[extensions]
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
     3
hgext.keyword = 
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     4
[keyword]
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
     5
demo.txt = 
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     6
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     7
RCSFile = {file|basename},v
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     8
Author = {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     9
Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    10
Source = {root}/{file},v
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    11
Date = {date|utcdate}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    12
Id = {file|basename},v {node|short} {date|utcdate} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    13
Revision = {node|short}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    14
$RCSFile: demo.txt,v $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    15
$Author: test $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    16
$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
    17
$Source: /TMP/demo.txt,v $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    18
$Date: 2000/00/00 00:00:00 $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    19
$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
    20
$Revision: xxxxxxxxxxxx $
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    21
[extensions]
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    22
hgext.keyword = 
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    23
[keyword]
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    24
demo.txt = 
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    25
[keywordmaps]
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    26
Branch = {branches}
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    27
$Branch: demobranch $
250
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 249
diff changeset
    28
% kwshrink should exit silently in empty/invalid repo
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    29
pulling from test-keyword.hg
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    30
requesting all changes
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    31
adding changesets
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    32
adding manifests
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    33
adding file changes
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    34
added 1 changesets with 1 changes to 1 files
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    35
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
    36
% cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    37
expand $Id$
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    38
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    39
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    40
ignore $Id$
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    41
% addremove
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    42
adding a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    43
adding b
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    44
% status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    45
A a
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    46
A b
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    47
% default keyword expansion including commit hook
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    48
% commit
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    49
a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    50
b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    51
overwriting a expanding keywords
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    52
running hook commit.test: cp a hooktest
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    53
% status
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    54
? hooktest
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    55
% identify
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    56
475643d17242
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    57
% cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    58
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    59
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    60
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    61
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    62
% hg cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    63
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    64
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    65
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    66
ignore $Id$
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    67
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    68
% diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    69
% removing commit hook from config
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    70
% bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    71
% pull from bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    72
pulling from ../kw.hg
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    73
requesting all changes
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    74
adding changesets
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    75
adding manifests
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    76
adding file changes
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    77
added 2 changesets with 3 changes to 3 files
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    78
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
    79
% touch
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    80
% status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    81
% update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    82
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    83
% cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    84
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    85
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    86
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    87
ignore $Id$
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    88
% check whether expansion is filewise
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    89
% commit c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    90
adding c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    91
% force expansion
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    92
overwriting a expanding keywords
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    93
overwriting c expanding keywords
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    94
% compare changenodes in a c
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    95
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    96
do not process $Id:
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    97
xxx $
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    98
$Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
    99
tests for different changenodes
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   100
% qinit -c
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   101
% qimport
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   102
% qcommit
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   103
% keywords should not be expanded in patch
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   104
# HG changeset patch
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   105
# User User Name <user@example.com>
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   106
# Date 1 0
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   107
# Node ID c08ff8b9d54ebf87b428631bd34b3d8b69cbf72f
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   108
# Parent  475643d17242703d20c30af0fc52b30fd231c6f6
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   109
cndiff
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   110
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   111
diff -r 475643d17242 -r c08ff8b9d54e c
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   112
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   113
+++ b/c	Thu Jan 01 00:00:01 1970 +0000
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   114
@@ -0,0 +1,2 @@
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   115
+$Id$
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   116
+tests for different changenodes
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   117
% qpop
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   118
Patch queue now empty
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   119
% qpush
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   120
applying mqtest.diff
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   121
Now at: mqtest.diff
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   122
% cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   123
$Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   124
tests for different changenodes
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   125
% qpop and move on
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   126
Patch queue now empty
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   127
% copy
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 256
diff changeset
   128
% kwfiles added
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 256
diff changeset
   129
a
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 256
diff changeset
   130
c
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   131
% commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   132
c
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   133
 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   134
overwriting c expanding keywords
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   135
% cat a c
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   136
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   137
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   138
xxx $
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   139
expand $Id: c,v 1acf8f3ab611 1970/01/01 00:00:01 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   140
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   141
xxx $
249
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   142
% touch copied c after 1 second
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   143
% status
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   144
% kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   145
a
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   146
c
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   147
% diff --rev
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   148
diff -r 475643d17242 c
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   149
--- /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
   150
@@ -0,0 +1,3 @@
348
63ebc698d06b Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   151
+expand $Id$
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   152
+do not process $Id:
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   153
+xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   154
% rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   155
rolling back last transaction
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   156
% status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   157
A c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   158
% update -C
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   159
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   160
% custom keyword expansion
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   161
% try with kwdemo
208
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   162
[extensions]
5afdcec8a01f Show extension in kwdemo; flag helpers; rephrase doc
Christian Ebert <blacktrash@gmx.net>
parents: 203
diff changeset
   163
hgext.keyword = 
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   164
[keyword]
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   165
* = 
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   166
b = ignore
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
   167
demo.txt = 
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   168
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   169
Xinfo = {author}: {desc}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   170
$Xinfo: test: hg keyword config and expansion example $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   171
% cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   172
expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   173
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   174
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   175
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   176
% hg cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   177
expand $Id: a 475643d17242 Thu, 01 Jan 1970 00:00:00 +0000 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   178
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   179
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   180
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   181
% commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   182
a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
overwriting a expanding keywords
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   184
% status
480
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   185
% verify
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   186
checking changesets
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   187
checking manifests
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   188
crosschecking files in changesets and manifests
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   189
checking files
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   190
3 files, 3 changesets, 4 total revisions
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   191
% cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   192
expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   193
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   194
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   195
$Xinfo: User Name <user@example.com>: firstline $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   196
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   197
% hg cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   198
expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   199
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   200
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   201
$Xinfo: User Name <user@example.com>: firstline $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   202
ignore $Id$
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   203
a
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   204
% annotate
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   205
1: expand $Id$
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   206
1: do not process $Id:
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   207
1: xxx $
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 458
diff changeset
   208
2: $Xinfo$
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   209
% remove
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   210
% status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   211
% rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   212
rolling back last transaction
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   213
% status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   214
R a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   215
% revert a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   216
% cat a
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   217
expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   218
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   219
xxx $
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   220
$Xinfo: User Name <user@example.com>: firstline $
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 211
diff changeset
   221
% clone to test incoming
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   222
requesting all changes
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   223
adding changesets
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   224
adding manifests
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   225
adding file changes
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   226
added 2 changesets with 3 changes to 3 files
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   227
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
   228
% incoming
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   229
searching for changes
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   230
changeset:   2:9ea11ce3ca13
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   231
tag:         tip
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   232
user:        User Name <user@example.com>
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   233
date:        Thu Jan 01 00:00:02 1970 +0000
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   234
summary:     firstline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   235
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 280
diff changeset
   236
% kwexpand/kwshrink on selected files
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 280
diff changeset
   237
% copy a x/a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 280
diff changeset
   238
% kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 280
diff changeset
   239
overwriting a expanding keywords
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 280
diff changeset
   240
% kwexpand x/a should abort
458
dd5eca480af6 (0.9.2compat) get some changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 434
diff changeset
   241
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
   242
x/a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   243
 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
   244
overwriting x/a expanding keywords
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   245
% cat a
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   246
expand $Id: x/a 93c8b61c99cd Thu, 01 Jan 1970 00:00:03 +0000 user $
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   247
do not process $Id:
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   248
xxx $
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   249
$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
   250
% 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
   251
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
   252
% cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   253
expand $Id$
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   254
do not process $Id:
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   255
xxx $
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   256
$Xinfo$
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   257
% kwexpand nonexistent
483
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   258
nonexistent:
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   259
% switch off expansion
267
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   260
% kwshrink with unknown file u
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   261
overwriting a shrinking keywords
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   262
overwriting x/a shrinking keywords
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   263
% cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   264
expand $Id$
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   265
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   266
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   267
$Xinfo$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   268
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   269
% hg cat
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   270
expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   271
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   272
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   273
$Xinfo: User Name <user@example.com>: firstline $
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   274
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   275
% cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   276
expand $Id$
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   277
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   278
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   279
$Xinfo$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   280
ignore $Id$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   281
% hg cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   282
expand $Id$
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   283
do not process $Id:
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   284
xxx $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   285
$Xinfo$
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   286
ignore $Id$