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