Mercurial Mercurial > hg / 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.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 05 May 2017 17:09:47 +0200
changeset 32221 9dc36df78403
parent 16913 f2719b387380
child 41784 251332dbf33d
permissions -rw-r--r--
bundle: introduce an higher level function to write bundle on disk The current function ('writebundle') is focussing on getting an existing changegroup to disk. It is no easy ways to includes more part in the generated bundle2. So we introduce a slightly higher level function that is fed the 'outgoing' object (that defines the bundled spec) and the bundlespec parameters (to control the changegroup generation and inclusion of other parts). This is creating the third logic dedicated to create a consistent bundle2 (the other 2 are the push code and the getbundle code). We should probably reconcile them at some points but they all takes different types of input. So we need to introduce an intermediate "object" that each different input could be converted to. Such unified "bundle2 specification" could be fed to some unified code. We start by having the `hg bundle` related code on its own to helps defines its specific needs first. Once the common and specific parts of each logic will be known we can start unification.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset 
     1
 
  $ hg init a
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset 
     2
 
  $ cd a
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset 
     3
 












e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




     4


  $ hg diff inexistent1 inexistent2








15521






117f9190c1ba
tests: hide 'No such file or directory' messages



Mads Kiilerich <mads@kiilerich.com>


parents: 
12156

diff
changeset




     5


  inexistent1: * (glob)













117f9190c1ba
tests: hide 'No such file or directory' messages



Mads Kiilerich <mads@kiilerich.com>


parents: 
12156

diff
changeset




     6


  inexistent2: * (glob)








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




     7









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




     8


  $ echo bar > foo













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




     9


  $ hg add foo








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    10


  $ hg ci -m 'add foo'








12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    11














e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    12


  $ echo foobar > foo








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    13


  $ hg ci -m 'change foo'








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    14









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    15


  $ hg --quiet diff -r 0 -r 1








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    16


  --- a/foo	Thu Jan 01 00:00:00 1970 +0000













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    17


  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000








12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    18


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    19


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    20


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    21









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    22


  $ hg diff -r 0 -r 1








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    23


  diff -r a99fb63adac3 -r 9b8568d3af2f foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    24


  --- a/foo	Thu Jan 01 00:00:00 1970 +0000













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    25


  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000








12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    26


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    27


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    28


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    29









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    30


  $ hg --verbose diff -r 0 -r 1








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    31


  diff -r a99fb63adac3 -r 9b8568d3af2f foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    32


  --- a/foo	Thu Jan 01 00:00:00 1970 +0000













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    33


  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000








12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    34


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    35


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    36


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    37









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    38


  $ hg --debug diff -r 0 -r 1








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    39


  diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    40


  --- a/foo	Thu Jan 01 00:00:00 1970 +0000













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    41


  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000








12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    42


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    43


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    44


  +foobar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    45









16913






f2719b387380
tests: add missing trailing 'cd ..'



Mads Kiilerich <mads@kiilerich.com>


parents: 
15521

diff
changeset




    46


  $ cd ..















Mercurial