tests/test-keyword.t
author Patrick Mezard <pmezard@gmail.com>
Sat, 11 Jun 2011 14:17:25 +0200
branchstable
changeset 964 aaafe06aaa5f
parent 928 e1bf64aaef4f
child 981 0b32ba113ad2
permissions -rw-r--r--
patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects. [ 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 = 
874
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
    20
  [keywordset]
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
    21
  svn = False
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    22
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    23
  Author = {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    24
  Date = {date|utcdate}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    25
  Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    26
  Id = {file|basename},v {node|short} {date|utcdate} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    27
  RCSFile = {file|basename},v
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    28
  RCSfile = {file|basename},v
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    29
  Revision = {node|short}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    30
  Source = {root}/{file},v
797
f0d8ac85ca21 tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents: 793
diff changeset
    31
  $Author: test $
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    32
  $Date: ????/??/?? ??:??:?? $ (glob)
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    33
  $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    34
  $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
797
f0d8ac85ca21 tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents: 793
diff changeset
    35
  $RCSFile: demo.txt,v $
f0d8ac85ca21 tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents: 793
diff changeset
    36
  $RCSfile: demo.txt,v $
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    37
  $Revision: ???????????? $ (glob)
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    38
  $Source: */demo.txt,v $ (glob)
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    39
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    40
  $ hg --quiet kwdemo "Branch = {branches}"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    41
  [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    42
  keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    43
  [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    44
  demo.txt = 
874
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
    45
  [keywordset]
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
    46
  svn = False
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    47
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    48
  Branch = {branches}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    49
  $Branch: demobranch $
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    50
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    51
  $ cat <<EOF >> $HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    52
  > [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    53
  > ** =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    54
  > b = ignore
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
    55
  > i = ignore
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    56
  > [hooks]
817
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
    57
  > EOF
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
    58
  $ cp $HGRCPATH $HGRCPATH.nohooks
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
    59
  > cat <<EOF >> $HGRCPATH
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    60
  > commit=
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    61
  > commit.test=cp a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    62
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    63
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    64
  $ hg init Test-bndl
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    65
  $ cd Test-bndl
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    66
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    67
kwshrink should exit silently in empty/invalid repo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    68
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    69
  $ hg kwshrink
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    70
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    71
Symlinks cannot be created on Windows.
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    72
A bundle to test this was made with:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    73
 hg init t
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    74
 cd t
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    75
 echo a > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    76
 ln -s a sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    77
 hg add sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    78
 hg ci -m addsym -u mercurial
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    79
 hg bundle --base null ../test-keyword.hg
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    80
925
b73d6eb16638 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 888
diff changeset
    81
  $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
    82
  pulling from *test-keyword.hg (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    83
  requesting all changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    84
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    85
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    86
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    87
  added 1 changesets with 1 changes to 1 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    88
  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
    89
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    90
  $ echo 'expand $Id$' > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    91
  $ echo 'do not process $Id:' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    92
  $ echo 'xxx $' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    93
  $ echo 'ignore $Id$' > b
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
Output files as they were created
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    96
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    97
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    98
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
    99
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   100
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   101
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   102
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   103
no kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   104
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   105
  $ hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   106
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   107
untracked candidates
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   108
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   109
  $ hg -v kwfiles --unknown
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   110
  k a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   111
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   112
Add files and check status
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
  $ hg addremove
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   115
  adding a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   116
  adding b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   117
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   118
  A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   119
  A b
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   120
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   121
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   122
Default keyword expansion including commit hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   123
Interrupted commit should not change state or run commit hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   124
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   125
  $ hg --debug commit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   126
  abort: empty commit message
793
9cc90e2c826f tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 792
diff changeset
   127
  [255]
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   128
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   129
  A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   130
  A b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   131
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   132
Commit with several checks
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   133
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   134
  $ hg --debug commit -mabsym -u 'User Name <user@example.com>'
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   135
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   136
  b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   137
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   138
  running hook commit.test: cp a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   139
  committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   140
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   141
  ? hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   142
  $ hg debugrebuildstate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   143
  $ hg --quiet identify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   144
  ef63ca68695b
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
   145
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   146
cat files in working directory with keywords expanded
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   147
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   148
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   149
  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
   150
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   151
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   152
  ignore $Id$
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
hg cat files and symlink, no expansion
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
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   157
  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
   158
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   159
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   160
  ignore $Id$
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   161
  a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   162
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   163
Test hook execution
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   164
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   165
  $ diff a hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   166
817
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
   167
  $ cp $HGRCPATH.nohooks $HGRCPATH
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   168
  $ rm hooktest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   169
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   170
bundle
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   171
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   172
  $ hg bundle --base null ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   173
  2 changesets found
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   174
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   175
  $ hg init Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   176
  $ cd Test
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   177
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   178
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
   179
ie. if patch.diff wrapper acts as it should
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
   180
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   181
  $ cat <<EOF >> $HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   182
  > [hooks]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   183
  > incoming.notify = python:hgext.notify.hook
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   184
  > [notify]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   185
  > sources = pull
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   186
  > diffstat = False
831
1069be3ee9db test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents: 830
diff changeset
   187
  > maxsubject = 15
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   188
  > [reposubs]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   189
  > * = Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   190
  > EOF
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
   191
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   192
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
   193
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   194
  $ hg pull -u ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   195
  pulling from ../kw.hg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   196
  requesting all changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   197
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   198
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   199
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   200
  added 2 changesets with 3 changes to 3 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   201
  Content-Type: text/plain; charset="us-ascii"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   202
  MIME-Version: 1.0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   203
  Content-Transfer-Encoding: 7bit
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   204
  Date: * (glob)
831
1069be3ee9db test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents: 830
diff changeset
   205
  Subject: changeset in...
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   206
  From: mercurial
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   207
  X-Hg-Notification: changeset a2392c293916
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   208
  Message-Id: <hg.a2392c293916*> (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   209
  To: Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   210
  
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   211
  changeset a2392c293916 in $TESTTMP/Test
888
8c5c3a0aa6d5 tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents: 884
diff changeset
   212
  details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   213
  description:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   214
  	addsym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   215
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   216
  diffs (6 lines):
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   217
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   218
  diff -r 000000000000 -r a2392c293916 sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   219
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   220
  +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   221
  @@ -0,0 +1,1 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   222
  +a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   223
  \ No newline at end of file
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   224
  Content-Type: text/plain; charset="us-ascii"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   225
  MIME-Version: 1.0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   226
  Content-Transfer-Encoding: 7bit
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   227
  Date:* (glob)
831
1069be3ee9db test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents: 830
diff changeset
   228
  Subject: changeset in...
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   229
  From: User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   230
  X-Hg-Notification: changeset ef63ca68695b
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   231
  Message-Id: <hg.ef63ca68695b*> (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   232
  To: Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   233
  
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   234
  changeset ef63ca68695b in $TESTTMP/Test
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   235
  details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   236
  description:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   237
  	absym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   238
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   239
  diffs (12 lines):
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   240
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   241
  diff -r a2392c293916 -r ef63ca68695b a
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/a	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,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   245
  +expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   246
  +do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   247
  +xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   248
  diff -r a2392c293916 -r ef63ca68695b b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   249
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   250
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   251
  @@ -0,0 +1,1 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   252
  +ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   253
  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
   254
817
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
   255
  $ cp $HGRCPATH.nohooks $HGRCPATH
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   256
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   257
Touch files and check with status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   258
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   259
  $ touch a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   260
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   261
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   262
Update and expand
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
   263
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   264
  $ rm sym a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   265
  $ hg update -C
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   266
  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
   267
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   268
  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
   269
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   270
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   271
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   272
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   273
Check whether expansion is filewise
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   274
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   275
  $ echo '$Id$' > c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   276
  $ echo 'tests for different changenodes' >> c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   277
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   278
commit file c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   279
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   280
  $ 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
   281
  adding c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   282
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   283
force expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   284
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   285
  $ hg -v kwexpand
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   286
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   287
  overwriting c expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   288
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   289
compare changenodes in a and c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   290
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   291
  $ cat a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   292
  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
   293
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   294
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   295
  $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
   296
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   297
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   298
record
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   299
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   300
  $ echo '$Id$' > r
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   301
  $ hg add r
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   302
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   303
record chunk
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   304
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   305
  $ python -c \
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   306
  > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);'
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   307
  $ hg record -d '1 10' -m rectest a<<EOF
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   308
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   309
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   310
  > n
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   311
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   312
  diff --git a/a b/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   313
  2 hunks, 2 lines changed
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   314
  examine changes to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   315
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   316
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   317
  +foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   318
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   319
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   320
  record change 1/2 to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   321
  @@ -2,2 +3,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   322
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   323
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   324
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   325
  record change 2/2 to 'a'? [Ynsfdaq?] 
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   326
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   327
  $ hg identify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   328
  d17e03c92c97+ tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   329
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   330
  M a
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   331
  A r
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   332
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   333
Cat modified file a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   334
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   335
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   336
  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
   337
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   338
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   339
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   340
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   341
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   342
Diff remaining chunk
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   343
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   344
  $ hg diff a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   345
  diff -r d17e03c92c97 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   346
  --- a/a	Wed Dec 31 23:59:51 1969 -0000
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   347
  +++ b/a	* (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   348
  @@ -2,3 +2,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   349
   foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   350
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   351
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   352
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   353
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   354
  $ hg rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   355
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   356
  working directory now based on revision 2
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   357
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   358
Record all chunks in file a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   359
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   360
  $ echo foo > msg
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   361
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   362
 - do not use "hg record -m" here!
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   363
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   364
  $ hg record -l msg -d '1 11' a<<EOF
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   365
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   366
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   367
  > y
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   368
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   369
  diff --git a/a b/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   370
  2 hunks, 2 lines changed
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   371
  examine changes to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   372
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   373
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   374
  +foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   375
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   376
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   377
  record change 1/2 to 'a'? [Ynsfdaq?] 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   378
  @@ -2,2 +3,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   379
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   380
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   381
  +bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   382
  record change 2/2 to 'a'? [Ynsfdaq?] 
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
File a should be clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   385
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   386
  $ hg status -A a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   387
  C a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   388
809
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   389
rollback and revert expansion
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   390
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   391
  $ cat a
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   392
  expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   393
  foo
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   394
  do not process $Id:
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   395
  xxx $
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   396
  bar
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   397
  $ hg --verbose rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   398
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   399
  working directory now based on revision 2
809
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   400
  overwriting a expanding keywords
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   401
  $ hg status a
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   402
  M a
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   403
  $ cat a
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   404
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   405
  foo
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   406
  do not process $Id:
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   407
  xxx $
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   408
  bar
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   409
  $ echo '$Id$' > y
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   410
  $ echo '$Id$' > z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   411
  $ hg add y
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   412
  $ hg commit -Am "rollback only" z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   413
  $ cat z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   414
  $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   415
  $ hg --verbose rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   416
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   417
  working directory now based on revision 2
809
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   418
  overwriting z shrinking keywords
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   419
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   420
Only z should be overwritten
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   421
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   422
  $ hg status a y z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   423
  M a
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   424
  A y
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   425
  A z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   426
  $ cat z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   427
  $Id$
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   428
  $ hg forget y z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   429
  $ rm y z
028b6584decb Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents: 806
diff changeset
   430
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   431
record added file alone
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   432
818
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   433
  $ hg -v record -l msg -d '1 12' r<<EOF
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   434
  > y
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   435
  > EOF
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   436
  diff --git a/r b/r
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   437
  new file mode 100644
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   438
  examine changes to 'r'? [Ynsfdaq?] 
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   439
  r
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   440
  committed changeset 3:899491280810
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   441
  overwriting r expanding keywords
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   442
  $ hg --verbose rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   443
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   444
  working directory now based on revision 2
818
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   445
  overwriting r shrinking keywords
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   446
  $ hg forget r
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   447
  $ rm msg r
836
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   448
  $ hg update -C
53a9228f13de Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents: 831
diff changeset
   449
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
818
b742a071ad9c Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents: 817
diff changeset
   450
846
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   451
record added keyword ignored file
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   452
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   453
  $ echo '$Id$' > i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   454
  $ hg add i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   455
  $ hg --verbose record -d '1 13' -m recignored<<EOF
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   456
  > y
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   457
  > EOF
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   458
  diff --git a/i b/i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   459
  new file mode 100644
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   460
  examine changes to 'i'? [Ynsfdaq?] 
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   461
  i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   462
  committed changeset 3:5f40fe93bbdc
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   463
  $ cat i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   464
  $Id$
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   465
  $ hg -q rollback
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   466
  $ hg forget i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   467
  $ rm i
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   468
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   469
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
   470
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   471
  $ hg init --mq
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   472
  $ hg qimport -r tip -n mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   473
  $ hg commit --mq -m mqtest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   474
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   475
Keywords should not be expanded in patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   476
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   477
  $ cat .hg/patches/mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   478
  # HG changeset patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   479
  # User User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   480
  # Date 1 0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   481
  # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   482
  # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   483
  cndiff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   484
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   485
  diff -r ef63ca68695b -r 40a904bbbe4c c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   486
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   487
  +++ b/c	Thu Jan 01 00:00:01 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   488
  @@ -0,0 +1,2 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   489
  +$Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   490
  +tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   491
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   492
  $ hg qpop
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   493
  popping mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   494
  patch queue now empty
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
qgoto, implying qpush, should expand
737
dc8fe24c628e Test recording
Christian Ebert <blacktrash@gmx.net>
parents: 735
diff changeset
   497
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   498
  $ hg qgoto mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   499
  applying mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   500
  now at: mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   501
  $ cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   502
  $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
   503
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   504
  $ hg cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   505
  $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
   506
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   507
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   508
Keywords should not be expanded in filelog
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   509
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   510
  $ hg --config 'extensions.keyword=!' cat c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   511
  $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   512
  tests for different changenodes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   513
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   514
qpop and move on
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   515
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   516
  $ hg qpop
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   517
  popping mqtest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   518
  patch queue now empty
336
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   519
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   520
Copy and show added kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   521
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   522
  $ hg cp a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   523
  $ hg kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   524
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   525
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   526
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   527
Commit and show expansion in original and copy
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   528
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   529
  $ 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
   530
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   531
   c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   532
  overwriting c expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   533
  committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   534
  $ cat a c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   535
  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
   536
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   537
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   538
  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
   539
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   540
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   541
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   542
Touch copied c and check its status
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   543
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   544
  $ touch c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   545
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   546
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   547
Copy kwfile to keyword ignored file unexpanding keywords
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   548
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   549
  $ hg --verbose copy a i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   550
  copying a to i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   551
  overwriting i shrinking keywords
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   552
  $ head -n 1 i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   553
  expand $Id$
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   554
  $ hg forget i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   555
  $ rm i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   556
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   557
Copy ignored file to ignored file: no overwriting
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   558
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   559
  $ hg --verbose copy b i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   560
  copying b to i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   561
  $ hg forget i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   562
  $ rm i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   563
868
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   564
cp symlink file; hg cp -A symlink file (part1)
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   565
- copied symlink points to kwfile: overwrite
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   566
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   567
  $ cp sym i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   568
  $ ls -l i
830
7c5571af20c9 test-keyword: fix test glob to ACL/SELinux flag
Mads Kiilerich <mads@kiilerich.com>
parents: 828
diff changeset
   569
  -rw-r--r--* (glob)
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   570
  $ head -1 i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   571
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   572
  $ hg copy --after --verbose sym i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   573
  copying sym to i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   574
  overwriting i shrinking keywords
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   575
  $ head -1 i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   576
  expand $Id$
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   577
  $ hg forget i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   578
  $ rm i
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   579
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   580
Test different options of hg kwfiles
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 kwfiles
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   583
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   584
  c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   585
  $ hg -v kwfiles --ignore
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   586
  I b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   587
  I sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   588
  $ hg kwfiles --all
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   589
  K a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   590
  K c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   591
  I b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   592
  I sym
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   593
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   594
Diff specific revision
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   595
786
5a41673d33fb test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 784
diff changeset
   596
  $ hg diff --rev 1
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   597
  diff -r ef63ca68695b c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   598
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   599
  +++ b/c	* (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   600
  @@ -0,0 +1,3 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   601
  +expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   602
  +do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   603
  +xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   604
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   605
Status after rollback:
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   606
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   607
  $ hg rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   608
  repository tip rolled back to revision 1 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   609
  working directory now based on revision 1
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   610
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   611
  A c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   612
  $ hg update --clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   613
  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
   614
868
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   615
cp symlink file; hg cp -A symlink file (part2)
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   616
- copied symlink points to kw ignored file: do not overwrite
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   617
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   618
  $ cat a > i
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   619
  $ ln -s i symignored
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   620
  $ hg commit -Am 'fake expansion in ignored and symlink' i symignored
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   621
  $ cp symignored x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   622
  $ hg copy --after --verbose symignored x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   623
  copying symignored to x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   624
  $ head -n 1 x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   625
  expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   626
  $ hg forget x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   627
  $ rm x
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   628
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   629
  $ hg rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   630
  repository tip rolled back to revision 1 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   631
  working directory now based on revision 1
868
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   632
  $ hg update --clean
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   633
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   634
  $ rm i symignored
16cfcb56859a Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents: 850
diff changeset
   635
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   636
Custom keywordmaps as argument to kwdemo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   637
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   638
  $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   639
  [extensions]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   640
  keyword =
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   641
  [keyword]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   642
  ** = 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   643
  b = ignore
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   644
  demo.txt = 
814
0588121c815b Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents: 809
diff changeset
   645
  i = ignore
874
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
   646
  [keywordset]
272a8a316f7a Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents: 868
diff changeset
   647
  svn = False
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   648
  [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   649
  Xinfo = {author}: {desc}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   650
  $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
   651
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   652
Configure custom keywordmaps
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   653
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   654
  $ cat <<EOF >>$HGRCPATH
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   655
  > [keywordmaps]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   656
  > Id = {file} {node|short} {date|rfc822date} {author|user}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   657
  > Xinfo = {author}: {desc}
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   658
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   659
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   660
Cat and hg cat files before custom expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   661
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   662
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   663
  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
   664
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   665
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   666
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   667
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   668
  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
   669
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   670
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   671
  ignore $Id$
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   672
  a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   673
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   674
Write custom keyword and prepare multiline commit message
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   675
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   676
  $ echo '$Xinfo$' >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   677
  $ cat <<EOF >> log
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   678
  > firstline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   679
  > secondline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   680
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   681
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   682
Interrupted commit should not change state
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   683
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   684
  $ hg commit
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   685
  abort: empty commit message
793
9cc90e2c826f tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 792
diff changeset
   686
  [255]
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   687
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   688
  M a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   689
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   690
  ? log
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   691
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   692
Commit with multiline message and custom expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   693
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   694
  $ 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
   695
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   696
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   697
  committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   698
  $ rm log
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   699
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   700
Stat, verify and show custom expansion (firstline)
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   701
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   702
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   703
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   704
  $ hg verify
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   705
  checking changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   706
  checking manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   707
  crosschecking files in changesets and manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   708
  checking files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   709
  3 files, 3 changesets, 4 total revisions
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   710
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   711
  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
   712
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   713
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   714
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   715
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   716
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   717
  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
   718
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   719
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   720
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   721
  ignore $Id$
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   722
  a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   723
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   724
annotate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   725
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   726
  $ hg annotate a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   727
  1: expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   728
  1: do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   729
  1: xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   730
  2: $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   731
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   732
remove with status checks
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   733
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   734
  $ hg debugrebuildstate
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   735
  $ hg remove a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   736
  $ hg --debug commit -m rma
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   737
  committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   738
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   739
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   740
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   741
Rollback, revert, and check expansion
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   742
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   743
  $ hg rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   744
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   745
  working directory now based on revision 2
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   746
  $ hg status
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   747
  R a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   748
  ? c
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   749
  $ hg revert --no-backup --rev tip a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   750
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   751
  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
   752
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   753
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   754
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   755
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   756
Clone to test global and local configurations
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
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   759
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   760
Expansion in destinaton with global configuration
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   761
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   762
  $ hg --quiet clone Test globalconf
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   763
  $ cat globalconf/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   764
  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
   765
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   766
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   767
  $Xinfo: User Name <user@example.com>: firstline $
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   768
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   769
No expansion in destination with local configuration in origin only
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   770
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   771
  $ hg --quiet --config 'keyword.**=ignore' clone Test localconf
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   772
  $ cat localconf/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   773
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   774
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   775
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   776
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   777
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   778
Clone to test incoming
773
9f939fae8ff3 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents: 765
diff changeset
   779
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   780
  $ hg clone -r1 Test Test-a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   781
  adding changesets
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   782
  adding manifests
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   783
  adding file changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   784
  added 2 changesets with 3 changes to 3 files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   785
  updating to branch default
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   786
  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
   787
  $ cd Test-a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   788
  $ cat <<EOF >> .hg/hgrc
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   789
  > [paths]
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   790
  > default = ../Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   791
  > EOF
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   792
  $ hg incoming
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
   793
  comparing with $TESTTMP/Test
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   794
  searching for changes
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   795
  changeset:   2:bb948857c743
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   796
  tag:         tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   797
  user:        User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   798
  date:        Thu Jan 01 00:00:02 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   799
  summary:     firstline
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   800
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   801
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
   802
817
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
   803
  $ python -c \
cd834b4035ec test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents: 814
diff changeset
   804
  > 'import re; s=re.sub("(Id.*)","\\1 rejecttest",open("a").read()); open("a","wb").write(s);'
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   805
  $ 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
   806
  a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   807
  overwriting a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   808
  committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   809
  $ hg export -o ../rejecttest.diff tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   810
  $ cd ../Test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   811
  $ hg import ../rejecttest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   812
  applying ../rejecttest.diff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   813
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   814
  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
   815
  do not process $Id: rejecttest
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   816
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   817
  $Xinfo: User Name <user@example.com>: rejects? $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   818
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   819
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   820
  $ hg rollback
884
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   821
  repository tip rolled back to revision 2 (undo commit)
fe775751eb93 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 874
diff changeset
   822
  working directory now based on revision 2
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   823
  $ hg update --clean
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   824
  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
   825
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   826
kwexpand/kwshrink on selected files
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   827
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   828
  $ mkdir x
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   829
  $ hg copy a x/a
846
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   830
  $ hg --verbose kwshrink a
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   831
  overwriting a shrinking keywords
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   832
  $ hg status a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   833
  $ hg --verbose kwexpand a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   834
  overwriting a expanding keywords
846
d565787a8a5d Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents: 836
diff changeset
   835
  $ hg status a
782
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
kwexpand x/a should abort
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   838
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   839
  $ hg --verbose kwexpand x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   840
  abort: outstanding uncommitted changes
793
9cc90e2c826f tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 792
diff changeset
   841
  [255]
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   842
  $ cd x
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   843
  $ 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
   844
  x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   845
   x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   846
  overwriting x/a expanding keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   847
  committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   848
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   849
  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
   850
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   851
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   852
  $Xinfo: User Name <user@example.com>: xa $
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
kwshrink a inside directory x
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   855
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   856
  $ hg --verbose kwshrink a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   857
  overwriting x/a shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   858
  $ cat a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   859
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   860
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   861
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   862
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   863
  $ cd ..
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   864
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   865
kwexpand nonexistent
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   866
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   867
  $ hg kwexpand nonexistent
801
413c6fe6d1e3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 800
diff changeset
   868
  nonexistent:* (glob)
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   869
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   870
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   871
hg serve
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   872
 - expand with hgweb file
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   873
 - no expansion with hgweb annotate/changeset/filediff
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   874
 - check errors
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   875
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   876
  $ 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
   877
  $ cat hg.pid >> $DAEMON_PIDS
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   878
  $ $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
   879
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   880
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   881
  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
   882
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   883
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   884
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   885
  $ $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
   886
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   887
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   888
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   889
  user@1: expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   890
  user@1: do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   891
  user@1: xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   892
  user@2: $Xinfo$
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
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   895
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   896
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   897
  $ $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
   898
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   899
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   900
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   901
  # HG changeset patch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   902
  # User User Name <user@example.com>
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   903
  # Date 3 0
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   904
  # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   905
  # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   906
  xa
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
  diff -r bb948857c743 -r b4560182a3f9 x/a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   909
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   910
  +++ 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
   911
  @@ -0,0 +1,4 @@
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
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   917
  $ $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
   918
  200 Script output follows
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   919
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   920
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   921
  diff -r ef63ca68695b -r bb948857c743 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   922
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   923
  +++ b/a	Thu Jan 01 00:00:02 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   924
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   925
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   926
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   927
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   928
  +$Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   929
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   930
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   931
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   932
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   933
  $ cat errors.log
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   934
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   935
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
   936
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   937
  $ echo '$Id$' > m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   938
  $ hg add m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   939
  $ hg commit -m 4kw 
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   940
  $ echo foo >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   941
  $ hg commit -m 5foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   942
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   943
simplemerge
482
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   944
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   945
  $ hg update 4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   946
  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
   947
  $ echo foo >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   948
  $ hg commit -m 6foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   949
  created new head
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   950
  $ hg merge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   951
  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
   952
  (branch merge, don't forget to commit)
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   953
  $ hg commit -m simplemerge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   954
  $ cat m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   955
  $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
   956
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   957
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   958
conflict: keyword should stay outside conflict zone
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   959
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   960
  $ hg update 4
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   961
  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
   962
  $ echo bar >> m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   963
  $ hg commit -m 8bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   964
  created new head
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   965
  $ hg merge
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   966
  merging m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   967
  warning: conflicts during merge.
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   968
  merging m failed!
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   969
  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
   970
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
793
9cc90e2c826f tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 792
diff changeset
   971
  [1]
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   972
  $ cat m
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   973
  $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   974
  <<<<<<< local
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   975
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   976
  =======
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   977
  foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   978
  >>>>>>> other
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   979
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   980
resolve to local
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   981
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   982
  $ HGMERGE=internal:local hg resolve -a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   983
  $ hg commit -m localresolve
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   984
  $ cat m
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
   985
  $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   986
  bar
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   987
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   988
Test restricted mode with transplant -b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   989
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   990
  $ hg update 6
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   991
  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
   992
  $ hg branch foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   993
  marked working directory as branch foo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   994
  $ mv a a.bak
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   995
  $ echo foobranch > a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   996
  $ cat a.bak >> a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   997
  $ rm a.bak
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   998
  $ hg commit -m 9foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
   999
  $ hg update default
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1000
  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
  1001
  $ hg -y transplant -b foo tip
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1002
  applying 4aa30d025d50
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
  1003
  4aa30d025d50 transplanted to e00abbf63521
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1004
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1005
Expansion in changeset but not in file
485
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
  1006
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1007
  $ hg tip -p
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
  1008
  changeset:   11:e00abbf63521
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1009
  tag:         tip
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
  1010
  parent:      9:800511b3a22d
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1011
  user:        test
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1012
  date:        Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1013
  summary:     9foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1014
  
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
  1015
  diff -r 800511b3a22d -r e00abbf63521 a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1016
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1017
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1018
  @@ -1,3 +1,4 @@
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1019
  +foobranch
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1020
   expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1021
   do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1022
   xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1023
  
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1024
  $ head -n 2 a
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1025
  foobranch
928
e1bf64aaef4f localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 925
diff changeset
  1026
  expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1027
806
a0dc79015ddf test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net>
parents: 801
diff changeset
  1028
Turn off expansion
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1029
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1030
  $ hg -q rollback
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1031
  $ hg -q update -C
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1032
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1033
kwshrink with unknown file u
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1034
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1035
  $ cp a u
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1036
  $ hg --verbose kwshrink
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1037
  overwriting a shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1038
  overwriting m shrinking keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1039
  overwriting x/a shrinking keywords
668
13a6a2c0440f Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents: 653
diff changeset
  1040
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1041
Keywords shrunk in working directory, but not yet disabled
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1042
 - cat shows unexpanded keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1043
 - hg cat shows expanded keywords
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1044
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1045
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1046
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1047
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1048
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1049
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1050
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1051
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1052
  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
  1053
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1054
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1055
  $Xinfo: User Name <user@example.com>: firstline $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1056
  ignore $Id$
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
  1057
  a
782
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1058
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1059
Now disable keyword expansion
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1060
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1061
  $ rm "$HGRCPATH"
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1062
  $ cat a b
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1063
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1064
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1065
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1066
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1067
  ignore $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1068
  $ hg cat sym a b && echo
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1069
  expand $Id$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1070
  do not process $Id:
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1071
  xxx $
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1072
  $Xinfo$
09bae16e7a6d tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents: 773
diff changeset
  1073
  ignore $Id$
828
725ab7fe00e5 tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 827
diff changeset
  1074
  a