Mercurial > hg
annotate tests/test-docker-packaging.t @ 33771:96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
morestatus extension in fbext use to show more context about the state of the
repo like the repository is in a unfinished merge state, or a rebase is going
on, or histedit is going on, listing the files which need to be resolved and
also suggesting ways to handle the situation.
This patch moves the extension directly to core by plugging it into the
--verbose flag of the status command. So now if you are in any unfinished state
and you do hg status -v, it will show you details and help related to the state.
The extension in fbext also shows context about unfinished update state
which is not ported to core as that plug in hooks to update command which need
to be tackled somewhat differently.
The following configuration will turn the behaviour on by default
[commands]
status.verbose = 1
You can also skip considering some states like bisect as follows:
[commands]
status.skipstates=bisect
This patch also adds test for the feature.
.. feature::
``hg status -v`` can now show unfinished state. For example, when in
an unfinished rebase state, ``hg status -v`` might show::
# The repository is in an unfinished *rebase* state.
# No unresolved merge conflicts.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
Differential Revision: https://phab.mercurial-scm.org/D219
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 03 Aug 2017 05:12:35 +0530 |
parents | ddd65b4f3ae6 |
children | e468ebfcb4ce |
rev | line source |
---|---|
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"/.. |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
13 $ make docker-debian-jessie > $OUTPUTDIR/build.log 2>&1 |
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 |