tests/test-grep.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 11 Oct 2009 21:32:55 +0200
changeset 9594 f0c5c59d878d
parent 8849 80cc4b1a62d0
child 10826 717c35d55fb3
permissions -rw-r--r--
merge with mpm
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4877
242026115e6a hg grep: handle re.compile errors & update tests/test-grep
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 3951
diff changeset
     1
% pattern error
6057
218d5b9aa466 Remove trailing ! from two error messages as this was confusing.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5106
diff changeset
     2
grep: invalid match pattern: nothing to repeat
3950
3d3007064a17 grep: incrementing is always False during 'iter'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3523
diff changeset
     3
% simple
1148
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     4
port:4:export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     5
port:4:vaportight
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     6
port:4:import/export
3950
3d3007064a17 grep: incrementing is always False during 'iter'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3523
diff changeset
     7
% all
2869
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
     8
port:4:4:-:spam:import/export
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
     9
port:3:4:+:eggs:import/export
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    10
port:2:1:-:spam:import
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    11
port:2:2:-:spam:export
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    12
port:2:1:+:spam:export
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    13
port:2:2:+:spam:vaportight
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    14
port:2:3:+:spam:import/export
81f351c5264d grep: display correct user/revision for --all in reverse.
Brendan Cully <brendan@kublai.com>
parents: 1148
diff changeset
    15
port:1:2:+:eggs:export
3523
7ed86c28f1ae Fixups for hg grep
Matt Mackall <mpm@selenic.com>
parents: 2870
diff changeset
    16
port:0:1:+:spam:import
3950
3d3007064a17 grep: incrementing is always False during 'iter'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3523
diff changeset
    17
% other
1148
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
    18
port:4:import/export
2870
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    19
% follow
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    20
port:0:import
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    21
port2:6:4:+:eggs:deport
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    22
port:4:4:-:spam:import/export
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    23
port:3:4:+:eggs:import/export
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    24
port:2:1:-:spam:import
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    25
port:2:2:-:spam:export
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    26
port:2:1:+:spam:export
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    27
port:2:2:+:spam:vaportight
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    28
port:2:3:+:spam:import/export
8eaaf1321bfe grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents: 2869
diff changeset
    29
port:1:2:+:eggs:export
3523
7ed86c28f1ae Fixups for hg grep
Matt Mackall <mpm@selenic.com>
parents: 2870
diff changeset
    30
port:0:1:+:spam:import
3951
cb66641cdee3 grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3950
diff changeset
    31
color:3:orange
cb66641cdee3 grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3950
diff changeset
    32
color:3:+:orange
cb66641cdee3 grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3950
diff changeset
    33
color:2:-:orange
cb66641cdee3 grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3950
diff changeset
    34
color:1:+:orange
7240
dac14cc9711e test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents: 6057
diff changeset
    35
% match in last line without newline
dac14cc9711e test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents: 6057
diff changeset
    36
adding noeol
dac14cc9711e test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents: 6057
diff changeset
    37
% last character omitted in output to avoid infinite loop
dac14cc9711e test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents: 6057
diff changeset
    38
noeol:4:no infinite loo
5106
ee702e7f181f test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com>
parents: 4877
diff changeset
    39
% issue 685
ee702e7f181f test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com>
parents: 4877
diff changeset
    40
adding color
8849
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    41
colour:1:octarine
5106
ee702e7f181f test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com>
parents: 4877
diff changeset
    42
color:0:octarine
ee702e7f181f test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com>
parents: 4877
diff changeset
    43
colour:1:octarine
8849
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    44
% issue 337
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    45
adding color
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    46
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    47
created new head
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    48
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    49
color:3:-:red
80cc4b1a62d0 compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 7240
diff changeset
    50
color:1:+:red