Mercurial > hg

annotate tests/test-debian-packages.t @ 45468:09edbff6ae8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 24 Aug 2020 15:20:09 +0530
parents 7b638d25b8e4
children 7e5be4a7cda7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
34401
13d3f8aaed87 tests: add "have" check for dpkg builddeps
Kyle Lippincott <spectral@google.com>
parents: 34400
diff changeset
1 #require test-repo slow debhelper debdeps
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
2
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 26148
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: 26148
diff changeset
5
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
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: 26147
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: 26147
diff changeset
8 $ export DEB_BUILD_OPTIONS
26147
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
9 $ OUTPUTDIR=`pwd`
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
10 $ export OUTPUTDIR
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
11
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
12 $ cd "$TESTDIR"/..
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
13 $ make deb > $OUTPUTDIR/build.log 2>&1
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
14 $ cd $OUTPUTDIR
34400
3d936da4f97b tests: expect parsers.so in cext, parsers.py in pure (test-debian-packages)
Kyle Lippincott <spectral@google.com>
parents: 33204
diff changeset
15 $ ls *.deb | grep -v 'dbg'
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
16 mercurial_*.deb (glob)
43320
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43310
diff changeset
17 should have .so and .py
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
18 $ dpkg --contents mercurial_*.deb | egrep '(localrepo|parsers)'
43310
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 34406
diff changeset
19 * ./usr/lib/python3/dist-packages/mercurial/cext/parsers*.so (glob)
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 34406
diff changeset
20 * ./usr/lib/python3/dist-packages/mercurial/localrepo.py (glob)
43320
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43310
diff changeset
21 * ./usr/lib/python3/dist-packages/mercurial/pure/parsers.py (glob)
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43310
diff changeset
22 should have zsh completions
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43310
diff changeset
23 $ dpkg --contents mercurial_*.deb | egrep 'zsh.*[^/]$'
34405
9ecc622ca23f deb: install zsh completions to /usr/share/zsh/vendor-completions
Kyle Lippincott <spectral@google.com>
parents: 34401
diff changeset
24 * ./usr/share/zsh/vendor-completions/_hg (glob)
43320
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43310
diff changeset
25 should have chg
34406
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
26 $ dpkg --contents mercurial_*.deb | egrep 'chg$'
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
27 * ./usr/bin/chg (glob)
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
28 chg should come with a man page
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
29 $ dpkg --contents mercurial_*.deb | egrep 'man.*chg'
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
30 * ./usr/share/man/man1/chg.1.gz (glob)