tests/test-commit.t
author Matt Mackall <mpm@selenic.com>
Thu, 16 Sep 2010 17:51:32 -0500
changeset 12316 4134686b83e1
parent 12156 4c94b6d0fb1c
child 12327 92e30e135581
permissions -rw-r--r--
tests: add exit codes to unified tests
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     1
commit date test
1488
08c7851969cc only files in normal state should be marked as deleted
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1203
diff changeset
     2
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     3
  $ hg init test
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     4
  $ cd test
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     5
  $ echo foo > foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     6
  $ hg add foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     7
  $ HGEDITOR=true hg commit -m ""
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     8
  abort: empty commit message
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
     9
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    10
  $ hg commit -d '0 0' -m commit-1
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    11
  $ echo foo >> foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    12
  $ hg commit -d '1 4444444' -m commit-3
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    13
  abort: impossible time zone offset: 4444444
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    14
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    15
  $ hg commit -d '1	15.1' -m commit-4
12105
6f58430dfdd0 util: get rid of extra trailing whitespace in parsedate abort message
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11802
diff changeset
    16
  abort: invalid date: '1\t15.1'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    17
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    18
  $ hg commit -d 'foo bar' -m commit-5
12105
6f58430dfdd0 util: get rid of extra trailing whitespace in parsedate abort message
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11802
diff changeset
    19
  abort: invalid date: 'foo bar'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    20
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    21
  $ hg commit -d ' 1 4444' -m commit-6
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    22
  $ hg commit -d '111111111111 0' -m commit-7
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    23
  abort: date exceeds 32 bits: 111111111111
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    24
  [255]
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset
    25
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    26
commit added file that has been deleted
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset
    27
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    28
  $ echo bar > bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    29
  $ hg add bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    30
  $ rm bar
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
    31
  $ hg commit -m commit-8
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    32
  nothing changed
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    33
  [1]
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
    34
  $ hg commit -m commit-8-2 bar
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    35
  abort: bar: file not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    36
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    37
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    38
  $ hg -q revert -a --no-backup
3786
8d603f8567ae make hg commit <dirname> work again
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3709
diff changeset
    39
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    40
  $ mkdir dir
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    41
  $ echo boo > dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    42
  $ hg add
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    43
  adding dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    44
  $ hg -v commit -m commit-9 dir
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    45
  dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    46
  committed changeset 2:d2a76177cb42
3709
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 1933
diff changeset
    47
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    48
  $ echo > dir.file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    49
  $ hg add
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    50
  adding dir.file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    51
  $ hg commit -m commit-10 dir dir.file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    52
  abort: dir: no match under directory!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    53
  [255]
3709
38291d9c8c1c Expand test-commit to cover one of the recent bugs.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 1933
diff changeset
    54
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    55
  $ echo >> dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    56
  $ mkdir bleh
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    57
  $ mkdir dir2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    58
  $ cd bleh
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    59
  $ hg commit -m commit-11 .
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    60
  abort: bleh: no match under directory!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    61
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    62
  $ hg commit -m commit-12 ../dir ../dir2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    63
  abort: dir2: no match under directory!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    64
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    65
  $ hg -v commit -m commit-13 ../dir
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    66
  dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    67
  committed changeset 3:1cd62a2d8db5
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    68
  $ cd ..
4253
9e3e975258a9 tests: expand test-commit a bit to test 'hg commit .' too
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3786
diff changeset
    69
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    70
  $ hg commit -m commit-14 does-not-exist
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    71
  abort: does-not-exist: No such file or directory
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    72
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    73
  $ ln -s foo baz
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    74
  $ hg commit -m commit-15 baz
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    75
  abort: baz: file not tracked!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    76
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    77
  $ touch quux
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    78
  $ hg commit -m commit-16 quux
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    79
  abort: quux: file not tracked!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    80
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    81
  $ echo >> dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    82
  $ hg -v commit -m commit-17 dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    83
  dir/file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    84
  committed changeset 4:49176991390e
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    85
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    86
An empty date was interpreted as epoch origin
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    87
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    88
  $ echo foo >> foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    89
  $ hg commit -d '' -m commit-no-date
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    90
  $ hg tip --template '{date|isodate}\n' | grep '1970'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    91
  [1]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    92
  $ cd ..
7072
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
    93
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
    94
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    95
partial subdir commit test
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    96
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    97
  $ hg init test2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    98
  $ cd test2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    99
  $ mkdir foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   100
  $ echo foo > foo/foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   101
  $ mkdir bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   102
  $ echo bar > bar/bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   103
  $ hg add
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   104
  adding bar/bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   105
  adding foo/foo
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   106
  $ hg ci -m commit-subdir-1 foo
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   107
  $ hg ci -m commit-subdir-2 bar
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   108
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   109
subdir log 1
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   110
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   111
  $ hg log -v foo
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   112
  changeset:   0:f97e73a25882
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   113
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   114
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   115
  files:       foo/foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   116
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   117
  commit-subdir-1
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   118
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   119
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   120
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   121
subdir log 2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   122
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   123
  $ hg log -v bar
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   124
  changeset:   1:aa809156d50d
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   125
  tag:         tip
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   126
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   127
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   128
  files:       bar/bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   129
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   130
  commit-subdir-2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   131
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   132
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   133
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   134
full log
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   135
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   136
  $ hg log -v
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   137
  changeset:   1:aa809156d50d
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   138
  tag:         tip
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   139
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   140
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   141
  files:       bar/bar
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   142
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   143
  commit-subdir-2
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   144
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   145
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   146
  changeset:   0:f97e73a25882
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   147
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   148
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   149
  files:       foo/foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   150
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   151
  commit-subdir-1
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   152
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   153
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   154
  $ cd ..
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   155
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   156
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   157
dot and subdir commit test
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   158
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   159
  $ hg init test3
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   160
  $ cd test3
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   161
  $ mkdir foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   162
  $ echo foo content > foo/plain-file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   163
  $ hg add foo/plain-file
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   164
  $ hg ci -m commit-foo-subdir foo
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   165
  $ echo modified foo content > foo/plain-file
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   166
  $ hg ci -m commit-foo-dot .
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   167
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   168
full log
7072
4e0d54fbd34f Show added files as "added" in editor commit message (issue 1330)
Patrick Mezard <pmezard@gmail.com>
parents: 6935
diff changeset
   169
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   170
  $ hg log -v
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   171
  changeset:   1:95b38e3a5b2e
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   172
  tag:         tip
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   173
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   174
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   175
  files:       foo/plain-file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   176
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   177
  commit-foo-dot
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   178
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   179
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   180
  changeset:   0:65d4e9386227
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   181
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   182
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   183
  files:       foo/plain-file
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   184
  description:
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   185
  commit-foo-subdir
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   186
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   187
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   188
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   189
subdir log
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   190
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   191
  $ cd foo
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   192
  $ hg log .
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   193
  changeset:   1:95b38e3a5b2e
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   194
  tag:         tip
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   195
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   196
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   197
  summary:     commit-foo-dot
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   198
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   199
  changeset:   0:65d4e9386227
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   200
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12105
diff changeset
   201
  date:        Thu Jan 01 00:00:00 1970 +0000
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   202
  summary:     commit-foo-subdir
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   203
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   204
  $ cd ..
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   205
  $ cd ..
6386
bae2e9c838e9 Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com>
parents: 6112
diff changeset
   206
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   207
  $ cd ..
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   208
  $ hg init issue1049
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   209
  $ cd issue1049
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   210
  $ echo a > a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   211
  $ hg ci -Ama
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   212
  adding a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   213
  $ echo a >> a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   214
  $ hg ci -mb
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   215
  $ hg up 0
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   216
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   217
  $ echo b >> a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   218
  $ hg ci -mc
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   219
  created new head
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   220
  $ HGMERGE=true hg merge
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   221
  merging a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   222
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   223
  (branch merge, don't forget to commit)
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   224
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   225
should fail because we are specifying a file name
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   226
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   227
  $ hg ci -mmerge a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   228
  abort: cannot partially commit a merge (do not specify files or patterns)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   229
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   230
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   231
should fail because we are specifying a pattern
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   232
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   233
  $ hg ci -mmerge -I a
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   234
  abort: cannot partially commit a merge (do not specify files or patterns)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   235
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   236
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   237
should succeed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   238
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   239
  $ hg ci -mmerge
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   240
  $ cd ..
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   241
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   242
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   243
test commit message content
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   244
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   245
  $ hg init commitmsg
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   246
  $ cd commitmsg
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   247
  $ echo changed > changed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   248
  $ echo removed > removed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   249
  $ hg ci -qAm init
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   250
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   251
  $ hg rm removed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   252
  $ echo changed >> changed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   253
  $ echo added > added
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   254
  $ hg add added
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   255
  $ HGEDITOR=cat hg ci -A
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   256
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   257
  
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   258
  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   259
  HG: Leave message empty to abort commit.
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   260
  HG: --
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   261
  HG: user: test
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   262
  HG: branch 'default'
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   263
  HG: added added
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   264
  HG: changed changed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   265
  HG: removed removed
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   266
  abort: empty commit message
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   267
  [255]
11802
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   268
  $ cd ..
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   269
d26b7cc96bc4 tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
   270
  $ exit 0