Mercurial > hg
annotate tests/test-docker-packaging.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | 7f49efcaa9b4 |
children | fc0f9714d077 |
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 |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
3 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
|
4 $ 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
|
5 $ export DEB_BUILD_OPTIONS |
26146
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
6 $ OUTPUTDIR=`pwd` |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 $ export OUTPUTDIR |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 $ cd "$TESTDIR"/.. |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 $ 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
|
11 $ cd $OUTPUTDIR |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
12 $ ls *.deb |
26148
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
13 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
|
14 mercurial_*.deb (glob) |
26146
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
15 |
8c91726caeae
test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
16 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
|
17 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
|
18 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
|
19 |
7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents:
26146
diff
changeset
|
20 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
|
21 $ 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
|
22 $ 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
|
23 ./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
|
24 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
|
25 $ 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
|
26 $ 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
|
27 ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py |