Mercurial > hg
annotate tests/test-debian-packages.t @ 29774:a7f8939641aa
merge: use labels in prompts to the user
Now that we persist the labels, we can consistently use the labels in
prompts for the user without risk of confusion. This changes a huge amount
of command output:
This means that merge prompts like:
no tool found to merge a
keep (l)ocal, take (o)ther, or leave (u)nresolved? u
and
remote changed a which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
become:
no tool found to merge a
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u
and
remote [source] changed a which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
where "working copy" and "destination" were supplied by the command that
requested the merge as labels for conflict markers, and thus should be
human-friendly.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 12 Aug 2016 06:01:42 -0700 |
parents | 3c9066ed557c |
children | 6c113a7dec52 |
rev | line source |
---|---|
26147
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 #require test-repo slow debhelper |
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" |
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
26148
diff
changeset
|
4 |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26147
diff
changeset
|
5 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
|
6 $ 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
|
7 $ 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
|
8 $ OUTPUTDIR=`pwd` |
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 $ export OUTPUTDIR |
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 |
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
11 $ cd "$TESTDIR"/.. |
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
12 $ 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
|
13 $ cd $OUTPUTDIR |
a02c22e48142
test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
14 $ ls *.deb |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26147
diff
changeset
|
15 mercurial-common_*.deb (glob) |
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) |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26147
diff
changeset
|
17 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:
26147
diff
changeset
|
18 $ dpkg --contents mercurial_*.deb | egrep '(localrepo|parsers)' |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26147
diff
changeset
|
19 * ./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:
26147
diff
changeset
|
20 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:
26147
diff
changeset
|
21 $ dpkg --contents mercurial-common_*.deb | egrep '(localrepo|parsers)' |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26147
diff
changeset
|
22 * ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py (glob) |