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