tests/test-convert-splicemap.out
author Mads Kiilerich <mads@kiilerich.com>
Tue, 29 Jun 2010 12:12:34 +0200
branchstable
changeset 11488 f786fc4b8764
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.

adding a
adding b
adding c
adding a
adding d
adding e
% test invalid splicemap
abort: syntax error in splicemap(1): key/value pair expected
% splice repo2 on repo1
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
scanning source...
sorting...
converting...
2 addaandd
spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db
1 changed
spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b
0 adde
o  5 "adde" files: e
|
o    4 "changed" files: d
|\
| o  3 "addaandd" files: a d
| |
@ |  2 "addc" files: c
|/
o  1 "addb" files: a b
|
o  0 "adda" files: a