Mercurial > hg
view tests/test-extdata.t @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +0530 |
parents | ea6558db1011 |
children | ebee234d952a |
line wrap: on
line source
$ hg init repo $ cd repo $ for n in 0 1 2 3 4 5 6 7 8 9 10 11; do > echo $n > $n > hg ci -qAm $n > done test revset support $ cat <<'EOF' >> .hg/hgrc > [extdata] > filedata = file:extdata.txt > notes = notes.txt > shelldata = shell:cat extdata.txt | grep 2 > emptygrep = shell:cat extdata.txt | grep empty > badparse = shell:cat badparse.txt > EOF $ cat <<'EOF' > extdata.txt > 2 another comment on 2 > 3 > EOF $ cat <<'EOF' > notes.txt > f6ed this change is great! > e834 this is buggy :( > 0625 first post > bogusnode gives no error > a ambiguous node gives no error > EOF $ hg log -qr "extdata(filedata)" 2:f6ed99a58333 3:9de260b1e88e $ hg log -qr "extdata(shelldata)" 2:f6ed99a58333 test weight of extdata() revset $ hg debugrevspec -p optimized "extdata(filedata) & 3" * optimized: (andsmally (func (symbol 'extdata') (symbol 'filedata')) (symbol '3')) 3 test non-zero exit of shell command $ hg log -qr "extdata(emptygrep)" abort: extdata command 'cat extdata.txt | grep empty' failed: exited with status 1 [255] test bad extdata() revset source $ hg log -qr "extdata()" hg: parse error: extdata takes at least 1 string argument [255] $ hg log -qr "extdata(unknown)" abort: unknown extdata source 'unknown' [255] test a zero-exiting source that emits garbage to confuse the revset parser $ cat > badparse.txt <<'EOF' > +---------------------------------------+ > 9de260b1e88e > EOF It might be nice if this error message mentioned where the bad string came from (eg line X of extdata source S), but the important thing is that we don't crash before we can print the parse error. $ hg log -qr "extdata(badparse)" hg: parse error at 0: not a prefix: + (+---------------------------------------+ ^ here) [255] test template support: $ hg log -r:3 -T "{node|short}{if(extdata('notes'), ' # {extdata('notes')}')}\n" 06254b906311 # first post e8342c9a2ed1 # this is buggy :( f6ed99a58333 # this change is great! 9de260b1e88e test template cache: $ hg log -r:3 -T '{rev} "{extdata("notes")}" "{extdata("shelldata")}"\n' 0 "first post" "" 1 "this is buggy :(" "" 2 "this change is great!" "another comment on 2" 3 "" "" test bad extdata() template source $ hg log -T "{extdata()}\n" hg: parse error: extdata expects one argument [255] $ hg log -T "{extdata('unknown')}\n" abort: unknown extdata source 'unknown' [255] $ hg log -T "{extdata(unknown)}\n" hg: parse error: empty data source specified (did you mean extdata('unknown')?) [255] $ hg log -T "{extdata('{unknown}')}\n" hg: parse error: empty data source specified [255] we don't fix up relative file URLs, but we do run shell commands in repo root $ mkdir sub $ cd sub $ hg log -qr "extdata(filedata)" abort: error: $ENOENT$ [255] $ hg log -qr "extdata(shelldata)" 2:f6ed99a58333 $ cd ..