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-extdiff.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 5110 2be225ea5722
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:
2891
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
5110
2be225ea5722 extdiff: do single file diffs from the wc with no copy
Brad Schick <schickb@gmail.com>
parents: 5109
diff changeset 
     2
 
adding b
3751
797c6e70092b Don't require a diff which accepts the -N option.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3328
diff changeset 
     3
 
Only in a: a
5110
2be225ea5722 extdiff: do single file diffs from the wc with no copy
Brad Schick <schickb@gmail.com>
parents: 5109
diff changeset 
     4
 
Only in a: b
2891
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
diffing a.000000000000 a
4730
eadfaa9ec487 Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4315
diff changeset 
     6
 
hg falabala [OPTION]... [FILE]...
2891
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 












453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     8


use 'echo' to diff repository (or selected files)













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     9














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    10


            Show differences between revisions for the specified













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    11


            files, using the 'echo' program.













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    12














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    13


            When two revision arguments are given, then changes are













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    14


            shown between those revisions. If only one revision is













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    15


            specified then that revision is compared to the working













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    16


            directory, and, when no revisions are specified, the













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    17


            working directory files are compared to its parent.













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    18














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    19


options:













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    20














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    21


 -o --option   pass option to comparison program













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    22


 -r --rev      revision













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    23


 -I --include  include names matching the given patterns













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    24


 -X --exclude  exclude names matching the given patterns








4315






bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



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


parents: 
3751

diff
changeset




    25














bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



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


parents: 
3751

diff
changeset




    26


use "hg -v help falabala" to show global options








5110






2be225ea5722
extdiff: do single file diffs from the wc with no copy



Brad Schick <schickb@gmail.com>


parents: 
5109

diff
changeset




    27


diffing a.8a5febb7f867/a a.34eed99112ab/a








3328






49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2897

diff
changeset




    28


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2897

diff
changeset




    29


1 files updated, 0 files merged, 1 files removed, 0 files unresolved













49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2897

diff
changeset




    30


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2897

diff
changeset




    31


(branch merge, don't forget to commit)








2897






8fd6925ae32f
Fixed test-extdiff.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2891

diff
changeset




    32


diff-like tools yield a non-zero exit code








5110






2be225ea5722
extdiff: do single file diffs from the wc with no copy



Brad Schick <schickb@gmail.com>


parents: 
5109

diff
changeset




    33


diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c















mercurial-crew-with-dirclash