tests/test-log.t
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 17 Feb 2018 11:19:52 -0700
changeset 36481 1fa35ca345a5
parent 36360 58c1368ab629
child 36698 80d7fb6c2dec
permissions -rw-r--r--
internals: document bundle2 format It seems like a good idea to have thorough documentation of the bundle2 data format, including the format of each part and the capabilities. The added documentation is far from complete. For example, we don't fully capture the semantics of each capability and part. But a start is better than nothing, which was pretty much where we were before. Differential Revision: https://phab.mercurial-scm.org/D2298
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18991
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     1
Log on empty repository: checking consistency
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     2
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     3
  $ hg init empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     4
  $ cd empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     5
  $ hg log
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     6
  $ hg log -r 1
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     7
  abort: unknown revision '1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     8
  [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
     9
  $ hg log -r -1:0
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    10
  abort: unknown revision '-1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    11
  [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    12
  $ hg log -r 'branch(name)'
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    13
  abort: unknown revision 'name'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    14
  [255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    15
  $ hg log -r null -q
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    16
  -1:000000000000
c1af1fb314bc log: fix behavior with empty repositories (issue3497)
Alexander Plavin <me@aplavin.ru>
parents: 18495
diff changeset
    17
34456
5c122b410706 tests: change to parent directory before all "hg init" in test-log.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34102
diff changeset
    18
  $ cd ..
5c122b410706 tests: change to parent directory before all "hg init" in test-log.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34102
diff changeset
    19
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    20
The g is crafted to have 2 filelog topological heads in a linear
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    21
changeset graph
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    22
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    23
  $ hg init a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    24
  $ cd a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    25
  $ echo a > a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    26
  $ echo f > f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    27
  $ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    28
  adding a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    29
  adding f
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    30
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    31
  $ hg cp a b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    32
  $ hg cp f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    33
  $ hg ci -mb -d '2 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    34
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    35
  $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    36
  $ hg mv b dir
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    37
  $ echo g >> g
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    38
  $ echo f >> f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    39
  $ hg ci -mc -d '3 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    40
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    41
  $ hg mv a b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    42
  $ hg cp -f f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    43
  $ echo a > d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    44
  $ hg add d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    45
  $ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    46
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    47
  $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    48
  $ hg ci -me -d '5 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    49
23976
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
    50
Make sure largefiles doesn't interfere with logging a regular file
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    51
  $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
33212
fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 32348
diff changeset
    52
  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
32348
e8569cc131d1 py3: explicitly convert a list to bytes to pass in ui.debug
Pulkit Goyal <7895pulkit@gmail.com>
parents: 31768
diff changeset
    53
  updated patterns: .hglf/a, a
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    54
  0: a
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    55
  $ hg log a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
    56
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    57
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    58
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    59
  summary:     a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
    60
  
24206
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    61
  $ hg log glob:a*
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    62
  changeset:   3:2ca5ba701980
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    63
  user:        test
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    64
  date:        Thu Jan 01 00:00:04 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    65
  summary:     d
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    66
  
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    67
  changeset:   0:9161b9aeaf16
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    68
  user:        test
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    69
  date:        Thu Jan 01 00:00:01 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    70
  summary:     a
13c1e66f9653 largefiles: teach log to handle patterns
Matt Harbison <matt_harbison@yahoo.com>
parents: 24189
diff changeset
    71
  
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    72
  $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
33212
fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 32348
diff changeset
    73
  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
32348
e8569cc131d1 py3: explicitly convert a list to bytes to pass in ui.debug
Pulkit Goyal <7895pulkit@gmail.com>
parents: 31768
diff changeset
    74
  updated patterns: glob:.hglf/a*, glob:a*
24207
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    75
  3: d
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    76
  0: a
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging
Matt Harbison <matt_harbison@yahoo.com>
parents: 24206
diff changeset
    77
18340
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    78
log on directory
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    79
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    80
  $ hg log dir
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    81
  changeset:   4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    82
  tag:         tip
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    83
  user:        test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    84
  date:        Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    85
  summary:     e
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    86
  
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    87
  changeset:   2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    88
  user:        test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    89
  date:        Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    90
  summary:     c
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    91
  
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    92
  $ hg log somethingthatdoesntexist dir
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    93
  changeset:   4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    94
  tag:         tip
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    95
  user:        test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    96
  date:        Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    97
  summary:     e
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    98
  
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
    99
  changeset:   2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
   100
  user:        test
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
   101
  date:        Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
   102
  summary:     c
8802277c40ee log: make log work even if first parameter doesn't exist
Mads Kiilerich <mads@kiilerich.com>
parents: 18267
diff changeset
   103
  
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   104
35659
821d8a5ab4ff match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents: 35611
diff changeset
   105
-X, with explicit path
821d8a5ab4ff match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents: 35611
diff changeset
   106
821d8a5ab4ff match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents: 35611
diff changeset
   107
  $ hg log a -X a
821d8a5ab4ff match: do not weirdly include explicit files excluded by -X option
Yuya Nishihara <yuya@tcha.org>
parents: 35611
diff changeset
   108
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   109
-f, non-existent directory
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   110
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   111
  $ hg log -f dir
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   112
  abort: cannot follow file not in parent revision: "dir"
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   113
  [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   114
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   115
-f, directory
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   116
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   117
  $ hg up -q 3
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   118
  $ hg log -f dir
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   119
  changeset:   2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   120
  user:        test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   121
  date:        Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   122
  summary:     c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   123
  
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   124
-f, directory with --patch
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   125
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   126
  $ hg log -f dir -p
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   127
  changeset:   2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   128
  user:        test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   129
  date:        Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   130
  summary:     c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   131
  
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   132
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   133
  --- /dev/null* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   134
  +++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   135
  @@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   136
  +a
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   137
  
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   138
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   139
-f, pattern
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   140
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   141
  $ hg log -f -I 'dir**' -p
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   142
  changeset:   2:f8954cd4dc1f
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   143
  user:        test
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   144
  date:        Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   145
  summary:     c
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   146
  
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   147
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   148
  --- /dev/null* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   149
  +++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   150
  @@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   151
  +a
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   152
  
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   153
  $ hg up -q 4
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21966
diff changeset
   154
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   155
-f, a wrong style
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   156
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   157
  $ hg log -f -l1 --style something
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   158
  abort: style 'something' not found
31768
264baeef3588 show: new extension for displaying various repository data
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30044
diff changeset
   159
  (available styles: bisect, changelog, compact, default, phases, show, status, xml)
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   160
  [255]
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   161
19126
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   162
-f, phases style
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   163
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   164
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   165
  $ hg log -f -l1 --style phases
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   166
  changeset:   4:7e4639b4691b
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   167
  tag:         tip
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   168
  phase:       draft
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   169
  user:        test
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   170
  date:        Thu Jan 01 00:00:05 1970 +0000
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   171
  summary:     e
5c5152af0d15 log-style: add a log style that is default+phase (issue3436)
Iulian Stana <julian.stana@gmail.com>
parents: 19125
diff changeset
   172
  
19125
6ba6e345961e templater: show the style list when I try to use a wrong one
Iulian Stana <julian.stana@gmail.com>
parents: 18991
diff changeset
   173
24493
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   174
  $ hg log -f -l1 --style phases -q
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   175
  4:7e4639b4691b
e810c7da1cae templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   176
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   177
-f, but no args
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   178
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   179
  $ hg log -f
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   180
  changeset:   4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   181
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   182
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   183
  date:        Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   184
  summary:     e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   185
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   186
  changeset:   3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   187
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   188
  date:        Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   189
  summary:     d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   190
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   191
  changeset:   2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   192
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   193
  date:        Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   194
  summary:     c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   195
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   196
  changeset:   1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   197
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   198
  date:        Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   199
  summary:     b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   200
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   201
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   202
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   203
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   204
  summary:     a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   205
  
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   206
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   207
one rename
11562
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   208
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   209
  $ hg up -q 2
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   210
  $ hg log -vf a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   211
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   212
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   213
  date:        Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   214
  files:       a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   215
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   216
  a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   217
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   218
  
3197
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2901
diff changeset
   219
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   220
many renames
10776
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10061
diff changeset
   221
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   222
  $ hg up -q tip
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   223
  $ hg log -vf e
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   224
  changeset:   4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   225
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   226
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   227
  date:        Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   228
  files:       dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   229
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   230
  e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   231
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   232
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   233
  changeset:   2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   234
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   235
  date:        Thu Jan 01 00:00:03 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   236
  files:       b dir/b f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   237
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   238
  c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   239
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   240
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   241
  changeset:   1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   242
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   243
  date:        Thu Jan 01 00:00:02 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   244
  files:       b g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   245
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   246
  b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   247
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   248
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   249
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   250
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   251
  date:        Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   252
  files:       a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   253
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   254
  a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   255
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   256
  
5811
180a3eee4b75 Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4510
diff changeset
   257
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   258
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   259
log -pf dir/b
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   260
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   261
  $ hg up -q 3
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   262
  $ hg log -pf dir/b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   263
  changeset:   2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   264
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   265
  date:        Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   266
  summary:     c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   267
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   268
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   269
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   270
  +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   271
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   272
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   273
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   274
  changeset:   1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   275
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   276
  date:        Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   277
  summary:     b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   278
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   279
  diff -r 9161b9aeaf16 -r d89b0a12d229 b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   280
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   281
  +++ b/b	Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   282
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   283
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   284
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   285
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   286
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   287
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   288
  summary:     a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   289
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   290
  diff -r 000000000000 -r 9161b9aeaf16 a
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   291
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   292
  +++ b/a	Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   293
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   294
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   295
  
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   296
21876
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   297
log -pf b inside dir
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   298
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   299
  $ hg --cwd=dir log -pf b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   300
  changeset:   2:f8954cd4dc1f
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   301
  user:        test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   302
  date:        Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   303
  summary:     c
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   304
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   305
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   306
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   307
  +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   308
  @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   309
  +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   310
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   311
  changeset:   1:d89b0a12d229
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   312
  user:        test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   313
  date:        Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   314
  summary:     b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   315
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   316
  diff -r 9161b9aeaf16 -r d89b0a12d229 b
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   317
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   318
  +++ b/b	Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   319
  @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   320
  +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   321
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   322
  changeset:   0:9161b9aeaf16
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   323
  user:        test
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   324
  date:        Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   325
  summary:     a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   326
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   327
  diff -r 000000000000 -r 9161b9aeaf16 a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   328
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   329
  +++ b/a	Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   330
  @@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   331
  +a
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   332
  
584bbfd1b50d log: make --patch --follow work inside a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents: 20699
diff changeset
   333
21966
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   334
log -pf, but no args
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   335
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   336
  $ hg log -pf
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   337
  changeset:   3:2ca5ba701980
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   338
  user:        test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   339
  date:        Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   340
  summary:     d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   341
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   342
  diff -r f8954cd4dc1f -r 2ca5ba701980 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   343
  --- a/a	Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   344
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   345
  @@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   346
  -a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   347
  diff -r f8954cd4dc1f -r 2ca5ba701980 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   348
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   349
  +++ b/b	Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   350
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   351
  +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   352
  diff -r f8954cd4dc1f -r 2ca5ba701980 d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   353
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   354
  +++ b/d	Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   355
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   356
  +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   357
  diff -r f8954cd4dc1f -r 2ca5ba701980 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   358
  --- a/g	Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   359
  +++ b/g	Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   360
  @@ -1,2 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   361
   f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   362
  -g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   363
  +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   364
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   365
  changeset:   2:f8954cd4dc1f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   366
  user:        test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   367
  date:        Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   368
  summary:     c
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   369
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   370
  diff -r d89b0a12d229 -r f8954cd4dc1f b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   371
  --- a/b	Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   372
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   373
  @@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   374
  -a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   375
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   376
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   377
  +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   378
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   379
  +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   380
  diff -r d89b0a12d229 -r f8954cd4dc1f f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   381
  --- a/f	Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   382
  +++ b/f	Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   383
  @@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   384
   f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   385
  +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   386
  diff -r d89b0a12d229 -r f8954cd4dc1f g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   387
  --- a/g	Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   388
  +++ b/g	Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   389
  @@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   390
   f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   391
  +g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   392
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   393
  changeset:   1:d89b0a12d229
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   394
  user:        test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   395
  date:        Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   396
  summary:     b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   397
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   398
  diff -r 9161b9aeaf16 -r d89b0a12d229 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   399
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   400
  +++ b/b	Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   401
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   402
  +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   403
  diff -r 9161b9aeaf16 -r d89b0a12d229 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   404
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   405
  +++ b/g	Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   406
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   407
  +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   408
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   409
  changeset:   0:9161b9aeaf16
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   410
  user:        test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   411
  date:        Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   412
  summary:     a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   413
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   414
  diff -r 000000000000 -r 9161b9aeaf16 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   415
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   416
  +++ b/a	Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   417
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   418
  +a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   419
  diff -r 000000000000 -r 9161b9aeaf16 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   420
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   421
  +++ b/f	Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   422
  @@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   423
  +f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   424
  
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319)
Yuya Nishihara <yuya@tcha.org>
parents: 21947
diff changeset
   425
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   426
log -vf dir/b
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   427
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   428
  $ hg log -vf dir/b
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   429
  changeset:   2:f8954cd4dc1f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   430
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   431
  date:        Thu Jan 01 00:00:03 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   432
  files:       b dir/b f g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   433
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   434
  c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   435
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   436
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   437
  changeset:   1:d89b0a12d229
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   438
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   439
  date:        Thu Jan 01 00:00:02 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   440
  files:       b g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   441
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   442
  b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   443
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   444
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   445
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   446
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   447
  date:        Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   448
  files:       a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   449
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   450
  a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   451
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   452
  
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   453
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   454
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   455
-f and multiple filelog heads
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   456
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   457
  $ hg up -q 2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   458
  $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   459
  2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   460
  1
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   461
  0
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   462
  $ hg up -q tip
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   463
  $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   464
  3
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   465
  2
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   466
  0
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   467
35687
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   468
follow files from the specified revisions (issue4959)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   469
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   470
  $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n'
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   471
  @  4 dir/b e, dir/b->e
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   472
  |
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   473
  o  3 a b d g, a->b f->g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   474
  |
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   475
  o  2 b dir/b f g, b->dir/b
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   476
  |
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   477
  o  1 b g, a->b f->g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   478
  |
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   479
  o  0 a f,
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   480
  
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   481
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   482
  $ hg log -T '{rev}\n' -fr 4 e
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   483
  4
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   484
  2
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   485
  1
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   486
  0
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   487
  $ hg log -T '{rev}\n' -fr 2 g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   488
  2
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   489
  1
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   490
  0
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   491
  $ hg log -T '{rev}\n' -fr '2+3' g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   492
  3
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   493
  2
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   494
  1
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   495
  0
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   496
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   497
follow files from the specified revisions with glob patterns (issue5053)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   498
(BROKEN: should follow copies from e@4)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   499
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   500
  $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]'
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   501
  4
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   502
  2 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   503
  1 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   504
  0 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   505
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   506
follow files from the specified revisions with missing patterns
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   507
(BROKEN: should follow copies from e@4)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   508
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   509
  $ hg log -T '{rev}\n' -fr4 e x
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   510
  4
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   511
  2 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   512
  1 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   513
  0 (false !)
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   514
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   515
follow files from the specified revisions across copies with -p/--patch
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   516
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   517
  $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   518
  == rev: 4, dir/b->e ==
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   519
  diff -r 2ca5ba701980 -r 7e4639b4691b e
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   520
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   521
  +++ b/e	Thu Jan 01 00:00:05 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   522
  @@ -0,0 +1,1 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   523
  +a
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   524
  
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   525
  == rev: 3, a->b f->g ==
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   526
  diff -r f8954cd4dc1f -r 2ca5ba701980 g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   527
  --- a/g	Thu Jan 01 00:00:03 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   528
  +++ b/g	Thu Jan 01 00:00:04 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   529
  @@ -1,2 +1,2 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   530
   f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   531
  -g
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   532
  +f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   533
  
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   534
  == rev: 2, b->dir/b ==
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   535
  diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   536
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   537
  +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   538
  @@ -0,0 +1,1 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   539
  +a
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   540
  diff -r d89b0a12d229 -r f8954cd4dc1f f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   541
  --- a/f	Thu Jan 01 00:00:02 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   542
  +++ b/f	Thu Jan 01 00:00:03 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   543
  @@ -1,1 +1,2 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   544
   f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   545
  +f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   546
  
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   547
  == rev: 1, a->b f->g ==
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   548
  diff -r 9161b9aeaf16 -r d89b0a12d229 b
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   549
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   550
  +++ b/b	Thu Jan 01 00:00:02 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   551
  @@ -0,0 +1,1 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   552
  +a
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   553
  
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   554
  == rev: 0, ==
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   555
  diff -r 000000000000 -r 9161b9aeaf16 a
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   556
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   557
  +++ b/a	Thu Jan 01 00:00:01 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   558
  @@ -0,0 +1,1 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   559
  +a
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   560
  diff -r 000000000000 -r 9161b9aeaf16 f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   561
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   562
  +++ b/f	Thu Jan 01 00:00:01 1970 +0000
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   563
  @@ -0,0 +1,1 @@
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   564
  +f
67893a516272 log: follow file history across copies even with -rREV (BC) (issue4959)
Yuya Nishihara <yuya@tcha.org>
parents: 35684
diff changeset
   565
  
16165
60101427d618 log: fix --follow FILE ancestry calculation
Patrick Mezard <patrick@mezard.eu>
parents: 16164
diff changeset
   566
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   567
log copies with --copies
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   568
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   569
  $ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   570
  4 e (dir/b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   571
  3 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   572
  2 dir/b (b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   573
  1 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   574
  0 
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   575
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   576
log copies switch without --copies, with old filecopy template
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   577
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   578
  $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   579
  4 
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   580
  3 
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   581
  2 
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   582
  1 
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   583
  0 
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   584
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   585
log copies switch with --copies
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   586
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   587
  $ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   588
  4 e (dir/b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   589
  3 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   590
  2 dir/b (b)
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   591
  1 b (a)g (f)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   592
  0 
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   593
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   594
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   595
log copies with hardcoded style and with --style=default
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   596
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   597
  $ hg log -vC -r4
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   598
  changeset:   4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   599
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   600
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   601
  date:        Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   602
  files:       dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   603
  copies:      e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   604
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   605
  e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   606
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   607
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   608
  $ hg log -vC -r4 --style=default
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   609
  changeset:   4:7e4639b4691b
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   610
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   611
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   612
  date:        Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   613
  files:       dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   614
  copies:      e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   615
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   616
  e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   617
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   618
  
24013
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   619
  $ hg log -vC -r4 -Tjson
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   620
  [
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   621
   {
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   622
    "rev": 4,
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   623
    "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   624
    "branch": "default",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   625
    "phase": "draft",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   626
    "user": "test",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   627
    "date": [5, 0],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   628
    "desc": "e",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   629
    "bookmarks": [],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   630
    "tags": ["tip"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   631
    "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   632
    "files": ["dir/b", "e"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   633
    "copies": {"e": "dir/b"}
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   634
   }
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523)
Augie Fackler <augie@google.com>
parents: 23976
diff changeset
   635
  ]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   636
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   637
log copies, non-linear manifest
7762
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7062
diff changeset
   638
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   639
  $ hg up -C 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   640
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   641
  $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   642
  $ echo foo > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   643
  $ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   644
  adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   645
  created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   646
  $ hg log -v --template '{rev} {file_copies}\n' -r 5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   647
  5 e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   648
3718
7db88b094b14 fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3383
diff changeset
   649
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   650
log copies, execute bit set
9373
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   651
16887
91e417e9f4b0 test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16165
diff changeset
   652
#if execbit
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   653
  $ chmod +x e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   654
  $ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   655
  $ hg log -v --template '{rev} {file_copies}\n' -r 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   656
  6 
16887
91e417e9f4b0 test-log: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16165
diff changeset
   657
#endif
9421
c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents: 9373
diff changeset
   658
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   659
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   660
log -p d
10826
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   661
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   662
  $ hg log -pv d
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   663
  changeset:   3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   664
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   665
  date:        Thu Jan 01 00:00:04 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   666
  files:       a b d g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   667
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   668
  d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   669
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   670
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   671
  diff -r f8954cd4dc1f -r 2ca5ba701980 d
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   672
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   673
  +++ b/d	Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   674
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   675
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   676
  
11061
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   677
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   678
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   679
log --removed file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   680
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   681
  $ hg log --removed -v a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   682
  changeset:   3:2ca5ba701980
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   683
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   684
  date:        Thu Jan 01 00:00:04 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   685
  files:       a b d g
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   686
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   687
  d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   688
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   689
  
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   690
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   691
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   692
  date:        Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   693
  files:       a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   694
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   695
  a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   696
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   697
  
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   698
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   699
log --removed revrange file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   700
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   701
  $ hg log --removed -v -r0:2 a
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   702
  changeset:   0:9161b9aeaf16
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   703
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   704
  date:        Thu Jan 01 00:00:01 1970 +0000
16164
18743c4d1989 test-glog: extend a test before fixing --follow issues
Patrick Mezard <patrick@mezard.eu>
parents: 15725
diff changeset
   705
  files:       a f
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   706
  description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   707
  a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   708
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   709
  
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
   710
  $ cd ..
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   711
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   712
log --follow tests
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   713
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
   714
  $ hg init follow
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
   715
  $ cd follow
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   716
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   717
  $ echo base > base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   718
  $ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   719
  adding base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   720
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   721
  $ echo r1 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   722
  $ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   723
  $ echo r2 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   724
  $ hg ci -Amr2 -d '1 0'
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   725
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   726
  $ hg up -C 1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   727
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   728
  $ echo b1 > b1
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   729
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   730
log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   731
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   732
  $ hg log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   733
  changeset:   0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   734
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   735
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   736
  summary:     base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   737
  
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   738
  changeset:   1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   739
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   740
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   741
  summary:     r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   742
  
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   743
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   744
  $ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   745
  adding b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   746
  created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   747
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   748
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   749
log -f
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   750
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   751
  $ hg log -f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   752
  changeset:   3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   753
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   754
  parent:      1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   755
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   756
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   757
  summary:     b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   758
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   759
  changeset:   1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   760
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   761
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   762
  summary:     r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   763
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   764
  changeset:   0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   765
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   766
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   767
  summary:     base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   768
  
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   769
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   770
log -r follow('glob:b*')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   771
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   772
  $ hg log -r "follow('glob:b*')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   773
  changeset:   0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   774
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   775
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   776
  summary:     base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   777
  
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   778
  changeset:   1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   779
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   780
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   781
  summary:     r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   782
  
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   783
  changeset:   3:e62f78d544b4
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   784
  tag:         tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   785
  parent:      1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   786
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   787
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   788
  summary:     b1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   789
  
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   790
log -f -r '1 + 4'
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   791
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   792
  $ hg up -C 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   793
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   794
  $ echo b2 > b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   795
  $ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   796
  adding b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   797
  created new head
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   798
  $ hg log -f -r '1 + 4'
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   799
  changeset:   4:ddb82e70d1a1
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   800
  tag:         tip
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   801
  parent:      0:67e992f2c4f3
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   802
  user:        test
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   803
  date:        Thu Jan 01 00:00:01 1970 +0000
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   804
  summary:     b2
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   805
  
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   806
  changeset:   1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   807
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   808
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   809
  summary:     r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   810
  
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   811
  changeset:   0:67e992f2c4f3
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   812
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   813
  date:        Thu Jan 01 00:00:01 1970 +0000
24189
8b4b9ee6001a log: make -fr show complete history from the given revs
Durham Goode <durham@fb.com>
parents: 24180
diff changeset
   814
  summary:     base
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   815
  
35684
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   816
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   817
log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   818
effect
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   819
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   820
  $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   821
  4:ddb82e70d1a1
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   822
  1:3d5bf5654eda
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   823
  0:67e992f2c4f3
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35659
diff changeset
   824
26102
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   825
log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   826
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   827
  $ hg log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   828
  changeset:   4:ddb82e70d1a1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   829
  tag:         tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   830
  parent:      0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   831
  user:        test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   832
  date:        Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   833
  summary:     b2
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC)
liscju <piotr.listkiewicz@gmail.com>
parents: 25762
diff changeset
   834
  
29825
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   835
log -r "follow('set:grep(b2)', 4)"
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   836
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   837
  $ hg up -qC 0
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   838
  $ hg log -r "follow('set:grep(b2)', 4)"
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   839
  changeset:   4:ddb82e70d1a1
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   840
  tag:         tip
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   841
  parent:      0:67e992f2c4f3
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   842
  user:        test
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   843
  date:        Thu Jan 01 00:00:01 1970 +0000
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   844
  summary:     b2
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   845
  
35307
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   846
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   847
follow files starting from multiple revisions:
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   848
35308
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   849
  $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
35307
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   850
  3: b1
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   851
  4: b2
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   852
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   853
follow files starting from empty revision:
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   854
35308
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   855
  $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
35307
921680c3e2ea revset: make follow() accept multiple startrevs
Yuya Nishihara <yuya@tcha.org>
parents: 35278
diff changeset
   856
35308
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   857
follow starting from revisions:
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   858
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   859
  $ hg log -Gq -r "follow(startrev=2+4)"
35309
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   860
  o  4:ddb82e70d1a1
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   861
  |
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   862
  | o  2:60c670bf5b30
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   863
  | |
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   864
  | o  1:3d5bf5654eda
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   865
  |/
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   866
  @  0:67e992f2c4f3
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   867
  
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   868
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   869
follow the current revision:
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   870
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   871
  $ hg log -Gq -r "follow()"
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   872
  @  0:67e992f2c4f3
d36eda8896cc revset: alias follow(startrev=rev) to ancestors(rev)
Yuya Nishihara <yuya@tcha.org>
parents: 35308
diff changeset
   873
  
35308
89b5c2ae1980 revset: make follow() accept keyword arguments
Yuya Nishihara <yuya@tcha.org>
parents: 35307
diff changeset
   874
29825
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   875
  $ hg up -qC 4
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 28627
diff changeset
   876
23956
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   877
log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   878
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   879
  $ hg log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   880
  changeset:   -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   881
  user:        
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   882
  date:        Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   883
  
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   884
  $ hg log -f -r null -G
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   885
  o  changeset:   -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   886
     user:
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   887
     date:        Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   888
  
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   889
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512)
Yuya Nishihara <yuya@tcha.org>
parents: 23876
diff changeset
   890
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   891
log -f with null parent
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   892
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   893
  $ hg up -C null
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   894
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   895
  $ hg log -f
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   896
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   897
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   898
log -r .  with two parents
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   899
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   900
  $ hg up -C 3
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24013
diff changeset
   901
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   902
  $ hg merge tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   903
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   904
  (branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   905
  $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   906
  changeset:   3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   907
  parent:      1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   908
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   909
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   910
  summary:     b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   911
  
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   912
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   913
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   914
log -r .  with one parent
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   915
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   916
  $ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   917
  $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   918
  changeset:   5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   919
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   920
  parent:      3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   921
  parent:      4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   922
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   923
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   924
  summary:     m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   925
  
11508
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11141
diff changeset
   926
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   927
  $ echo postm >> b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   928
  $ hg ci -Amb1.1 -d'1 0'
11509
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   929
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   930
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   931
log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   932
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   933
  $ hg log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   934
  changeset:   6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   935
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   936
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   937
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   938
  summary:     b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   939
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   940
  changeset:   5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   941
  parent:      3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   942
  parent:      4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   943
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   944
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   945
  summary:     m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   946
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   947
  changeset:   3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   948
  parent:      1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   949
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   950
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   951
  summary:     b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   952
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   953
  changeset:   1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   954
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   955
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   956
  summary:     r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   957
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   958
  changeset:   0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   959
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   960
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   961
  summary:     base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   962
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   963
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   964
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   965
log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   966
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   967
  $ hg log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   968
  changeset:   6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   969
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   970
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   971
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   972
  summary:     b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   973
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   974
  changeset:   5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   975
  parent:      3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   976
  parent:      4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   977
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   978
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   979
  summary:     m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   980
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   981
  changeset:   4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   982
  parent:      0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   983
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   984
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   985
  summary:     b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   986
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   987
  changeset:   3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   988
  parent:      1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   989
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   990
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   991
  summary:     b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   992
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   993
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   994
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   995
log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   996
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   997
  $ hg log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   998
  changeset:   6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
   999
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1000
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1001
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1002
  summary:     b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1003
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1004
  diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1005
  --- a/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1006
  +++ b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1007
  @@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1008
   b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1009
  +postm
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1010
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1011
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1012
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1013
log -r ""
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1014
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1015
  $ hg log -r ''
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1016
  hg: parse error: empty query
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
  1017
  [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1018
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1019
log -r <some unknown node id>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1020
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1021
  $ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1022
  abort: unknown revision '1000000000000000000000000000000000000000'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
  1023
  [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1024
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1025
log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1026
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1027
  $ hg log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1028
  changeset:   1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1029
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1030
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1031
  summary:     r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1032
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1033
log -p -l2 --color=always
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1034
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1035
  $ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1036
  >  log -p -l2 --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1037
  \x1b[0;33mchangeset:   6:2404bbcab562\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1038
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1039
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1040
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1041
  summary:     b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1042
  
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1043
  \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1044
  \x1b[0;31;1m--- a/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1045
  \x1b[0;32;1m+++ b/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1046
  \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1047
   b1
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1048
  \x1b[0;32m+postm\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1049
  
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1050
  \x1b[0;33mchangeset:   5:302e9dd6890d\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1051
  parent:      3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1052
  parent:      4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1053
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1054
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1055
  summary:     m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1056
  
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1057
  \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1058
  \x1b[0;31;1m--- /dev/null	Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1059
  \x1b[0;32;1m+++ b/b2	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1060
  \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1061
  \x1b[0;32m+b2\x1b[0m (esc)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1062
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1063
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1064
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1065
log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1066
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1067
  $ hg log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1068
  changeset:   6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1069
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1070
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1071
  date:        Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1072
  summary:     b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1073
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1074
   b1 |  1 +
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1075
   1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1076
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1077
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1078
  $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1079
30018
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1080
log --follow --patch FILE in repository where linkrev isn't trustworthy
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1081
(issue5376)
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1082
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1083
  $ hg init follow-dup
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1084
  $ cd follow-dup
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1085
  $ cat <<EOF >> .hg/hgrc
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1086
  > [ui]
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1087
  > logtemplate = '=== {rev}: {desc}\n'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1088
  > [diff]
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1089
  > nodates = True
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1090
  > EOF
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1091
  $ echo 0 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1092
  $ hg ci -qAm 'a0'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1093
  $ echo 1 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1094
  $ hg ci -m 'a1'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1095
  $ hg up -q 0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1096
  $ echo 1 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1097
  $ touch b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1098
  $ hg ci -qAm 'a1 with b'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1099
  $ echo 3 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1100
  $ hg ci -m 'a3'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1101
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1102
 fctx.rev() == 2, but fctx.linkrev() == 1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1103
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1104
  $ hg log -pf a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1105
  === 3: a3
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1106
  diff -r 4ea02ba94d66 -r e7a6331a34f0 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1107
  --- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1108
  +++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1109
  @@ -1,2 +1,3 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1110
   0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1111
   1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1112
  +3
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1113
  
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1114
  === 2: a1 with b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1115
  diff -r 49b5e81287e2 -r 4ea02ba94d66 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1116
  --- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1117
  +++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1118
  @@ -1,1 +1,2 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1119
   0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1120
  +1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1121
  
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1122
  === 0: a0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1123
  diff -r 000000000000 -r 49b5e81287e2 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1124
  --- /dev/null
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1125
  +++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1126
  @@ -0,0 +1,1 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1127
  +0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1128
  
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1129
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1130
 fctx.introrev() == 2, but fctx.linkrev() == 1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1131
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1132
  $ hg up -q 2
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1133
  $ hg log -pf a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1134
  === 2: a1 with b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1135
  diff -r 49b5e81287e2 -r 4ea02ba94d66 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1136
  --- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1137
  +++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1138
  @@ -1,1 +1,2 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1139
   0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1140
  +1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1141
  
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1142
  === 0: a0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1143
  diff -r 000000000000 -r 49b5e81287e2 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1144
  --- /dev/null
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1145
  +++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1146
  @@ -0,0 +1,1 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1147
  +0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1148
  
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1149
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1150
  $ cd ..
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376)
Yuya Nishihara <yuya@tcha.org>
parents: 29825
diff changeset
  1151
35278
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1152
Multiple copy sources of a file:
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1153
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1154
  $ hg init follow-multi
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1155
  $ cd follow-multi
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1156
  $ echo 0 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1157
  $ hg ci -qAm 'a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1158
  $ hg cp a b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1159
  $ hg ci -m 'a->b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1160
  $ echo 2 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1161
  $ hg ci -m 'a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1162
  $ echo 3 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1163
  $ hg ci -m 'b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1164
  $ echo 4 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1165
  $ echo 4 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1166
  $ hg ci -m 'a,b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1167
  $ echo 5 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1168
  $ hg ci -m 'a0'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1169
  $ echo 6 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1170
  $ hg ci -m 'b0'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1171
  $ hg up -q 4
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1172
  $ echo 7 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1173
  $ hg ci -m 'b1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1174
  created new head
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1175
  $ echo 8 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1176
  $ hg ci -m 'a1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1177
  $ hg rm a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1178
  $ hg mv b a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1179
  $ hg ci -m 'b1->a1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1180
  $ hg merge -qt :local
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1181
  $ hg ci -m '(a0,b1->a1)->a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1182
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1183
  $ hg log -GT '{rev}: {desc}\n'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1184
  @    10: (a0,b1->a1)->a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1185
  |\
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1186
  | o  9: b1->a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1187
  | |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1188
  | o  8: a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1189
  | |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1190
  | o  7: b1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1191
  | |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1192
  o |  6: b0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1193
  | |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1194
  o |  5: a0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1195
  |/
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1196
  o  4: a,b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1197
  |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1198
  o  3: b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1199
  |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1200
  o  2: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1201
  |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1202
  o  1: a->b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1203
  |
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1204
  o  0: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1205
  
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1206
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1207
 since file 'a' has multiple copy sources at the revision 4, ancestors can't
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1208
 be indexed solely by fctx.linkrev().
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1209
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1210
  $ hg log -T '{rev}: {desc}\n' -f a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1211
  10: (a0,b1->a1)->a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1212
  9: b1->a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1213
  7: b1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1214
  5: a0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1215
  4: a,b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1216
  3: b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1217
  2: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1218
  1: a->b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1219
  0: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1220
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1221
  $ cd ..
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev
Yuya Nishihara <yuya@tcha.org>
parents: 34866
diff changeset
  1222
28253
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1223
Test that log should respect the order of -rREV even if multiple OR conditions
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1224
are specified (issue5100):
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1225
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1226
  $ hg init revorder
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1227
  $ cd revorder
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1228
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1229
  $ hg branch -q b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1230
  $ echo 0 >> f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1231
  $ hg ci -qAm k0 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1232
  $ hg branch -q b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1233
  $ echo 1 >> f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1234
  $ hg ci -qAm k1 -u u1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1235
  $ hg branch -q b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1236
  $ echo 2 >> f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1237
  $ hg ci -qAm k2 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1238
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1239
  $ hg update -q b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1240
  $ echo 3 >> f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1241
  $ hg ci -qAm k2 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1242
  $ hg update -q b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1243
  $ echo 4 >> f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1244
  $ hg ci -qAm k1 -u u1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1245
  $ hg update -q b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1246
  $ echo 5 >> f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1247
  $ hg ci -qAm k0 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1248
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1249
 summary of revisions:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1250
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1251
  $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1252
  @  5 b0 u0 k0 f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1253
  |
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1254
  | o  4 b1 u1 k1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1255
  | |
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1256
  | | o  3 b2 u2 k2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1257
  | | |
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1258
  | | o  2 b2 u2 k2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1259
  | |/
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1260
  | o  1 b1 u1 k1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1261
  |/
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1262
  o  0 b0 u0 k0 f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1263
  
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1264
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1265
 log -b BRANCH in ascending order:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1266
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1267
  $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1268
  0 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1269
  1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1270
  4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1271
  5 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1272
  $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1273
  0 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1274
  1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1275
  4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1276
  5 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1277
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1278
 log --only-branch BRANCH in descending order:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1279
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1280
  $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1281
  4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1282
  3 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1283
  2 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1284
  1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1285
  $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1286
  4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1287
  3 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1288
  2 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1289
  1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1290
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1291
 log -u USER in ascending order, against compound set:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1292
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1293
  $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1294
  0 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1295
  2 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1296
  3 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1297
  5 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1298
  $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1299
  0 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1300
  2 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1301
  3 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1302
  5 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1303
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1304
 log -k TEXT in descending order, against compound set:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1305
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1306
  $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1307
  5 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1308
  3 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1309
  2 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1310
  1 k1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1311
  0 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1312
  $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1313
  5 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1314
  3 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1315
  2 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1316
  1 k1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1317
  0 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1318
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1319
 log FILE in ascending order, against dagrange:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1320
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1321
  $ hg log -r1:: -T '{rev} {files}\n' f1 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1322
  1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1323
  2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1324
  3 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1325
  4 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1326
  $ hg log -r1:: -T '{rev} {files}\n' f2 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1327
  1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1328
  2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1329
  3 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1330
  4 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1331
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100)
Yuya Nishihara <yuya@tcha.org>
parents: 26614
diff changeset
  1332
  $ cd ..
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1333
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1334
User
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1335
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1336
  $ hg init usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1337
  $ cd usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1338
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1339
  $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1340
  $ hg ci -A -m "a" -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1341
  adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1342
  $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1343
  $ hg ci -A -m "b" -u "User Two <user2@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1344
  adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1345
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1346
  $ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1347
  changeset:   0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1348
  user:        User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1349
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1350
  summary:     a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1351
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1352
  $ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1353
  changeset:   1:e834b5e69c0e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1354
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1355
  user:        User Two <user2@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1356
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1357
  summary:     b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1358
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1359
  changeset:   0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1360
  user:        User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1361
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1362
  summary:     a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1363
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1364
  $ hg log -u "user3"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1365
35547
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1366
"-u USER" shouldn't be overridden by "user(USER)" alias
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1367
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1368
  $ hg log --config 'revsetalias.user(x)=branch(x)' -u default
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1369
  $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1370
  changeset:   0:29a4c94f1924
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1371
  user:        User One <user1@example.org>
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1372
  date:        Thu Jan 01 00:00:00 1970 +0000
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1373
  summary:     a
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1374
  
b6dbc860570d log: don't expand aliases in revset built from command options
Yuya Nishihara <yuya@tcha.org>
parents: 35522
diff changeset
  1375
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1376
  $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1377
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1378
  $ hg init branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1379
  $ cd branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1380
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1381
  $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1382
  $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1383
  adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1384
  $ hg branch test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1385
  marked working directory as branch test
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 14645
diff changeset
  1386
  (branches are permanent and global, did you want a bookmark?)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1387
  $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1388
  $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1389
  adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1390
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1391
  $ hg up default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1392
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1393
  $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1394
  $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1395
  adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1396
  $ hg up test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1397
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1398
  $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1399
  $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1400
  adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1401
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1402
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1403
log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1404
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1405
  $ hg log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1406
  changeset:   2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1407
  parent:      0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1408
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1409
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1410
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1411
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1412
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1413
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1414
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1415
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1416
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1417
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1418
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1419
log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1420
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1421
  $ hg log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1422
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1423
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1424
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1425
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1426
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1427
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1428
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1429
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1430
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1431
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1432
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1433
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1434
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1435
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1436
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1437
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1438
log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1439
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1440
  $ hg log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1441
  abort: unknown revision 'dummy'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
  1442
  [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1443
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1444
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1445
log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1446
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1447
  $ hg log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1448
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1449
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1450
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1451
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1452
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1453
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1454
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1455
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1456
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1457
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1458
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1459
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1460
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1461
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1462
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1463
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1464
log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1465
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1466
  $ hg log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1467
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1468
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1469
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1470
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1471
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1472
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1473
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1474
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1475
  changeset:   2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1476
  parent:      0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1477
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1478
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1479
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1480
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1481
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1482
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1483
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1484
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1485
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1486
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1487
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1488
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1489
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1490
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1491
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1492
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1493
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1494
log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1495
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1496
  $ hg log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1497
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1498
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1499
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1500
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1501
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1502
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1503
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1504
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1505
  changeset:   2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1506
  parent:      0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1507
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1508
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1509
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1510
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1511
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1512
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1513
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1514
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1515
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1516
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1517
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1518
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1519
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1520
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1521
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1522
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1523
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1524
log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1525
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1526
  $ hg log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1527
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1528
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1529
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1530
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1531
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1532
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1533
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1534
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1535
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1536
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1537
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1538
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1539
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1540
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1541
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1542
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1543
log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1544
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1545
  $ hg log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1546
  changeset:   2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1547
  parent:      0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1548
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1549
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1550
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1551
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1552
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1553
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1554
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1555
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1556
  
23771
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1557
#if gettext
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1558
23771
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1559
Test that all log names are translated (e.g. branches, bookmarks, tags):
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1560
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1561
  $ hg bookmark babar -r tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1562
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1563
  $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1564
  \xc3\x84nderung:        3:f5d8de11c2e2 (esc)
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1565
  Zweig:           test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1566
  Lesezeichen:     babar
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1567
  Marke:           tip
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1568
  Vorg\xc3\xa4nger:       1:d32277701ccb (esc)
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1569
  Nutzer:          test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1570
  Datum:           Thu Jan 01 00:00:00 1970 +0000
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1571
  Zusammenfassung: commit on test
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1572
  
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1573
  $ hg bookmark -d babar
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1574
9f81f9e5b47a tests: add a i18n translation test for log output
Sean Farley <sean.michael.farley@gmail.com>
parents: 23729
diff changeset
  1575
#endif
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1576
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1577
log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1578
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1579
  $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1580
  $ hg log -p --cwd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1581
  changeset:   3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1582
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1583
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1584
  parent:      1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1585
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1586
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1587
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1588
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1589
  diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1590
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1591
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1592
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1593
  +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1594
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1595
  changeset:   2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1596
  parent:      0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1597
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1598
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1599
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1600
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1601
  diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1602
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1603
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1604
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1605
  +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1606
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1607
  changeset:   1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1608
  branch:      test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1609
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1610
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1611
  summary:     commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1612
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1613
  diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1614
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1615
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1616
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1617
  +b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1618
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1619
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1620
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1621
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1622
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1623
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1624
  diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1625
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1626
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1627
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1628
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1629
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1630
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1631
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1632
log -p -R repo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1633
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1634
  $ cd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1635
  $ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1636
  changeset:   0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1637
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1638
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1639
  summary:     commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1640
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1641
  diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1642
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1643
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1644
  @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1645
  +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1646
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1647
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1648
  $ cd ../..
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1649
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1650
  $ hg init follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1651
  $ cd follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1652
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1653
# Build the following history:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1654
# tip - o - x - o - x - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1655
#    \                 /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1656
#     o - o - o - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1657
#      \     /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1658
#         o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1659
#
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1660
# Where "o" is a revision containing "foo" and
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1661
# "x" is a revision without "foo"
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1662
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1663
  $ touch init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1664
  $ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1665
  adding init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1666
  $ echo 'foo' > init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1667
  $ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1668
  $ echo 'foo' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1669
  $ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1670
  adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1671
  $ hg rm foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1672
  $ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1673
  $ echo 'related' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1674
  $ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1675
  adding foo
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1676
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1677
  $ hg up 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1678
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1679
  $ touch branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1680
  $ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1681
  adding branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1682
  created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1683
  $ touch foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1684
  $ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1685
  adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1686
  $ echo 'change' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1687
  $ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1688
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1689
  $ hg up 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1690
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1691
  $ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1692
  $ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1693
  created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1694
  $ hg merge 7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1695
  merging foo
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26102
diff changeset
  1696
  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1697
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35687
diff changeset
  1698
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
  1699
  [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1700
  $ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1701
  $ hg resolve -m foo
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21877
diff changeset
  1702
  (no more unresolved files)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1703
  $ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1704
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1705
  $ hg merge 4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1706
  merging foo
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26102
diff changeset
  1707
  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1708
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35687
diff changeset
  1709
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
  1710
  [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1711
  $ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1712
  $ hg resolve -m foo
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21877
diff changeset
  1713
  (no more unresolved files)
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1714
  $ hg ci -m "Last merge, related"
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1715
17181
6f71167292f2 log: support --graph without graphlog extension
Patrick Mezard <patrick@mezard.eu>
parents: 16923
diff changeset
  1716
  $ hg log --graph
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1717
  @    changeset:   10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1718
  |\   tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1719
  | |  parent:      9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1720
  | |  parent:      4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1721
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1722
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1723
  | |  summary:     Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1724
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1725
  | o    changeset:   9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1726
  | |\   parent:      8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1727
  | | |  parent:      7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1728
  | | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1729
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1730
  | | |  summary:     First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1731
  | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1732
  | | o  changeset:   8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1733
  | | |  parent:      6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1734
  | | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1735
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1736
  | | |  summary:     change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1737
  | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1738
  | o |  changeset:   7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1739
  | |/   user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1740
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1741
  | |    summary:     change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1742
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1743
  | o  changeset:   6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1744
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1745
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1746
  | |  summary:     create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1747
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1748
  | o  changeset:   5:73db34516eb9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1749
  | |  parent:      0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1750
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1751
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1752
  | |  summary:     first branch, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1753
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1754
  o |  changeset:   4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1755
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1756
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1757
  | |  summary:     add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1758
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1759
  o |  changeset:   3:dd78ae4afb56
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1760
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1761
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1762
  | |  summary:     delete foo, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1763
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1764
  o |  changeset:   2:c4c64aedf0f7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1765
  | |  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1766
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1767
  | |  summary:     add unrelated old foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1768
  | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1769
  o |  changeset:   1:e5faa7440653
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1770
  |/   user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1771
  |    date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1772
  |    summary:     change, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1773
  |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1774
  o  changeset:   0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1775
     user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1776
     date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1777
     summary:     init, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1778
  
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
  1779
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1780
  $ hg --traceback log -f foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1781
  changeset:   10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1782
  tag:         tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1783
  parent:      9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1784
  parent:      4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1785
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1786
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1787
  summary:     Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1788
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1789
  changeset:   9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1790
  parent:      8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1791
  parent:      7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1792
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1793
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1794
  summary:     First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1795
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1796
  changeset:   8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1797
  parent:      6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1798
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1799
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1800
  summary:     change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1801
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1802
  changeset:   7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1803
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1804
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1805
  summary:     change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1806
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1807
  changeset:   6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1808
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1809
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1810
  summary:     create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1811
  
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1812
  changeset:   4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1813
  user:        test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1814
  date:        Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1815
  summary:     add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
  1816
  
12383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1817
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1818
Also check when maxrev < lastrevfilelog
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1819
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1820
  $ hg --traceback log -f -r4 foo
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1821
  changeset:   4:88176d361b69
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1822
  user:        test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1823
  date:        Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1824
  summary:     add foo, related
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1825
  
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1826
  $ cd ..
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1827
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12383
diff changeset
  1828
Issue2383: hg log showing _less_ differences than hg diff
12383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1829
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1830
  $ hg init issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1831
  $ cd issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1832
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1833
Create a test repo:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1834
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1835
  $ echo a > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1836
  $ hg ci -Am0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1837
  adding a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1838
  $ echo b > b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1839
  $ hg ci -Am1
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1840
  adding b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1841
  $ hg co 0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1842
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1843
  $ echo b > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1844
  $ hg ci -m2
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1845
  created new head
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1846
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1847
Merge:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1848
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1849
  $ hg merge
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1850
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1851
  (branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1852
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1853
Make sure there's a file listed in the merge to trigger the bug:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1854
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1855
  $ echo c > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1856
  $ hg ci -m3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1857
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1858
Two files shown here in diff:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1859
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1860
  $ hg diff --rev 2:3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1861
  diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1862
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1863
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1864
  @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1865
  -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1866
  +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1867
  diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1868
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1869
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1870
  @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1871
  +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1872
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1873
Diff here should be the same:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1874
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1875
  $ hg log -vpr 3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1876
  changeset:   3:8e07aafe1edc
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1877
  tag:         tip
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1878
  parent:      2:b09be438c43a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1879
  parent:      1:925d80f479bb
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1880
  user:        test
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1881
  date:        Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1882
  files:       a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1883
  description:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1884
  3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1885
  
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1886
  
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1887
  diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1888
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1889
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1890
  @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1891
  -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1892
  +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1893
  diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1894
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1895
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1896
  @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1897
  +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1898
  
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
  1899
  $ cd ..
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1900
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1901
'hg log -r rev fn' when last(filelog(fn)) != rev
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1902
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1903
  $ hg init simplelog
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16887
diff changeset
  1904
  $ cd simplelog
12972
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1905
  $ echo f > a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1906
  $ hg ci -Am'a' -d '0 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1907
  adding a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1908
  $ echo f >> a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1909
  $ hg ci -Am'a bis' -d '1 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1910
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1911
  $ hg log -r0 a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1912
  changeset:   0:9f758d63dcde
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1913
  user:        test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1914
  date:        Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1915
  summary:     a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12942
diff changeset
  1916
  
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  1917
enable obsolete to test hidden feature
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  1918
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 21998
diff changeset
  1919
  $ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 21998
diff changeset
  1920
  > [experimental]
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34456
diff changeset
  1921
  > evolution.createmarkers=True
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1922
  > EOF
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  1923
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1924
  $ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1925
  1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1926
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  1927
  $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33262
diff changeset
  1928
  obsoleted 1 changesets
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  1929
  $ hg up null -q
14645
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1930
  $ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1931
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1932
  $ hg log --template='{rev}:{node}\n' --hidden
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1933
  1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 13889
diff changeset
  1934
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
19471
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents: 19127
diff changeset
  1935
  $ hg log -r a
35571
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents: 35547
diff changeset
  1936
  abort: hidden revision 'a' is pruned!
23046
c1aede895072 repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23045
diff changeset
  1937
  (use --hidden to access hidden revisions)
19471
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents: 19127
diff changeset
  1938
  [255]
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  1939
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1940
test that parent prevent a changeset to be hidden
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1941
18267
5bb610f87d1d clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18250
diff changeset
  1942
  $ hg up 1 -q --hidden
35522
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35310
diff changeset
  1943
  updating to a hidden changeset a765632148dc
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35704
diff changeset
  1944
  (hidden revision 'a765632148dc' is pruned)
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1945
  $ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1946
  1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1947
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1948
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1949
test that second parent prevent a changeset to be hidden too
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1950
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1951
  $ hg debugsetparents 0 1 # nothing suitable to merge here
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1952
  $ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1953
  1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1954
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18494
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1955
  $ hg debugsetparents 1
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1956
  $ hg up -q null
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1957
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1958
bookmarks prevent a changeset being hidden
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1959
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1960
  $ hg bookmark --hidden -r 1 X
35611
7336ac5e786e bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35571
diff changeset
  1961
  bookmarking hidden changeset a765632148dc
35712
a1a5c3842b6f bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents: 35711
diff changeset
  1962
  (hidden revision 'a765632148dc' is pruned)
18494
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1963
  $ hg log --template '{rev}:{node}\n'
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1964
  1:a765632148dc55d38c35c4f247c618701886cb2f
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets
Kevin Bullock <kbullock@ringworld.org>
parents: 18468
diff changeset
  1965
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1966
  $ hg bookmark -d X
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1967
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1968
divergent bookmarks are not hidden
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1969
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1970
  $ hg bookmark --hidden -r 1 X@foo
35611
7336ac5e786e bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35571
diff changeset
  1971
  bookmarking hidden changeset a765632148dc
35712
a1a5c3842b6f bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents: 35711
diff changeset
  1972
  (hidden revision 'a765632148dc' is pruned)
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1973
  $ hg log --template '{rev}:{node}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1974
  1:a765632148dc55d38c35c4f247c618701886cb2f
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18494
diff changeset
  1975
  0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18250
f54898526aad hidden: use both parents of working directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18208
diff changeset
  1976
30044
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1977
test hidden revision 0 (issue5385)
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1978
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1979
  $ hg bookmark -d X@foo
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1980
  $ hg up null -q
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1981
  $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33262
diff changeset
  1982
  obsoleted 1 changesets
30044
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1983
  $ echo f > b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1984
  $ hg ci -Am'b' -d '2 0'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1985
  adding b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1986
  $ echo f >> b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1987
  $ hg ci -m'b bis' -d '3 0'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1988
  $ hg log -T'{rev}:{node}\n'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1989
  3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1990
  2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1991
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1992
  $ hg log -T'{rev}:{node}\n' -r:
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1993
  2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1994
  3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1995
  $ hg log -T'{rev}:{node}\n' -r:tip
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1996
  2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1997
  3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  1998
  $ hg log -T'{rev}:{node}\n' -r:0
35571
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents: 35547
diff changeset
  1999
  abort: hidden revision '0' is pruned!
30044
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2000
  (use --hidden to access hidden revisions)
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2001
  [255]
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2002
  $ hg log -T'{rev}:{node}\n' -f
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2003
  3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2004
  2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385)
Yuya Nishihara <yuya@tcha.org>
parents: 30018
diff changeset
  2005
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2006
clear extensions configuration
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2007
  $ echo '[extensions]' >> $HGRCPATH
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17781
diff changeset
  2008
  $ echo "obs=!" >> $HGRCPATH
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2009
  $ cd ..
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2010
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2011
test -u/-k for problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2012
# unicode: cp932:
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2013
# u30A2    0x83 0x41(= 'A')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2014
# u30C2    0x83 0x61(= 'a')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2015
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2016
  $ hg init problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2017
  $ cd problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2018
33262
8e6f4939a69a tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents: 33212
diff changeset
  2019
  $ $PYTHON > setup.sh <<EOF
33747
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33542
diff changeset
  2020
  > print(u'''
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2021
  > echo a > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2022
  > hg add text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2023
  > hg --encoding utf-8 commit -u '\u30A2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2024
  > echo b > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2025
  > hg --encoding utf-8 commit -u '\u30C2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2026
  > echo c > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2027
  > hg --encoding utf-8 commit -u none -m '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2028
  > echo d > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2029
  > hg --encoding utf-8 commit -u none -m '\u30C2'
33747
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33542
diff changeset
  2030
  > '''.encode('utf-8'))
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2031
  > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2032
  $ sh < setup.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2033
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2034
test in problematic encoding
33262
8e6f4939a69a tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents: 33212
diff changeset
  2035
  $ $PYTHON > test.sh <<EOF
33747
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33542
diff changeset
  2036
  > print(u'''
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2037
  > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2038
  > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2039
  > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2040
  > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2041
  > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2042
  > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2043
  > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
33747
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33542
diff changeset
  2044
  > '''.encode('cp932'))
15725
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2045
  > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2046
  $ sh < test.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2047
  0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2048
  ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2049
  1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2050
  ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2051
  2
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2052
  0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2053
  ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2054
  3
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2055
  1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2056
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15623
diff changeset
  2057
  $ cd ..
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2058
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2059
test hg log on non-existent files and on directories
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2060
  $ hg init issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2061
  $ cd issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2062
  $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2063
  $ echo 1 > d1/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2064
  $ echo 1 > D2/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2065
  $ echo 1 > D3.i/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2066
  $ echo 1 > d4.hg/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2067
  $ echo 1 > d5.d/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2068
  $ echo 1 > .d6/f1
17781
8ce535745500 test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b
Adrian Buehlmann <adrian@cadifra.com>
parents: 17746
diff changeset
  2069
  $ hg -q add .
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2070
  $ hg commit -m "a bunch of weird directories"
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2071
  $ hg log -l1 d1/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2072
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2073
  $ hg log -l1 f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2074
  $ hg log -l1 . | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2075
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2076
  $ hg log -l1 ./ | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2077
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2078
  $ hg log -l1 d1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2079
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2080
  $ hg log -l1 D2 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2081
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2082
  $ hg log -l1 D2/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2083
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2084
  $ hg log -l1 D3.i | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2085
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2086
  $ hg log -l1 D3.i/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2087
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2088
  $ hg log -l1 d4.hg | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2089
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2090
  $ hg log -l1 d4.hg/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2091
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2092
  $ hg log -l1 d5.d | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2093
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2094
  $ hg log -l1 d5.d/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2095
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2096
  $ hg log -l1 .d6 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2097
  changeset:   0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2098
  $ hg log -l1 .d6/f1 | grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2099
  changeset:   0:65624cd9070a
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2100
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2101
issue3772: hg log -r :null showing revision 0 as well
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2102
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2103
  $ hg log -r :null
20699
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2104
  changeset:   0:65624cd9070a
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2105
  tag:         tip
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2106
  user:        test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2107
  date:        Thu Jan 01 00:00:00 1970 +0000
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2108
  summary:     a bunch of weird directories
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 19471
diff changeset
  2109
  
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2110
  changeset:   -1:000000000000
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2111
  user:        
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2112
  date:        Thu Jan 01 00:00:00 1970 +0000
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2113
  
18468
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
  2114
  $ hg log -r null:null
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
  2115
  changeset:   -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
  2116
  user:        
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
  2117
  date:        Thu Jan 01 00:00:00 1970 +0000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18466
diff changeset
  2118
  
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2119
working-directory revision requires special treatment
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2120
28565
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2121
clean:
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2122
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2123
  $ hg log -r 'wdir()' --debug
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2124
  changeset:   2147483647:ffffffffffffffffffffffffffffffffffffffff
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2125
  phase:       draft
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2126
  parent:      0:65624cd9070a035fa7191a54f2b8af39f16b0c08
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2127
  parent:      -1:0000000000000000000000000000000000000000
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2128
  user:        test
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2129
  date:        [A-Za-z0-9:+ ]+ (re)
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2130
  extra:       branch=default
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2131
  
28566
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2132
  $ hg log -r 'wdir()' -p --stat
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2133
  changeset:   2147483647:ffffffffffff
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2134
  parent:      0:65624cd9070a
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2135
  user:        test
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2136
  date:        [A-Za-z0-9:+ ]+ (re)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2137
  
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2138
  
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2139
  
28565
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2140
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2141
dirty:
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2142
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2143
  $ echo 2 >> d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2144
  $ echo 2 > d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2145
  $ hg add d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2146
  $ hg remove .d6/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2147
  $ hg status
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2148
  M d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2149
  A d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2150
  R .d6/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2151
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2152
  $ hg log -r 'wdir()'
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
  2153
  changeset:   2147483647:ffffffffffff
25739
3dabc9b7494a changeset_printer: use node.wdirrev to calculate meaningful parentrevs
Yuya Nishihara <yuya@tcha.org>
parents: 25688
diff changeset
  2154
  parent:      0:65624cd9070a
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2155
  user:        test
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2156
  date:        [A-Za-z0-9:+ ]+ (re)
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2157
  
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2158
  $ hg log -r 'wdir()' -q
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
  2159
  2147483647:ffffffffffff
24584
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24533
diff changeset
  2160
24585
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2161
  $ hg log -r 'wdir()' --debug
25762
f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 25739
diff changeset
  2162
  changeset:   2147483647:ffffffffffffffffffffffffffffffffffffffff
24585
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2163
  phase:       draft
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2164
  parent:      0:65624cd9070a035fa7191a54f2b8af39f16b0c08
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2165
  parent:      -1:0000000000000000000000000000000000000000
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2166
  user:        test
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2167
  date:        [A-Za-z0-9:+ ]+ (re)
28565
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2168
  files:       d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2169
  files+:      d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2170
  files-:      .d6/f1
24585
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2171
  extra:       branch=default
e191d5d8d515 changeset_printer: hide manifest node for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24584
diff changeset
  2172
  
28566
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2173
  $ hg log -r 'wdir()' -p --stat --git
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2174
  changeset:   2147483647:ffffffffffff
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2175
  parent:      0:65624cd9070a
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2176
  user:        test
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2177
  date:        [A-Za-z0-9:+ ]+ (re)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2178
  
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2179
   .d6/f1 |  1 -
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2180
   d1/f1  |  1 +
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2181
   d1/f2  |  1 +
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2182
   3 files changed, 2 insertions(+), 1 deletions(-)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2183
  
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2184
  diff --git a/.d6/f1 b/.d6/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2185
  deleted file mode 100644
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2186
  --- a/.d6/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2187
  +++ /dev/null
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2188
  @@ -1,1 +0,0 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2189
  -1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2190
  diff --git a/d1/f1 b/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2191
  --- a/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2192
  +++ b/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2193
  @@ -1,1 +1,2 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2194
   1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2195
  +2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2196
  diff --git a/d1/f2 b/d1/f2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2197
  new file mode 100644
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2198
  --- /dev/null
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2199
  +++ b/d1/f2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2200
  @@ -0,0 +1,1 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2201
  +2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871)
Yuya Nishihara <yuya@tcha.org>
parents: 28565
diff changeset
  2202
  
24602
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2203
  $ hg log -r 'wdir()' -Tjson
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2204
  [
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2205
   {
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2206
    "rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2207
    "node": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2208
    "branch": "default",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2209
    "phase": "draft",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2210
    "user": "test",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2211
    "date": [*, 0], (glob)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2212
    "desc": "",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2213
    "bookmarks": [],
25688
24cda1dd45ff workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents: 25006
diff changeset
  2214
    "tags": [],
24602
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2215
    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2216
   }
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2217
  ]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2218
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2219
  $ hg log -r 'wdir()' -Tjson -q
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2220
  [
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2221
   {
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2222
    "rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2223
    "node": null
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2224
   }
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2225
  ]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24585
diff changeset
  2226
24603
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2227
  $ hg log -r 'wdir()' -Tjson --debug
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2228
  [
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2229
   {
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2230
    "rev": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2231
    "node": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2232
    "branch": "default",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2233
    "phase": "draft",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2234
    "user": "test",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2235
    "date": [*, 0], (glob)
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2236
    "desc": "",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2237
    "bookmarks": [],
25688
24cda1dd45ff workingctx: don't report the tags for its parents
Matt Harbison <matt_harbison@yahoo.com>
parents: 25006
diff changeset
  2238
    "tags": [],
24603
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2239
    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2240
    "manifest": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2241
    "extra": {"branch": "default"},
28565
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2242
    "modified": ["d1/f1"],
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2243
    "added": ["d1/f2"],
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2244
    "removed": [".d6/f1"]
24603
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2245
   }
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2246
  ]
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx
Yuya Nishihara <yuya@tcha.org>
parents: 24602
diff changeset
  2247
28565
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2248
  $ hg revert -aqC
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output
Yuya Nishihara <yuya@tcha.org>
parents: 28253
diff changeset
  2249
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2250
Check that adding an arbitrary name shows up in log automatically
18466
ac0c12123743 log: remove any ancestors of nullrev (issue3772)
Sean Farley <sean.michael.farley@gmail.com>
parents: 18340
diff changeset
  2251
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2252
  $ cat > ../names.py <<EOF
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2253
  > """A small extension to test adding arbitrary names to a repo"""
33983
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2254
  > from __future__ import absolute_import
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2255
  > from mercurial import namespaces
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2256
  > 
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2257
  > def reposetup(ui, repo):
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2258
  >     foo = {'foo': repo[0].node()}
23873
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
  2259
  >     names = lambda r: foo.keys()
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
  2260
  >     namemap = lambda r, name: foo.get(name)
36360
58c1368ab629 py3: use dict.items() instead of dict.iteritems() in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35712
diff changeset
  2261
  >     nodemap = lambda r, node: [name for name, n in foo.items()
23873
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
  2262
  >                                if n == node]
33983
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2263
  >     ns = namespaces.namespace(
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2264
  >         "bars", templatename="bar", logname="barlog",
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2265
  >         colorname="barcolor", listnames=names, namemap=namemap,
251bd3fddd9b tests: update test-log to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
  2266
  >         nodemap=nodemap)
23873
9ef234021667 namespaces: use named args for namespace api
Sean Farley <sean.michael.farley@gmail.com>
parents: 23865
diff changeset
  2267
  > 
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2268
  >     repo.names.addnamespace(ns)
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2269
  > EOF
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2270
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2271
  $ hg --config extensions.names=../names.py log -r 0
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2272
  changeset:   0:65624cd9070a
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2273
  tag:         tip
23876
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2274
  barlog:      foo
23773
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2275
  user:        test
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2276
  date:        Thu Jan 01 00:00:00 1970 +0000
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2277
  summary:     a bunch of weird directories
c517b97c7609 namespaces: add test for log
Sean Farley <sean.michael.farley@gmail.com>
parents: 23771
diff changeset
  2278
  
23876
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2279
  $ hg --config extensions.names=../names.py \
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2280
  >  --config extensions.color= --config color.log.barcolor=red \
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2281
  >  --color=always log -r 0
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2282
  \x1b[0;33mchangeset:   0:65624cd9070a\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2283
  tag:         tip
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2284
  \x1b[0;31mbarlog:      foo\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2285
  user:        test
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2286
  date:        Thu Jan 01 00:00:00 1970 +0000
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2287
  summary:     a bunch of weird directories
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2288
  
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2289
  $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2290
  foo
48fd1dfb99aa log: use namespace logname and colorname
Sean Farley <sean.michael.farley@gmail.com>
parents: 23873
diff changeset
  2291
17746
6d218e47cf9b log: speed up hg log for untracked files (issue1340)
smuralid
parents: 17207
diff changeset
  2292
  $ cd ..
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2293
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2294
hg log -f dir across branches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2295
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2296
  $ hg init acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2297
  $ cd acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2298
  $ mkdir d
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2299
  $ echo a > d/a && hg ci -Aqm a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2300
  $ echo b > d/a && hg ci -Aqm b
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2301
  $ hg up -q 0
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2302
  $ echo b > d/a && hg ci -Aqm c
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2303
  $ hg log -f d -T '{desc}' -G
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2304
  @  c
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2305
  |
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2306
  o  a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2307
  
24180
d8e0c591781c spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 24064
diff changeset
  2308
Ensure that largefiles doesn't interfere with following a normal file
23976
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
  2309
  $ hg  --config extensions.largefiles= log -f d -T '{desc}' -G
33212
fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 32348
diff changeset
  2310
  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
23976
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
  2311
  @  c
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
  2312
  |
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
  2313
  o  a
344939126579 largefiles: don't interfere with logging normal files
Matt Harbison <matt_harbison@yahoo.com>
parents: 23956
diff changeset
  2314
  
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2315
  $ hg log -f d/a -T '{desc}' -G
23704
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2316
  @  c
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2317
  |
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2318
  o  a
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2319
  
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 23046
diff changeset
  2320
  $ cd ..
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2321
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2322
hg log -f with linkrev pointing to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2323
-------------------------------------------------
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2324
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2325
create history with a filerev whose linkrev points to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2326
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2327
  $ hg init branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2328
  $ cd branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2329
  $ echo 1 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2330
  $ hg commit -Am 'content1'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2331
  adding a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2332
  $ echo 2 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2333
  $ hg commit -m 'content2'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2334
  $ hg up --rev 'desc(content1)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2335
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2336
  $ echo unrelated > unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2337
  $ hg commit -Am 'unrelated'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2338
  adding unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2339
  created new head
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2340
  $ hg graft -r 'desc(content2)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2341
  grafting 1:2294ae80ad84 "content2"
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2342
  $ echo 3 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2343
  $ hg commit -m 'content3'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2344
  $ hg log -G
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2345
  @  changeset:   4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2346
  |  tag:         tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2347
  |  user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2348
  |  date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2349
  |  summary:     content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2350
  |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2351
  o  changeset:   3:15b2327059e5
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2352
  |  user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2353
  |  date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2354
  |  summary:     content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2355
  |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2356
  o  changeset:   2:2029acd1168c
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2357
  |  parent:      0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2358
  |  user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2359
  |  date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2360
  |  summary:     unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2361
  |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2362
  | o  changeset:   1:2294ae80ad84
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2363
  |/   user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2364
  |    date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2365
  |    summary:     content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2366
  |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2367
  o  changeset:   0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2368
     user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2369
     date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2370
     summary:     content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2371
  
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2372
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2373
log -f on the file should list the graft result.
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2374
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2375
  $ hg log -Gf a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2376
  @  changeset:   4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2377
  |  tag:         tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2378
  |  user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2379
  |  date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2380
  |  summary:     content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2381
  |
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2382
  o  changeset:   3:15b2327059e5
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2383
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2384
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2385
  :  summary:     content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2386
  :
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2387
  o  changeset:   0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2388
     user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2389
     date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2390
     summary:     content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2391
  
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2392
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2393
plain log lists the original version
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2394
(XXX we should probably list both)
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2395
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2396
  $ hg log -G a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2397
  @  changeset:   4:50b9b36e9c5d
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2398
  :  tag:         tip
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2399
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2400
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2401
  :  summary:     content3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2402
  :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2403
  : o  changeset:   1:2294ae80ad84
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2404
  :/   user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2405
  :    date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2406
  :    summary:     content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2407
  :
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2408
  o  changeset:   0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2409
     user:        test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2410
     date:        Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2411
     summary:     content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2412
  
23704
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2413
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2414
hg log -f from the grafted changeset
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2415
(The bootstrap should properly take the topology in account)
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2416
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2417
  $ hg up 'desc(content3)^'
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2418
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2419
  $ hg log -Gf a
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2420
  @  changeset:   3:15b2327059e5
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2421
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2422
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2423
  :  summary:     content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2424
  :
23704
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2425
  o  changeset:   0:ae0a3c9f9e95
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2426
     user:        test
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2427
     date:        Thu Jan 01 00:00:00 1970 +0000
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2428
     summary:     content1
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23702
diff changeset
  2429
  
23719
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2430
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2431
Test that we use the first non-hidden changeset in that case.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2432
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2433
(hide the changeset)
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2434
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2435
  $ hg log -T '{node}\n' -r 1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2436
  2294ae80ad8447bc78383182eeac50cb049df623
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2437
  $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33262
diff changeset
  2438
  obsoleted 1 changesets
23719
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2439
  $ hg log -G
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2440
  o  changeset:   4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2441
  |  tag:         tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2442
  |  user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2443
  |  date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2444
  |  summary:     content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2445
  |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2446
  @  changeset:   3:15b2327059e5
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2447
  |  user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2448
  |  date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2449
  |  summary:     content2
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2450
  |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2451
  o  changeset:   2:2029acd1168c
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2452
  |  parent:      0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2453
  |  user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2454
  |  date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2455
  |  summary:     unrelated
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2456
  |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2457
  o  changeset:   0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2458
     user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2459
     date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2460
     summary:     content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2461
  
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2462
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2463
Check that log on the file does not drop the file revision.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2464
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2465
  $ hg log -G a
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2466
  o  changeset:   4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2467
  |  tag:         tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2468
  |  user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2469
  |  date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2470
  |  summary:     content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2471
  |
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2472
  @  changeset:   3:15b2327059e5
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2473
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2474
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2475
  :  summary:     content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2476
  :
23719
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2477
  o  changeset:   0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2478
     user:        test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2479
     date:        Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2480
     summary:     content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2481
  
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23704
diff changeset
  2482
23720
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2483
Even when a head revision is linkrev-shadowed.
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2484
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2485
  $ hg log -T '{node}\n' -r 4
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2486
  50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2487
  $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33262
diff changeset
  2488
  obsoleted 1 changesets
23720
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2489
  $ hg log -G a
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2490
  @  changeset:   3:15b2327059e5
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2491
  :  tag:         tip
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2492
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2493
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2494
  :  summary:     content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2495
  :
23720
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2496
  o  changeset:   0:ae0a3c9f9e95
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2497
     user:        test
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2498
     date:        Thu Jan 01 00:00:00 1970 +0000
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2499
     summary:     content1
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2500
  
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23719
diff changeset
  2501
23702
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23500
diff changeset
  2502
  $ cd ..
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2503
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2504
Even when the file revision is missing from some head:
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2505
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2506
  $ hg init issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2507
  $ cd issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2508
  $ echo '[experimental]' >> .hg/hgrc
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34456
diff changeset
  2509
  $ echo 'evolution.createmarkers=True' >> .hg/hgrc
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2510
  $ echo a > a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2511
  $ hg ci -Am0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2512
  adding a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2513
  $ echo b > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2514
  $ hg ci -Am1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2515
  adding b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2516
  $ echo B > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2517
  $ hg ci --amend -m 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2518
  $ hg up 0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2519
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2520
  $ echo c > c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2521
  $ hg ci -Am2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2522
  adding c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2523
  created new head
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2524
  $ hg up 'head() and not .'
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2525
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2526
  $ hg log -G
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33983
diff changeset
  2527
  o  changeset:   3:db815d6d32e6
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2528
  |  tag:         tip
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2529
  |  parent:      0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2530
  |  user:        test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2531
  |  date:        Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2532
  |  summary:     2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2533
  |
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33983
diff changeset
  2534
  | @  changeset:   2:9bc8ce7f9356
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2535
  |/   parent:      0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2536
  |    user:        test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2537
  |    date:        Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2538
  |    summary:     1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2539
  |
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2540
  o  changeset:   0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2541
     user:        test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2542
     date:        Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2543
     summary:     0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2544
  
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2545
  $ hg log -f -G b
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33983
diff changeset
  2546
  @  changeset:   2:9bc8ce7f9356
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2547
  |  parent:      0:f7b1eb17ad24
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2548
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2549
     date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2550
     summary:     1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2551
  
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2552
  $ hg log -G b
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33983
diff changeset
  2553
  @  changeset:   2:9bc8ce7f9356
23729
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23720
diff changeset
  2554
  |  parent:      0:f7b1eb17ad24
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2555
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2556
     date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2557
     summary:     1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28566
diff changeset
  2558
  
23865
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2559
  $ cd ..
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2560
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2561
Check proper report when the manifest changes but not the file issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2562
------------------------------------------------------------------------
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2564
  $ hg init issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2565
  $ cd issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2566
  $ for f in A B C D F E G H I J K L M N O P Q R S T U; do
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2567
  >     echo 1 > $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2568
  >     hg add $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2569
  > done
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2570
  $ hg commit -m 'A1B1C1'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2571
  $ echo 2 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2572
  $ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2573
  $ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2574
  $ hg commit -m 'A2B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2575
  $ hg up 0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2576
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2577
  $ echo 3 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2578
  $ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2579
  $ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2580
  $ hg commit -m 'A3B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2581
  created new head
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2582
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2583
  $ hg log -G
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2584
  @  changeset:   2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2585
  |  tag:         tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2586
  |  parent:      0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2587
  |  user:        test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2588
  |  date:        Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2589
  |  summary:     A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2590
  |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2591
  | o  changeset:   1:07dcc6b312c0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2592
  |/   user:        test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2593
  |    date:        Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2594
  |    summary:     A2B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2595
  |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2596
  o  changeset:   0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2597
     user:        test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2598
     date:        Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2599
     summary:     A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2600
  
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2601
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2602
Log -f on B should reports current changesets
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2603
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2604
  $ hg log -fG B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2605
  @  changeset:   2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2606
  |  tag:         tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2607
  |  parent:      0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2608
  |  user:        test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2609
  |  date:        Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2610
  |  summary:     A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2611
  |
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2612
  o  changeset:   0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2613
     user:        test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2614
     date:        Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2615
     summary:     A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2616
  
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23773
diff changeset
  2617
  $ cd ..