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-docker-packaging.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 24 Aug 2020 15:20:09 +0530
changeset 45468 09edbff6ae8d
parent 43508 e468ebfcb4ce
child 50725 7e5be4a7cda7
permissions -rw-r--r--
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally If a file is not present on the local side, and it's unchanged between other merge parent and ancestor, we don't use any action, neither we had a if-else branch for that condition. This leads to bid-merge missing that there is a such action possible which can be performed. As test changes demonstrate, we now choose the locally deleted side instead of choosing the remote one consistently. This is also wrong behavior which is resulted because of missing possible action. It will be fixed in next patch. This whole logic is not acurrate as we should prompt user on what to do when this kind of criss-cross merge is in play. Differential Revision: https://phab.mercurial-scm.org/D8940
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
#require test-repo slow docker
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 







29219






3c9066ed557c
tests: silence test-repo obsolete warning



timeless <timeless@mozdev.org>


parents: 
28973

diff
changeset




     3


  $ . "$TESTDIR/helpers-testrepo.sh"








33204






ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally



Yuya Nishihara <yuya@tcha.org>


parents: 
33116

diff
changeset




     4


  $ testrepohgenv








29219






3c9066ed557c
tests: silence test-repo obsolete warning



timeless <timeless@mozdev.org>


parents: 
28973

diff
changeset




     5









26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     6


Ensure debuild doesn't run the testsuite, as that could get silly.













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     7


  $ DEB_BUILD_OPTIONS=nocheck













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     8


  $ export DEB_BUILD_OPTIONS








26146






8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


  $ OUTPUTDIR=`pwd`













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


  $ export OUTPUTDIR













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11














8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12


  $ cd "$TESTDIR"/..








43508






e468ebfcb4ce
packaging: remove references to debian jessie



Augie Fackler <augie@google.com>


parents: 
33204

diff
changeset




    13


  $ make docker-debian-buster > $OUTPUTDIR/build.log 2>&1








26146






8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


  $ cd $OUTPUTDIR













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15


  $ ls *.deb








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    16


  mercurial-common_*.deb (glob)













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    17


  mercurial_*.deb (glob)








26146






8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18














8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


We check debian package contents with portable tools so that when













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20


we're on non-debian machines we can still test the packages that are













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21


built using docker.








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    22














7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    23


main deb should have .so but no .py













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    24


  $ ar x mercurial_*.deb













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    25


  $ tar tf data.tar* | egrep '(localrepo|parsers)'













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    26


  ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    27


mercurial-common should have .py but no .so or .pyc













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    28


  $ ar x mercurial-common_*.deb













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    29


  $ tar tf data.tar* | egrep '(localrepo|parsers)'








28973






fc0f9714d077
test-docker-packaging: add new line to test output



Sean Farley <sean@farley.io>


parents: 
26148

diff
changeset




    30


  ./usr/lib/python2.7/dist-packages/mercurial/pure/parsers.py








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    31


  ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py















Mercurial