Commit Graph

15 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
03368f5190 Revert 854bf5451519, fixing the output of 2 tests 2008-03-15 22:03:18 -03:00
Matt Mackall
9f54c46920 update tests for copy detection changes 2008-03-15 16:51:53 -05:00
Matt Mackall
11423d02c7 diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Dustin Sallings
bebcdac954 Use both the from and to name in mdiff.unidiff.
This fixes a compatibility issue with git diffs.
* * *
2007-11-01 12:17:59 -07:00
Alexis S. L. Carvalho
a718b1f9b5 Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB 2007-08-28 22:48:25 -03:00
Alexis S. L. Carvalho
e85eaa593d git patches: correct handling of filenames with spaces
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name.  This allows patch(1) to work correctly.  The
same is done for diff --nodates.

This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
2007-06-22 19:06:04 -03:00
Alexis S. L. Carvalho
14c4429263 git patches: handle renames of binary files 2007-02-16 04:54:46 -02:00
Alexis S. L. Carvalho
6d99bd2633 Don't generate git patches that rename a file to multiple destinations
With this patch, instead of generating N renames, we'll generate
1 rename and N-1 copies.

Ideally the rename should come after the copies instead of before
them, but that'd be harder to do.
2006-11-20 19:32:46 -02:00
Alexis S. L. Carvalho
f2de15a6f8 diff: better detection of renames when comparing with the working dir. 2006-11-20 19:32:38 -02:00
Alexis S. L. Carvalho
bc9e70b94a fix typo in mercurial/patch.py 2006-11-20 19:32:37 -02:00
Alexis S. L. Carvalho
fdbef41b13 renamedbetween: only return (file, node) pairs that exist in the original rev 2006-11-20 19:32:36 -02:00
Alexis S. L. Carvalho
588b7cf1f1 diff: improve detection of renames when diffing across many revisions 2006-11-20 19:32:35 -02:00
Brendan Cully
6d19589c0b Add test for git binary diff support 2006-10-12 09:17:16 -07:00
Benoit Boissinot
670858c395 git --diff: fix traceback when getting mode change
- use the manifest instead of the mode in the working dir
  if the diff is against two revisions
- add a testcase
2006-09-07 14:12:39 +02:00
Brendan Cully
c18265f47c Add diff --git option 2006-08-14 22:48:03 -07:00