##// END OF EJS Templates
shelve: directly handle the initial parent alignment...
shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

File last commit:

r38558:1e25782a default
r38637:c829749e default
Show More
test-grep.t
426 lines | 9.8 KiB | text/troff | Tads3Lexer
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init t
Nicolas Dumazet
tests: unify test-grep
r11902 $ cd t
$ echo import > port
$ hg add port
$ hg commit -m 0 -u spam -d '0 0'
$ echo export >> port
$ hg commit -m 1 -u eggs -d '1 0'
$ echo export > port
$ echo vaportight >> port
$ echo 'import/export' >> port
$ hg commit -m 2 -u spam -d '2 0'
$ echo 'import/export' >> port
$ hg commit -m 3 -u eggs -d '3 0'
$ head -n 3 port > port1
$ mv port1 port
$ hg commit -m 4 -u spam -d '4 0'
pattern error
$ hg grep '**test**'
grep: invalid match pattern: nothing to repeat
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-grep
r11902
simple
Idan Kamara
grep: don't search past the end of the searched string...
r17923 $ hg grep '.*'
port:4:export
port:4:vaportight
port:4:import/export
Nicolas Dumazet
tests: unify test-grep
r11902 $ hg grep port port
port:4:export
port:4:vaportight
port:4:import/export
simple with color
$ hg --config extensions.color= grep --config color.mode=ansi \
> --color=always port port
Idan Kamara
grep: colorize all fields...
r17806 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
Takumi IINO
grep: highlight all matched words...
r21011 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-grep
r11902
Yuya Nishihara
grep: add formatter support...
r29858 simple templated
$ hg grep port \
> -T '{file}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
port:4:914fa752cdea:exPORT
port:4:914fa752cdea:vaPORTight
port:4:914fa752cdea:imPORT/exPORT
Yuya Nishihara
formatter: make nested items somewhat readable in template output
r37518 $ hg grep port -T '{file}:{rev}:{texts}\n'
port:4:export
port:4:vaportight
port:4:import/export
Yuya Nishihara
grep: add support for log-like template keywords and functions
r38558 $ hg grep port -T '{file}:{tags}:{texts}\n'
port:tip:export
port:tip:vaportight
port:tip:import/export
Yuya Nishihara
grep: add formatter support...
r29858 simple JSON (no "change" field)
$ hg grep -Tjson port
[
{
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [4, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 1,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"rev": 4,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [4, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 2,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"rev": 4,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "spam"
},
{
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [4, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 3,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"rev": 4,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
}
]
simple JSON without matching lines
$ hg grep -Tjson -l port
[
{
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [4, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 1,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"rev": 4,
"user": "spam"
}
]
Nicolas Dumazet
tests: unify test-grep
r11902 all
$ hg grep --traceback --all -nu port port
port:4:4:-:spam:import/export
port:3:4:+:eggs:import/export
port:2:1:-:spam:import
port:2:2:-:spam:export
port:2:1:+:spam:export
port:2:2:+:spam:vaportight
port:2:3:+:spam:import/export
port:1:2:+:eggs:export
port:0:1:+:spam:import
Yuya Nishihara
grep: add formatter support...
r29858 all JSON
$ hg grep --all -Tjson port port
[
{
"change": "-",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [4, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 4,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"rev": 4,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [3, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 4,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"rev": 3,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"change": "-",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [2, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 1,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"rev": 2,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "-",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [2, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 2,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"rev": 2,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [2, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 1,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"rev": 2,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [2, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 2,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"rev": 2,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "spam"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [2, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 3,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"rev": 2,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [1, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 2,
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
"rev": 1,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"change": "+",
Yuya Nishihara
formatter: convert timestamp to int...
r37788 "date": [0, 0],
Yuya Nishihara
grep: add formatter support...
r29858 "file": "port",
"line_number": 1,
"node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
"rev": 0,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "spam"
}
]
Nicolas Dumazet
tests: unify test-grep
r11902 other
Idan Kamara
test-grep: add a test for -l
r17805 $ hg grep -l port port
port:4
Nicolas Dumazet
tests: unify test-grep
r11902 $ hg grep import port
port:4:import/export
$ hg cp port port2
$ hg commit -m 4 -u spam -d '5 0'
follow
Matt Mackall
grep: make multiline mode the default (BC)...
r15765 $ hg grep --traceback -f 'import\n\Z' port2
Nicolas Dumazet
tests: unify test-grep
r11902 port:0:import
Matt Mackall
grep: make multiline mode the default (BC)...
r15765
Nicolas Dumazet
tests: unify test-grep
r11902 $ echo deport >> port2
$ hg commit -m 5 -u eggs -d '6 0'
$ hg grep -f --all -nu port port2
port2:6:4:+:eggs:deport
port:4:4:-:spam:import/export
port:3:4:+:eggs:import/export
port:2:1:-:spam:import
port:2:2:-:spam:export
port:2:1:+:spam:export
port:2:2:+:spam:vaportight
port:2:3:+:spam:import/export
port:1:2:+:eggs:export
port:0:1:+:spam:import
Yuya Nishihara
log: fix --follow null parent not to include revision 0...
r24064 $ hg up -q null
$ hg grep -f port
[1]
Yuya Nishihara
workingctx: build _manifest on filenode() or flags() request...
r37465 Test wdir
(at least, this shouldn't crash)
$ hg up -q
$ echo wport >> port2
$ hg stat
M port2
$ hg grep -r 'wdir()' port
Sangeet Kumar Mishra
grep: enable passing wdir as a revision...
r38217 port2:2147483647:export
port2:2147483647:vaportight
port2:2147483647:import/export
port2:2147483647:deport
port2:2147483647:wport
Yuya Nishihara
workingctx: build _manifest on filenode() or flags() request...
r37465
Nicolas Dumazet
tests: unify test-grep
r11902 $ cd ..
$ hg init t2
$ cd t2
$ hg grep foobar foo
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-grep
r11902 $ hg grep foobar
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-grep
r11902 $ echo blue >> color
$ echo black >> color
$ hg add color
$ hg ci -m 0
$ echo orange >> color
$ hg ci -m 1
$ echo black > color
$ hg ci -m 2
$ echo orange >> color
$ echo blue >> color
$ hg ci -m 3
$ hg grep orange
color:3:orange
$ hg grep --all orange
color:3:+:orange
color:2:-:orange
color:1:+:orange
Sangeet Kumar Mishra
grep: add --diff flag...
r38440 $ hg grep --diff orange
color:3:+:orange
color:2:-:orange
color:1:+:orange
Yuya Nishihara
grep: refactor loop that yields matched text with label...
r29854 test substring match: '^' should only match at the beginning
$ hg grep '^.' --config extensions.color= --color debug
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
Nicolas Dumazet
tests: unify test-grep
r11902
match in last "line" without newline
Pulkit Goyal
py3: make sure we write bytes in a file open in bytes mode...
r36513 $ $PYTHON -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
Nicolas Dumazet
tests: unify test-grep
r11902 $ hg ci -Amnoeol
adding noeol
$ hg grep loop
Mads Kiilerich
grep: correct handling of matching lines without line ending (issue3050)...
r15293 noeol:4:no infinite loop
Nicolas Dumazet
tests: unify test-grep
r11902
$ cd ..
Mads Kiilerich
spelling: fixes from spell checker
r21024 Issue685: traceback in grep -r after rename
Martin Geisler
tests: added a short description to issue numbers...
r12399
Nicolas Dumazet
tests: unify test-grep
r11902 Got a traceback when using grep on a single
revision with renamed files.
$ hg init issue685
$ cd issue685
$ echo octarine > color
$ hg ci -Amcolor
adding color
$ hg rename color colour
$ hg ci -Am rename
$ hg grep octarine
colour:1:octarine
color:0:octarine
Used to crash here
$ hg grep -r 1 octarine
colour:1:octarine
$ cd ..
Issue337: test that grep follows parent-child relationships instead
of just using revision numbers.
$ hg init issue337
$ cd issue337
$ echo white > color
$ hg commit -A -m "0 white"
adding color
$ echo red > color
$ hg commit -A -m "1 red"
$ hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo black > color
$ hg commit -A -m "2 black"
created new head
$ hg update --clean 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo blue > color
$ hg commit -A -m "3 blue"
$ hg grep --all red
color:3:-:red
color:1:+:red
Md. O. Shayan
grep: don't print data from binary files for matches (issue2614)
r13920
Sangeet Kumar Mishra
grep: add --diff flag...
r38440 $ hg grep --diff red
color:3:-:red
color:1:+:red
Sangeet Kumar Mishra
grep: fixes erroneous output of grep in forward order (issue3885)...
r37151 Issue3885: test that changing revision order does not alter the
revisions printed, just their order.
$ hg grep --all red -r "all()"
color:1:+:red
color:3:-:red
$ hg grep --all red -r "reverse(all())"
color:3:-:red
color:1:+:red
Sangeet Kumar Mishra
grep: add --diff flag...
r38440 $ hg grep --diff red -r "all()"
color:1:+:red
color:3:-:red
$ hg grep --diff red -r "reverse(all())"
color:3:-:red
color:1:+:red
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ..
Md. O. Shayan
grep: don't print data from binary files for matches (issue2614)
r13920 $ hg init a
$ cd a
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ cp "$TESTDIR/binfile.bin" .
Md. O. Shayan
grep: don't print data from binary files for matches (issue2614)
r13920 $ hg add binfile.bin
$ hg ci -m 'add binfile.bin'
$ hg grep "MaCam" --all
binfile.bin:0:+: Binary file matches
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912
Sangeet Kumar Mishra
grep: add --diff flag...
r38440 $ hg grep "MaCam" --diff
binfile.bin:0:+: Binary file matches
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ..
Sangeet Kumar Mishra
grep: enable passing wdir as a revision...
r38217
Sangeet Kumar Mishra
grep: adds allfiles mode...
r38361 Test for showing working of allfiles flag
$ hg init sng
$ cd sng
$ echo "unmod" >> um
$ hg ci -A -m "adds unmod to um"
adding um
$ echo "something else" >> new
$ hg ci -A -m "second commit"
adding new
$ hg grep -r "." "unmod"
[1]
$ hg grep -r "." "unmod" --allfiles
um:1:unmod
$ cd ..
Sangeet Kumar Mishra
grep: enable passing wdir as a revision...
r38217 Fix_Wdir(): test that passing wdir() t -r flag does greps on the
files modified in the working directory
$ cd a
$ echo "abracadara" >> a
$ hg add a
$ hg grep -r "wdir()" "abra"
a:2147483647:abracadara
$ cd ..