Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-hashes.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 3386 2065789f6a3e
permissions -rw-r--r--
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3386
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
quiet:
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
@@ -1,1 +1,1 @@ bar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
-bar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
+foobar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 












2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     8


normal:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


diff -r 74de3f1392e2 -r b8b5f023a6ad foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


--- a/foo	Mon Jan 12 13:46:40 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    11


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15














2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


verbose:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


diff -r 74de3f1392e2 -r b8b5f023a6ad foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


--- a/foo	Mon Jan 12 13:46:40 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    20


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23














2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24


debug:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


--- a/foo	Mon Jan 12 13:46:40 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    27


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    28


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    29


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    30


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    31
















mercurial-crew-with-dirclash