Mercurial > hg
view tests/test-hgignore @ 5378:8a2915f57dfc
convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | ac97e065cfc7 |
children | 31abcae33b4f |
line wrap: on
line source
#!/bin/sh hg init # Test issue 562: .hgignore requires newline at end touch foo touch bar touch baz cat > makeignore.py <<EOF f = open(".hgignore", "w") f.write("ignore\n") f.write("foo\n") # No EOL here f.write("bar") f.close() EOF python makeignore.py echo % should display baz only hg status rm foo bar baz .hgignore makeignore.py touch a.o touch a.c touch syntax mkdir dir touch dir/a.o touch dir/b.o touch dir/c.o hg add dir/a.o hg commit -m 0 hg add dir/b.o echo "--" ; hg status echo "*.o" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/' echo ".*\.o" > .hgignore echo "--" ; hg status echo "glob:**.o" > .hgignore echo "--" ; hg status echo "glob:*.o" > .hgignore echo "--" ; hg status echo "syntax: glob" > .hgignore echo "re:.*\.o" >> .hgignore echo "--" ; hg status echo "syntax: invalid" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/' echo "syntax: glob" > .hgignore echo "*.o" >> .hgignore echo "--" ; hg status echo "relglob:syntax*" > .hgignore echo "--" ; hg status echo "relglob:*" > .hgignore echo "--" ; hg status cd dir echo "--" ; hg status .