view tests/test-bundle-type.out @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents d6b53b48943f
children
line wrap: on
line source

% bundle w/o type option
adding file.txt
summary:     a
searching for changes
1 changesets found
pulling from ../b1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
summary:     a
% test bundle type None
searching for changes
1 changesets found
HG10UN
pulling from ../bNone
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
summary:     a
% test bundle type bzip2
searching for changes
1 changesets found
HG10BZ
pulling from ../bbzip2
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
summary:     a
% test bundle type gzip
searching for changes
1 changesets found
HG10GZ
pulling from ../bgzip
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
summary:     a
% test garbage file
abort: ../bgarbage: not a Mercurial bundle file
% test invalid bundle type
1 changesets found
abort: unknown bundle type specified with --type