[PATCH] patiencediff.py/unified_diff: do not insert trailing whitespace if filedate is empty

John Arbash Meinel john at arbash-meinel.com
Tue Jan 6 15:12:36 GMT 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adeodato Simó wrote:
> Hi there.
> 
> When using unified_diff from bzrlib.patiencediff and writing the result
> through a colordiff.DiffWriter object, the +++/--- lines were signaled
> as having trailing whitespace.
> 
> The attached patch fixes this nuisance, it would be great if you could
> apply it in bzr.dev. Feel free to drop the str()'s if you feel that's
> too much pedantry.
> 
> Thanks,
> 
> (Please CC me on replies.)
> 
> 

Just to mention, you changed the patience diff code itself, but you
didn't actually fix the tests associated with it.

Attached is code that includes your fix, and then updates the tests to
match. Which I'm submitting now.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkljdOQACgkQJdeBCYSNAAMtpQCgjNFiEcgKc57dN0nTsZzSqMSY
Rl0An1h0PasGDdUnrZWAWHtCGdR5zXGC
=be/e
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pdiff_unified_diff.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20090106/4c58929d/attachment-0001.diff 


More information about the bazaar mailing list