log mercurial/mdiff.py @ 21812:73e4a02e6d23

age author description
Sat, 21 Jun 2014 15:56:49 +1000 Stephen Lee diff: add nobinary config to suppress git-style binary diffs
Wed, 06 Nov 2013 16:48:06 -0500 Augie Fackler cleanup: move stdlib imports to their own import statement
Thu, 15 Nov 2012 15:16:41 -0800 Guillermo Pérez diff: move index header generation to patch
Thu, 15 Nov 2012 12:19:03 -0800 Guillermo Pérez diff: move diffline to patch module
Thu, 15 Nov 2012 12:16:08 -0800 Guillermo Pérez diff: unify calls to diffline
Tue, 06 Nov 2012 14:04:05 -0800 Guillermo Pérez diff: move b85diff to mdiff module
Thu, 05 Apr 2012 15:39:07 +0200 Patrick Mezard mdiff: fix diff header generation for files with spaces (issue3357) stable
Mon, 06 Feb 2012 21:17:50 +0100 Patrick Mezard mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) stable
Thu, 15 Dec 2011 15:27:11 -0600 Matt Mackall util: don't mess with builtins to emulate buffer()
Fri, 18 Nov 2011 14:23:03 +0100 Patrick Mezard mdiff: replace wscleanup() regexps with C loops
Fri, 18 Nov 2011 14:16:47 +0100 Patrick Mezard mdiff: split lines in allblocks() only when necessary
Fri, 18 Nov 2011 12:04:31 +0100 Patrick Mezard annotate: support diff whitespace filtering flags (issue3030)
Fri, 18 Nov 2011 12:01:04 +0100 Patrick Mezard mdiff: make diffblocks() return all blocks, matching and changed
Fri, 18 Nov 2011 11:53:38 +0100 Patrick Mezard mdiff: extract blocks whitespace normalization in diffblocks()
Thu, 17 Nov 2011 16:53:17 -0600 Matt Mackall merge with stable
Sun, 13 Nov 2011 21:37:14 +0100 Patrick Mezard diff: --ignore-blank-lines was too enthusiastic stable
Thu, 10 Nov 2011 11:00:27 -0600 Matt Mackall merge with stable
Wed, 09 Nov 2011 16:55:59 -0800 Nicolas Venegas mdiff/patch: fix bad hunk handling for unified diffs with zero context stable
Mon, 07 Nov 2011 02:49:00 +0100 Mads Kiilerich diff: always use / in paths in diff
Mon, 19 Sep 2011 15:58:03 -0700 Brodie Rao mdiff: speed up showfunc for large diffs
Tue, 19 Oct 2010 03:55:06 +0200 Mads Kiilerich mdiff: carriage return (\r) is also ignorable whitespace
Mon, 23 Aug 2010 13:28:04 +0200 Benoit Boissinot mdiff.patch(): add a special case for when the base text is empty
Tue, 09 Mar 2010 18:31:57 +0100 Benoit Boissinot remove header handling out of mdiff.bunidiff, rename it
Mon, 25 Jan 2010 00:05:27 -0600 Matt Mackall many, many trivial check-code fixups
Tue, 19 Jan 2010 22:45:09 -0600 Matt Mackall Merge with stable
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
Fri, 01 Jan 2010 20:54:05 +0100 Patrick Mezard patch: support diff data loss detection and upgrade
Fri, 01 Jan 2010 19:53:05 +0100 Patrick Mezard mq: preserve --git flag when merging patches stable
Wed, 11 Nov 2009 18:31:42 +0100 Patrick Mezard mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Tue, 26 May 2009 22:59:52 +0200 Martin Geisler replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Tue, 28 Apr 2009 17:40:46 +0200 Simon Heimberg separate import lines from mercurial and general python modules
Sun, 26 Apr 2009 01:08:54 +0200 Martin Geisler updated license to be explicit about GPL version 2
Thu, 27 Nov 2008 17:00:54 +0100 Dirkjan Ochtman diff: fix obscure off-by-one error in diff -p
Wed, 22 Oct 2008 18:55:07 +0200 Thomas Arendsen Hein Remove trailing space
Wed, 22 Oct 2008 13:14:52 +0200 Dirkjan Ochtman patch/diff: use a separate function to write the first line of a file diff
Sat, 09 Aug 2008 02:10:22 +0200 Martin Geisler mdiff: compare content of binary files directly
Fri, 04 Apr 2008 22:36:40 +0200 Dirkjan Ochtman python 2.6 compatibility: compatibility wrappers for hash functions
Fri, 04 Apr 2008 22:15:14 +0200 Patrick Mezard Let --unified default to diff.unified (issue 1076)
Wed, 16 Jan 2008 11:14:24 -0600 Matt Mackall diff: don't show function name by default
Thu, 01 Nov 2007 12:17:59 -0700 Dustin Sallings Use both the from and to name in mdiff.unidiff.
Wed, 03 Oct 2007 17:17:27 -0500 Matt Mackall revlog: generate trivial deltas against null revision
Sat, 14 Jul 2007 12:44:47 -0500 Matt Mackall diff: correctly handle combinations of whitespace options
Fri, 22 Jun 2007 19:06:04 -0300 Alexis S. L. Carvalho git patches: correct handling of filenames with spaces
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho add mdiff.get_matching_blocks
Tue, 20 Feb 2007 20:55:23 +0100 Thomas Arendsen Hein merge with crew-stable
Sat, 17 Feb 2007 09:54:56 -0200 tailgunner Don't lie that "binary file has changed"
Wed, 13 Dec 2006 13:27:09 -0600 Matt Mackall Replace demandload with new demandimport
Tue, 26 Sep 2006 00:05:24 +0100 Stephen Darnell Add -D/--nodates options to hg diff/export that removes dates from diff headers
Tue, 29 Aug 2006 17:08:42 -0700 Brendan Cully Remove dates from git export file lines - they confuse git-apply
Mon, 14 Aug 2006 22:48:03 -0700 Brendan Cully Add diff --git option
Sat, 12 Aug 2006 16:13:27 -0700 Vadim Gelfer refactor text diff/patch code.
Sat, 12 Aug 2006 12:30:02 -0700 Vadim Gelfer update copyrights.
Thu, 29 Jun 2006 15:16:25 +0200 Haakon Riiser diff: add -b/-B options
Tue, 20 Jun 2006 23:58:21 -0700 Vadim Gelfer use demandload more.
Wed, 10 May 2006 13:39:12 -0700 Vadim Gelfer fix speed regression in mdiff caused by line split bugfix. 0.9
Wed, 10 May 2006 10:31:54 -0700 Vadim Gelfer fix diffs containing embedded "\r".
Tue, 04 Apr 2006 16:38:44 -0400 mason Fill in the uncompressed size during revlog.addgroup
Wed, 15 Feb 2006 14:22:16 +0100 Thomas Arendsen Hein Fix diff against an empty file (issue124) and add a test for this.
Tue, 24 Jan 2006 15:02:10 +1300 mason Add new bdiff based unidiff generation.
Mon, 14 Nov 2005 02:30:19 +0200 twaldmann minor optimization: save some string trash
Tue, 25 Oct 2005 22:17:31 -0700 Matt Mackall Remove now unused sortdiff and diff from mdiff
Tue, 04 Oct 2005 11:25:48 -0700 Matt Mackall Clean up mdiff imports
Tue, 04 Oct 2005 11:21:48 -0700 Benoit Boissinot make diff dates be epoch for add/remove
Tue, 23 Aug 2005 19:58:46 -0700 mpm Add automatic binary file detection to diff and export
Sat, 02 Jul 2005 18:57:59 -0800 mpm Remove all remaining print statements
Wed, 29 Jun 2005 10:42:35 -0800 mpm Whitespace cleanups
Wed, 22 Jun 2005 11:23:01 -0800 mpm Start using bdiff for generating deltas
Fri, 17 Jun 2005 20:37:23 +0100 Thomas Arendsen Hein Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Wed, 15 Jun 2005 15:49:20 -0800 mpm Fix another sortdiff cornercase
Mon, 13 Jun 2005 18:36:40 -0800 mpm Merge with TAH
Mon, 13 Jun 2005 14:53:33 -0800 mpm mdiff: fix the fix
Mon, 13 Jun 2005 13:43:48 -0800 mpm mdiff: reinstate new algorithm
Sun, 12 Jun 2005 10:20:07 -0800 mpm mdiff: revert grouping optimization for the time being
Sun, 12 Jun 2005 10:18:32 -0800 mpm hg commit: user and date options
Wed, 08 Jun 2005 10:47:10 -0800 mpm unidiff: handle empty diffs more gracefully
Tue, 07 Jun 2005 08:53:05 -0800 mpm diff: use tab to separate date from filename
Mon, 06 Jun 2005 10:51:09 -0800 mpm Attempt to make diff deal with null sources properly
Sat, 04 Jun 2005 14:16:32 -0800 mpm import and startup cleanups
Fri, 03 Jun 2005 18:29:46 -0800 mpm Resolve bits from TAH
Fri, 03 Jun 2005 13:44:34 -0800 mpm mdiff.py: kill #! line, add copyright notice
Fri, 27 May 2005 19:38:34 -0800 mpm Improved binary diff from Christopher Li
Thu, 26 May 2005 13:02:28 -0800 mpm hg diff: fix missing final newline bug
Fri, 20 May 2005 19:19:25 -0800 mpm Fix braindamaged import in mdiff.
Fri, 20 May 2005 17:49:25 -0800 mpm Remove python version of the patches code
Fri, 20 May 2005 17:42:29 -0800 mpm Add a function to return the new text from a binary diff
Tue, 17 May 2005 00:32:18 -0800 mpm Fix a bug in patches() if there's not text and no patch
Mon, 16 May 2005 22:08:33 -0800 mpm Add an O(m + nlog n) patching extension
Sat, 14 May 2005 10:27:14 -0800 mpm Add mdiff.patches to speed up applying thousands of patches to the manifest
Thu, 12 May 2005 17:54:55 -0800 mpm Diff in subdirectories from Jake Edge
Sat, 07 May 2005 16:10:50 -0800 mpm unidiff: punt on comparing empty files
Tue, 03 May 2005 13:16:10 -0800 mpm Add back links from file revisions to changeset revisions