log mercurial/mdiff.py @ 42066:65ed223619ec

age author description
Wed, 01 Aug 2018 13:00:45 -0700 Gregory Szorc global: use pycompat.xrange()
Thu, 05 Apr 2018 17:29:32 +0530 Pulkit Goyal py3: add missing b'' prefix in mdiff.py
Thu, 05 Apr 2018 17:15:52 +0530 Pulkit Goyal py3: fix error string with bytestr() on repr()d value
Sat, 03 Mar 2018 12:39:14 -0800 Jun Wu mdiff: add a config option to use xdiff algorithm
Sat, 03 Mar 2018 11:26:30 -0500 Gregory Szorc cext: accept arguments as Py_buffer
Sat, 03 Mar 2018 07:24:25 -0500 Yuya Nishihara py3: do not pass a memoryview to bdiff.bdiff()
Thu, 15 Feb 2018 17:18:26 +0100 Boris Feld util: extract all date-related utils in utils/dateutil module
Fri, 23 Feb 2018 23:09:58 +0900 Yuya Nishihara diff: do not split function name if character encoding is unknown
Thu, 25 Jan 2018 21:16:28 -0500 Augie Fackler bdiff: write a native version of splitnewlines
Sun, 04 Feb 2018 10:33:14 +0900 Yuya Nishihara mdiff: use str.startswith/endswith() instead of slicing
Sun, 04 Feb 2018 10:28:03 +0900 Yuya Nishihara patch: unify check_binary and binary flags
Wed, 07 Feb 2018 13:11:38 +0530 Pulkit Goyal py3: use pycompat.bytechr instead of chr
Thu, 01 Feb 2018 18:14:52 -0500 Augie Fackler mdiff: use slice instead of index on bytestr when checking single bytes
Fri, 26 Jan 2018 17:31:50 +0100 Joerg Sonnenberger mdiff: remove rewindhunk by yielding a bool first to indicate data
Fri, 26 Jan 2018 02:14:39 +0100 Joerg Sonnenberger mdiff: explicitly compute places for the newline marker
Thu, 25 Jan 2018 22:40:19 +0100 Joerg Sonnenberger patch: avoid repeated binary checks if all files in a patch are text
Fri, 29 Dec 2017 05:28:05 +0530 Pulkit Goyal py3: make regular expressions bytes by prepending b''
Fri, 29 Dec 2017 05:27:00 +0530 Pulkit Goyal py3: slice on bytes instead of indexing
Thu, 26 Oct 2017 00:13:38 +0900 Matthieu Laneuville patch: add within-line color diff capacity
Mon, 02 Oct 2017 04:48:06 +0530 Pulkit Goyal py3: use '%d' for integers instead of '%s'
Tue, 29 Aug 2017 18:20:50 -0700 David Soria Parra mdiff: add a --ignore-space-at-eol option
Tue, 27 Jun 2017 00:23:32 +0530 Pulkit Goyal py3: use pycompat.strkwargs() to convert kwargs keys to str
Sat, 13 Aug 2016 12:18:58 +0900 Yuya Nishihara mpatch: switch to policy importer
Sat, 13 Aug 2016 12:12:50 +0900 Yuya Nishihara bdiff: switch to policy importer
Wed, 26 Apr 2017 22:03:37 +0900 Yuya Nishihara bdiff: proxy through mdiff module
Wed, 26 Apr 2017 21:56:47 +0900 Yuya Nishihara base85: proxy through util module
Tue, 02 May 2017 17:05:22 +0900 Yuya Nishihara mdiff: move re-exports to top
Sat, 01 Apr 2017 12:24:59 +0200 Denis Laxalde mdiff: add a hunkinrange helper function
Sun, 26 Mar 2017 20:52:51 +0530 Pulkit Goyal diff: slice over bytes to make sure conditions work normally
Sun, 26 Mar 2017 20:58:21 +0530 Pulkit Goyal diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str
Fri, 03 Mar 2017 17:46:40 +0100 Denis Laxalde mdiff: let unidiff return (diffheader, hunks)
Fri, 03 Mar 2017 17:46:28 +0100 Denis Laxalde mdiff: extract a checknonewline inner function in unidiff()
Fri, 03 Mar 2017 13:51:22 +0100 Denis Laxalde mdiff: distinguish diff headers from hunks in unidiff()
Thu, 02 Mar 2017 17:22:46 +0100 Denis Laxalde mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>)
Mon, 09 Jan 2017 09:34:39 +0100 Denis Laxalde mdiff: turn the comment above _unidiff into a docstring
Tue, 27 Sep 2016 20:27:35 +0200 Denis Laxalde mdiff: compute newlines-splitted texts within _unidiff
Mon, 09 Jan 2017 10:51:44 -0800 Sean Farley patch: add similarity config knob in experimental section
Mon, 09 Jan 2017 11:13:47 -0800 Sean Farley patch: add config knob for displaying the index header
Tue, 03 Jan 2017 18:15:58 +0100 Denis Laxalde mdiff: add a "blocksinrange" function to filter diff blocks by line range
Tue, 27 Sep 2016 14:46:34 +0200 Philippe Pepiot mdiff: remove unused parameter 'refine' from allblocks()
Sat, 25 Jun 2016 13:52:46 -0700 Gregory Szorc mdiff: remove use of __slots__
Mon, 11 Jan 2016 22:00:07 -0500 Mike Hommey mdiff: don't emit a diff header for empty trivial deltas
Mon, 21 Dec 2015 21:26:14 -0800 Gregory Szorc mdiff: use absolute_import
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Wed, 21 Jan 2015 16:35:09 -0500 Mike Edgar mdiff: add helper for making deltas which replace the full text of a revision
Wed, 12 Nov 2014 23:29:14 -0800 Siddharth Agarwal mdiff.unidiff: add support for noprefix
Wed, 12 Nov 2014 23:25:32 -0800 Siddharth Agarwal mdiff.diffopts: add a new noprefix option
Wed, 12 Nov 2014 23:19:44 -0800 Siddharth Agarwal mdiff.diffopts: add doc comment for nobinary
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