Mercurial Mercurial > hg-stable / 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 Matt Harbison <matt_harbison@yahoo.com>
Fri, 31 Jan 2020 22:20:39 -0500
branchstable
changeset 44148 aab70b540d3d
parent 41793 251332dbf33d
permissions -rw-r--r--
resourceutil: account for the non-resource-like file hierarchy under py2exe After 9e367157a990, config files for py2exe were expected to be in C:\Program Files\Mercurial\mercurial\defaultrc because of the implied resource structure of 'mercurial.defaultrc.*.rc', relative to the executable. Accomodating this would require changes to the WIX and Inno scripts (and perhaps the script that generates the WIX script), as well as 3rd party bundlers like TortoiseHg. But these files aren't read as resources anyway- they fall back to the filesystem APIs. (If we really wanted to carry on the charade, the installer would have to also sprinkle various empty __init__.py files around.) Instead, this simply prunes the 'mercurial.' portion of the resource name when run with py2exe. (PyOxidizer uses the resources API, not the filesystem fallback, so it is unaffected.) Since this hack only affects the py2 Windows installers and is less risky, I think it's reasonable. We haven't needed to load any 3rd party resource up to this point, and would have to make packaging changes anyway to handle that. Differential Revision: https://phab.mercurial-scm.org/D8058
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








41793






251332dbf33d
diff: make sure we output stat even when --git is not passed (issue4037) (BC)



Pulkit Goyal <pulkit@yandex-team.ru>


parents: 
16913

diff
changeset




    16


  diff -r a99fb63adac3 -r 9b8568d3af2f foo








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    17


  --- 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




    18


  +++ 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




    19


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    20


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    21


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    22









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    23


  $ hg diff -r 0 -r 1








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    24


  diff -r a99fb63adac3 -r 9b8568d3af2f foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    25


  --- 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




    26


  +++ 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




    27


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    28


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    29


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    30









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    31


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








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    32


  diff -r a99fb63adac3 -r 9b8568d3af2f foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    33


  --- 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




    34


  +++ 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




    35


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    36


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    37


  +foobar








3387






2065789f6a3e
use short hashes with diff -v



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


parents: 

diff
changeset




    38









12137






e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    39


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








12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    40


  diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo













4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
12137

diff
changeset




    41


  --- 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




    42


  +++ 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




    43


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













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    44


  -bar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    45


  +foobar













e1814ff260c2
tests: unify test-diff-hashes



Adrian Buehlmann <adrian@cadifra.com>


parents: 
5689

diff
changeset




    46









16913






f2719b387380
tests: add missing trailing 'cd ..'



Mads Kiilerich <mads@kiilerich.com>


parents: 
15521

diff
changeset




    47


  $ cd ..















hg-stable