tests/test-keyword.t
author Brodie Rao <brodie@bitheap.org>
Sun, 12 Sep 2010 18:05:53 -0500
branchstable
changeset 792 b87861f57222
parent 786 5a41673d33fb
child 793 9cc90e2c826f
permissions -rw-r--r--
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge. [ original upstream message ]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     1
  $ cat <<EOF >> $HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     2
  > [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     3
  > keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     4
  > mq =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     5
  > notify =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     6
  > record =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     7
  > transplant =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     8
  > [ui]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
     9
  > interactive = true
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    10
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    11
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    12
Run kwdemo before [keyword] files are set up
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    13
as it would succeed without uisetup otherwise
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    14
784
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    15
  $ hg --quiet kwdemo
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    16
  [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    17
  keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    18
  [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    19
  demo.txt = 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    20
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    21
  Author = {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    22
  Date = {date|utcdate}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    23
  Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    24
  Id = {file|basename},v {node|short} {date|utcdate} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    25
  RCSFile = {file|basename},v
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    26
  RCSfile = {file|basename},v
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    27
  Revision = {node|short}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    28
  Source = {root}/{file},v
784
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    29
  \$Author: test \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    30
  \$Date: ..../../.. ..:..:.. \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    31
  \$Header: .*/demo.txt,v ............ ..../../.. ..:..:.. test \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    32
  \$Id: demo.txt,v ............ ..../../.. ..:..:.. test \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    33
  \$RCSFile: demo.txt,v \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    34
  \$RCSfile: demo.txt,v \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    35
  \$Revision: ............ \$
7e69e2b40d9b tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents: 782
diff changeset
    36
  \$Source: .*/demo.txt,v \$
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    37
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    38
  $ hg --quiet kwdemo "Branch = {branches}"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    39
  [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    40
  keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    41
  [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    42
  demo.txt = 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    43
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    44
  Branch = {branches}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    45
  $Branch: demobranch $
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    46
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    47
  $ cat <<EOF >> $HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    48
  > [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    49
  > ** =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    50
  > b = ignore
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    51
  > [hooks]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    52
  > commit=
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    53
  > commit.test=cp a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    54
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    55
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    56
  $ hg init Test-bndl
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    57
  $ cd Test-bndl
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    58
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    59
kwshrink should exit silently in empty/invalid repo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    60
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    61
  $ hg kwshrink
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    62
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    63
Symlinks cannot be created on Windows.
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    64
A bundle to test this was made with:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    65
 hg init t
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    66
 cd t
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    67
 echo a > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    68
 ln -s a sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    69
 hg add sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    70
 hg ci -m addsym -u mercurial
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    71
 hg bundle --base null ../test-keyword.hg
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    72
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    73
  $ hg pull -u "$TESTDIR"/test-keyword.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    74
  pulling from .*test-keyword.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    75
  requesting all changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    76
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    77
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    78
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    79
  added 1 changesets with 1 changes to 1 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    80
  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
    81
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    82
  $ echo 'expand $Id$' > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    83
  $ echo 'do not process $Id:' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    84
  $ echo 'xxx $' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    85
  $ echo 'ignore $Id$' > b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    86
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    87
Output files as they were created
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    88
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    89
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    90
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    91
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    92
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    93
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    94
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    95
no kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    96
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    97
  $ hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    98
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    99
untracked candidates
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   100
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   101
  $ hg -v kwfiles --unknown
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   102
  k a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   103
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   104
Add files and check status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   105
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   106
  $ hg addremove
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   107
  adding a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   108
  adding b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   109
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   110
  A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   111
  A b
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   112
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   113
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   114
Default keyword expansion including commit hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   115
Interrupted commit should not change state or run commit hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   116
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   117
  $ hg --debug commit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   118
  abort: empty commit message
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   119
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   120
  A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   121
  A b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   122
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   123
Commit with several checks
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   124
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   125
  $ hg --debug commit -mabsym -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   126
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   127
  b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   128
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   129
  running hook commit.test: cp a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   130
  committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   131
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   132
  ? hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   133
  $ hg debugrebuildstate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   134
  $ hg --quiet identify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   135
  ef63ca68695b
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
   136
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   137
cat files in working directory with keywords expanded
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   138
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   139
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   140
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   141
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   142
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   143
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   144
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   145
hg cat files and symlink, no expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   146
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   147
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   148
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   149
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   150
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   151
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   152
  a.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   153
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   154
Test hook execution
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   155
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   156
  $ diff a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   157
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   158
Removing commit hook from config
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
   159
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   160
  $ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nohook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   161
  $ mv "$HGRCPATH".nohook "$HGRCPATH"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   162
  $ rm hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   163
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   164
bundle
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   165
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   166
  $ hg bundle --base null ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   167
  2 changesets found
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   168
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   169
  $ hg init Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   170
  $ cd Test
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   171
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   172
Notify on pull to check whether keywords stay as is in email
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   173
ie. if patch.diff wrapper acts as it should
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
   174
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   175
  $ cat <<EOF >> $HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   176
  > [hooks]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   177
  > incoming.notify = python:hgext.notify.hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   178
  > [notify]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   179
  > sources = pull
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   180
  > diffstat = False
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   181
  > [reposubs]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   182
  > * = Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   183
  > EOF
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
   184
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   185
Pull from bundle and trigger notify
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
   186
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   187
  $ hg pull -u ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   188
  pulling from ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   189
  requesting all changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   190
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   191
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   192
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   193
  added 2 changesets with 3 changes to 3 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   194
  Content-Type: text/plain; charset="us-ascii"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   195
  MIME-Version: 1.0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   196
  Content-Transfer-Encoding: 7bit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   197
  Date: .*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   198
  Subject: changeset in .*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   199
  From: mercurial
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   200
  X-Hg-Notification: changeset a2392c293916
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   201
  Message-Id: <hg.a2392c293916.*>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   202
  To: Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   203
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   204
  changeset a2392c293916 in .*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   205
  details: .*?cmd=changeset;node=a2392c293916
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   206
  description:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   207
  	addsym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   208
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   209
  diffs (6 lines):
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   210
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   211
  diff -r 000000000000 -r a2392c293916 sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   212
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   213
  +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   214
  @@ -0,0 +1,1 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   215
  +a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   216
  \ No newline at end of file
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   217
  Content-Type: text/plain; charset="us-ascii"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   218
  MIME-Version: 1.0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   219
  Content-Transfer-Encoding: 7bit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   220
  Date:.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   221
  Subject: changeset in.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   222
  From: User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   223
  X-Hg-Notification: changeset ef63ca68695b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   224
  Message-Id: <hg.ef63ca68695b.*>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   225
  To: Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   226
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   227
  changeset ef63ca68695b in .*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   228
  details: .*?cmd=changeset;node=ef63ca68695b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   229
  description:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   230
  	absym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   231
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   232
  diffs (12 lines):
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   233
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   234
  diff -r a2392c293916 -r ef63ca68695b a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   235
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   236
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   237
  @@ -0,0 +1,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   238
  +expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   239
  +do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   240
  +xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   241
  diff -r a2392c293916 -r ef63ca68695b b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   242
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   243
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   244
  @@ -0,0 +1,1 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   245
  +ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   246
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
409
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   247
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   248
Remove notify config
409
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   249
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   250
  $ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nonotify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   251
  $ mv "$HGRCPATH".nonotify "$HGRCPATH"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   252
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   253
Touch files and check with status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   254
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   255
  $ touch a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   256
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   257
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   258
Update and expand
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
   259
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   260
  $ rm sym a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   261
  $ hg update -C
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   262
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   263
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   264
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   265
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   266
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   267
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   268
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   269
Check whether expansion is filewise
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   270
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   271
  $ echo '$Id$' > c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   272
  $ echo 'tests for different changenodes' >> c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   273
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   274
commit file c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   275
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   276
  $ hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   277
  adding c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   278
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   279
force expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   280
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   281
  $ hg -v kwexpand
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   282
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   283
  overwriting c expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   284
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   285
compare changenodes in a and c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   286
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   287
  $ cat a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   288
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   289
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   290
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   291
  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   292
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   293
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   294
record chunk
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   295
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   296
  $ python -c \
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   297
  > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   298
  $ hg record -d '1 10' -m rectest<<EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   299
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   300
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   301
  > n
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   302
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   303
  diff --git a/a b/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   304
  2 hunks, 2 lines changed
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   305
  examine changes to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   306
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   307
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   308
  +foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   309
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   310
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   311
  record change 1/2 to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   312
  @@ -2,2 +3,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   313
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   314
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   315
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   316
  record change 2/2 to 'a'? [Ynsfdaq?] 
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   317
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   318
  $ hg identify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   319
  d17e03c92c97+ tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   320
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   321
  M a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   322
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   323
Cat modified file a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   324
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   325
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   326
  expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   327
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   328
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   329
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   330
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   331
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   332
Diff remaining chunk
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   333
786
5a41673d33fb test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 784
diff changeset
   334
  $ hg diff
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   335
  diff -r d17e03c92c97 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   336
  --- a/a	Wed Dec 31 23:59:51 1969 -0000
786
5a41673d33fb test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 784
diff changeset
   337
  \+\+\+ b/a	.*
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   338
  @@ -2,3 +2,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   339
   foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   340
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   341
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   342
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   343
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   344
  $ hg rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   345
  rolling back to revision 2 (undo commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   346
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   347
Record all chunks in file a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   348
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   349
  $ echo foo > msg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   350
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   351
 - do not use "hg record -m" here!
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   352
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   353
  $ hg record -l msg -d '1 11'<<EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   354
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   355
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   356
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   357
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   358
  diff --git a/a b/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   359
  2 hunks, 2 lines changed
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   360
  examine changes to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   361
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   362
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   363
  +foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   364
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   365
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   366
  record change 1/2 to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   367
  @@ -2,2 +3,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   368
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   369
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   370
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   371
  record change 2/2 to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   372
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   373
File a should be clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   374
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   375
  $ hg status -A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   376
  C a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   377
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   378
  $ rm msg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   379
  $ hg rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   380
  rolling back to revision 2 (undo commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   381
  $ hg update -C
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   382
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   383
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   384
Test patch queue repo
765
c5badbf855db Force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents: 743
diff changeset
   385
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   386
  $ hg init --mq
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   387
  $ hg qimport -r tip -n mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   388
  $ hg commit --mq -m mqtest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   389
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   390
Keywords should not be expanded in patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   391
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   392
  $ cat .hg/patches/mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   393
  # HG changeset patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   394
  # User User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   395
  # Date 1 0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   396
  # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   397
  # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   398
  cndiff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   399
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   400
  diff -r ef63ca68695b -r 40a904bbbe4c c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   401
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   402
  +++ b/c	Thu Jan 01 00:00:01 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   403
  @@ -0,0 +1,2 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   404
  +$Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   405
  +tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   406
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   407
  $ hg qpop
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   408
  popping mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   409
  patch queue now empty
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   410
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   411
qgoto, implying qpush, should expand
737
dc8fe24c628e Test recording
Christian Ebert <blacktrash@gmx.net>
parents: 735
diff changeset
   412
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   413
  $ hg qgoto mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   414
  applying mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   415
  now at: mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   416
  $ cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   417
  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   418
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   419
  $ hg cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   420
  $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   421
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   422
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   423
Keywords should not be expanded in filelog
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   424
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   425
  $ hg --config 'extensions.keyword=!' cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   426
  $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   427
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   428
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   429
qpop and move on
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   430
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   431
  $ hg qpop
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   432
  popping mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   433
  patch queue now empty
336
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   434
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   435
Copy and show added kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   436
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   437
  $ hg cp a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   438
  $ hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   439
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   440
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   441
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   442
Commit and show expansion in original and copy
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   443
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   444
  $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   445
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   446
   c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   447
  overwriting c expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   448
  committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   449
  $ cat a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   450
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   451
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   452
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   453
  expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   454
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   455
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   456
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   457
Touch copied c and check its status
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   458
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   459
  $ touch c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   460
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   461
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   462
Test different options of hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   463
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   464
  $ hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   465
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   466
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   467
  $ hg -v kwfiles --ignore
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   468
  I b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   469
  I sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   470
  $ hg kwfiles --all
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   471
  K a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   472
  K c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   473
  I b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   474
  I sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   475
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   476
Diff specific revision
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   477
786
5a41673d33fb test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 784
diff changeset
   478
  $ hg diff --rev 1
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   479
  diff -r ef63ca68695b c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   480
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
786
5a41673d33fb test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 784
diff changeset
   481
  \+\+\+ b/c	.*
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   482
  @@ -0,0 +1,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   483
  +expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   484
  +do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   485
  +xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   486
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   487
Status after rollback:
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   488
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   489
  $ hg rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   490
  rolling back to revision 1 (undo commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   491
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   492
  A c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   493
  $ hg update --clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   494
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   495
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   496
Custom keywordmaps as argument to kwdemo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   497
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   498
  $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   499
  [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   500
  keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   501
  [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   502
  ** = 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   503
  b = ignore
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   504
  demo.txt = 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   505
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   506
  Xinfo = {author}: {desc}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   507
  $Xinfo: test: hg keyword configuration and expansion example $
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   508
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   509
Configure custom keywordmaps
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   510
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   511
  $ cat <<EOF >>$HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   512
  > [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   513
  > Id = {file} {node|short} {date|rfc822date} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   514
  > Xinfo = {author}: {desc}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   515
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   516
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   517
Cat and hg cat files before custom expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   518
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   519
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   520
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   521
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   522
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   523
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   524
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   525
  expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   526
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   527
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   528
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   529
  a.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   530
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   531
Write custom keyword and prepare multiline commit message
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   532
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   533
  $ echo '$Xinfo$' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   534
  $ cat <<EOF >> log
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   535
  > firstline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   536
  > secondline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   537
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   538
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   539
Interrupted commit should not change state
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   540
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   541
  $ hg commit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   542
  abort: empty commit message
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   543
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   544
  M a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   545
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   546
  ? log
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   547
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   548
Commit with multiline message and custom expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   549
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   550
  $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   551
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   552
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   553
  committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   554
  $ rm log
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   555
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   556
Stat, verify and show custom expansion (firstline)
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   557
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   558
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   559
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   560
  $ hg verify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   561
  checking changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   562
  checking manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   563
  crosschecking files in changesets and manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   564
  checking files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   565
  3 files, 3 changesets, 4 total revisions
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   566
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   567
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   568
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   569
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   570
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   571
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   572
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   573
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   574
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   575
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   576
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   577
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   578
  a.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   579
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   580
annotate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   581
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   582
  $ hg annotate a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   583
  1: expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   584
  1: do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   585
  1: xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   586
  2: $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   587
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   588
remove with status checks
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   589
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   590
  $ hg debugrebuildstate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   591
  $ hg remove a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   592
  $ hg --debug commit -m rma
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   593
  committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   594
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   595
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   596
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   597
Rollback, revert, and check expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   598
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   599
  $ hg rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   600
  rolling back to revision 2 (undo commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   601
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   602
  R a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   603
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   604
  $ hg revert --no-backup --rev tip a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   605
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   606
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   607
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   608
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   609
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   610
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   611
Clone to test global and local configurations
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   612
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   613
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   614
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   615
Expansion in destinaton with global configuration
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   616
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   617
  $ hg --quiet clone Test globalconf
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   618
  $ cat globalconf/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   619
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   620
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   621
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   622
  $Xinfo: User Name <user@example.com>: firstline $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   623
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   624
No expansion in destination with local configuration in origin only
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   625
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   626
  $ hg --quiet --config 'keyword.**=ignore' clone Test localconf
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   627
  $ cat localconf/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   628
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   629
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   630
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   631
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   632
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   633
Clone to test incoming
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 765
diff changeset
   634
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   635
  $ hg clone -r1 Test Test-a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   636
  requesting all changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   637
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   638
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   639
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   640
  added 2 changesets with 3 changes to 3 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   641
  updating to branch default
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   642
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   643
  $ cd Test-a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   644
  $ cat <<EOF >> .hg/hgrc
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   645
  > [paths]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   646
  > default = ../Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   647
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   648
  $ hg incoming
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   649
  comparing with .*test-keyword.t/Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   650
  searching for changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   651
  changeset:   2:bb948857c743
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   652
  tag:         tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   653
  user:        User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   654
  date:        Thu Jan 01 00:00:02 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   655
  summary:     firstline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   656
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   657
Imported patch should not be rejected
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 765
diff changeset
   658
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   659
  $ sed -e 's/Id.*/& rejecttest/' a > a.new
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   660
  $ mv a.new a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   661
  $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   662
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   663
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   664
  committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   665
  $ hg export -o ../rejecttest.diff tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   666
  $ cd ../Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   667
  $ hg import ../rejecttest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   668
  applying ../rejecttest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   669
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   670
  expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   671
  do not process $Id: rejecttest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   672
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   673
  $Xinfo: User Name <user@example.com>: rejects? $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   674
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   675
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   676
  $ hg rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   677
  rolling back to revision 2 (undo commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   678
  $ hg update --clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   679
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   680
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   681
kwexpand/kwshrink on selected files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   682
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   683
  $ mkdir x
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   684
  $ hg copy a x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   685
  $ hg --verbose kwexpand a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   686
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   687
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   688
kwexpand x/a should abort
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   689
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   690
  $ hg --verbose kwexpand x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   691
  abort: outstanding uncommitted changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   692
  $ cd x
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   693
  $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   694
  x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   695
   x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   696
  overwriting x/a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   697
  committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   698
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   699
  expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   700
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   701
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   702
  $Xinfo: User Name <user@example.com>: xa $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   703
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   704
kwshrink a inside directory x
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   705
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   706
  $ hg --verbose kwshrink a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   707
  overwriting x/a shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   708
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   709
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   710
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   711
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   712
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   713
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   714
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   715
kwexpand nonexistent
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   716
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   717
  $ hg kwexpand nonexistent
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   718
  nonexistent:.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   719
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   720
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   721
hg serve
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   722
 - expand with hgweb file
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   723
 - no expansion with hgweb annotate/changeset/filediff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   724
 - check errors
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   725
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   726
  $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   727
  $ cat hg.pid >> $DAEMON_PIDS
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   728
  $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/file/tip/a/?style=raw'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   729
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   730
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   731
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   732
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   733
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   734
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   735
  $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/annotate/tip/a/?style=raw'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   736
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   737
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   738
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   739
  user@1: expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   740
  user@1: do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   741
  user@1: xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   742
  user@2: $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   743
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   744
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   745
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   746
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   747
  $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/rev/tip/?style=raw'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   748
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   749
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   750
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   751
  # HG changeset patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   752
  # User User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   753
  # Date 3 0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   754
  # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   755
  # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   756
  xa
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   757
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   758
  diff -r bb948857c743 -r b4560182a3f9 x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   759
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   760
  +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   761
  @@ -0,0 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   762
  +expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   763
  +do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   764
  +xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   765
  +$Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   766
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   767
  $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/diff/bb948857c743/a?style=raw'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   768
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   769
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   770
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   771
  diff -r ef63ca68695b -r bb948857c743 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   772
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   773
  +++ b/a	Thu Jan 01 00:00:02 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   774
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   775
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   776
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   777
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   778
  +$Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   779
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   780
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   781
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   782
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   783
  $ cat errors.log
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   784
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   785
Prepare merge and resolve tests
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   786
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   787
  $ echo '$Id$' > m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   788
  $ hg add m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   789
  $ hg commit -m 4kw 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   790
  $ echo foo >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   791
  $ hg commit -m 5foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   792
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   793
simplemerge
482
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   794
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   795
  $ hg update 4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   796
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   797
  $ echo foo >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   798
  $ hg commit -m 6foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   799
  created new head
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   800
  $ hg merge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   801
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   802
  (branch merge, don't forget to commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   803
  $ hg commit -m simplemerge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   804
  $ cat m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   805
  $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   806
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   807
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   808
conflict: keyword should stay outside conflict zone
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   809
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   810
  $ hg update 4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   811
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   812
  $ echo bar >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   813
  $ hg commit -m 8bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   814
  created new head
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   815
  $ hg merge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   816
  merging m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   817
  warning: conflicts during merge.
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   818
  merging m failed!
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   819
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
792
b87861f57222 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 786
diff changeset
   820
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   821
  $ cat m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   822
  $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   823
  <<<<<<< local
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   824
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   825
  =======
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   826
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   827
  >>>>>>> other
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   828
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   829
resolve to local
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   830
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   831
  $ HGMERGE=internal:local hg resolve -a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   832
  $ hg commit -m localresolve
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   833
  $ cat m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   834
  $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   835
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   836
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   837
Test restricted mode with transplant -b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   838
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   839
  $ hg update 6
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   840
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   841
  $ hg branch foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   842
  marked working directory as branch foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   843
  $ mv a a.bak
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   844
  $ echo foobranch > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   845
  $ cat a.bak >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   846
  $ rm a.bak
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   847
  $ hg commit -m 9foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   848
  $ hg update default
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   849
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   850
  $ hg -y transplant -b foo tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   851
  applying 4aa30d025d50
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   852
  4aa30d025d50 transplanted to 5a4da427c162
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   853
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   854
Expansion in changeset but not in file
485
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   855
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   856
  $ hg tip -p
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   857
  changeset:   11:5a4da427c162
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   858
  tag:         tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   859
  parent:      9:41efa6d38e9b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   860
  user:        test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   861
  date:        Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   862
  summary:     9foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   863
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   864
  diff -r 41efa6d38e9b -r 5a4da427c162 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   865
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   866
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   867
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   868
  +foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   869
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   870
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   871
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   872
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   873
  $ head -n 2 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   874
  foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   875
  expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   876
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   877
Switch of expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   878
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   879
  $ hg -q rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   880
  $ hg -q update -C
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   881
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   882
kwshrink with unknown file u
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   883
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   884
  $ cp a u
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   885
  $ hg --verbose kwshrink
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   886
  overwriting a shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   887
  overwriting m shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   888
  overwriting x/a shrinking keywords
668
13a6a2c0440f Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents: 653
diff changeset
   889
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   890
Keywords shrunk in working directory, but not yet disabled
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   891
 - cat shows unexpanded keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   892
 - hg cat shows expanded keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   893
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   894
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   895
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   896
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   897
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   898
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   899
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   900
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   901
  expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   902
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   903
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   904
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   905
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   906
  a.*
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   907
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   908
Now disable keyword expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   909
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   910
  $ rm "$HGRCPATH"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   911
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   912
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   913
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   914
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   915
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   916
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   917
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   918
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   919
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   920
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   921
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   922
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   923
  a.*