convert: readd --filemap
To handle merges correctly, this revision adds a filemap_source class
that wraps a converter_source and does the work necessary to calculate
the subgraph we're interested in.
The wrapped converter_source must provide a new getchangedfiles method
that, given a revision rev, and an index N, returns the list of files
that are different in rev and its Nth parent.
The implementation depends on the ability to skip some revisions and to
change the parents field of the commit objects that we returned earlier.
To make the conversion restartable, we assume the revisons in the
revmapfile are topologically sorted.
#!/bin/sh
cp "$TESTDIR"/../contrib/simplemerge .
echo base > base
echo local > local
cat base >> local
cp local orig
cat base > other
echo other >> other
echo '% changing local directly'
python simplemerge local base other && echo "merge succeeded"
cat local
cp orig local
echo '% printing to stdout'
python simplemerge -p local base other
echo ' local:'
cat local
echo '% conflicts'
cp base conflict-local
cp other conflict-other
echo not other >> conflict-local
echo end >> conflict-local
echo end >> conflict-other
python simplemerge -p conflict-local base conflict-other || echo "merge failed"
echo '% --no-minimal'
python simplemerge -p --no-minimal conflict-local base conflict-other
echo '% 1 label'
python simplemerge -p -L foo conflict-local base conflict-other
echo '% 2 labels'
python simplemerge -p -L foo -L bar conflict-local base conflict-other
echo '% too many labels'
python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
echo '% binary file'
python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
cat orig >> binary-local
python simplemerge -p binary-local base other
echo '% binary file --text'
python simplemerge -a -p binary-local base other
echo '% help'
python simplemerge --help
echo '% wrong number of arguments'
python simplemerge
echo '% bad option'
python simplemerge --foo -p local base other
exit 0