Mercurial > hg > mercurial-source
annotate tests/test-mac-packages.t @ 43094:264a2cbb25d0
graphmod: remove support for graph lines mixing parent/grandparent styles (BC)
Currently, if the configuration for a graph edge draw style has multiple bytes
(at least on python2), it is interpreted as "this is a request to draw the line
partially in the style of the parent, partially in the style of the
grandparent". This precludes the configuration handling unicode characters
(which trigger the `len > 1` check, at least on python2), and I believe was part
of the reason that beautifygraph was written the way it was.
Talking with the person who implemented this, it appears to have been to achieve
feature parity with the rendering of the smartlog extension. I suspect that this
isn't actually used outside of that situation, so I think that we can remove it
without much issue.
This will make it so that multi-character edges are possible, and render any
existing configuration that uses this feature with these multiple characters.
This is *not* going to adjust the width of everything to make it line up
correctly, please see the test that's being modified in this changeset for an
example of how the previous configuration now renders.
Note also that the previous configuration seems to have been broken, or at least
it was behaving in a really non-obvious way - it was avoiding the grandparent
character(s) when it should have been displaying them! This is why so many "!"
characters changed to "3."; I don't know if this was intentional.
Differential Revision: https://phab.mercurial-scm.org/D5112
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 16 Oct 2018 04:59:36 -0700 |
parents | 283a7da602ae |
children |
rev | line source |
---|---|
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
1 #require test-repo slow osx osxpackaging |
29969
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
29777
diff
changeset
|
2 |
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
29777
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
33987
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33899
diff
changeset
|
4 $ testrepohgenv |
29969
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
29777
diff
changeset
|
5 |
32389
6dc8caccef8a
osx: use more paranoid quoting in test
Augie Fackler <augie@google.com>
parents:
32388
diff
changeset
|
6 $ OUTPUTDIR="`pwd`" |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 $ export OUTPUTDIR |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 $ KEEPMPKG=yes |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 $ export KEEPMPKG |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
11 $ cd "$TESTDIR"/.. |
34377
283a7da602ae
osx: new script for generating OS X package versions
Augie Fackler <augie@google.com>
parents:
34376
diff
changeset
|
12 $ contrib/genosxversion.py --selftest ignoredarg |
32389
6dc8caccef8a
osx: use more paranoid quoting in test
Augie Fackler <augie@google.com>
parents:
32388
diff
changeset
|
13 $ make osx > "$OUTPUTDIR/build.log" 2>&1 |
6dc8caccef8a
osx: use more paranoid quoting in test
Augie Fackler <augie@google.com>
parents:
32388
diff
changeset
|
14 $ cd "$OUTPUTDIR" |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
15 $ ls -d *.pkg |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
16 Mercurial-*-macosx10.*.pkg (glob) |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
17 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
18 $ xar -xf Mercurial*.pkg |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
19 |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
20 Gather list of all installed files: |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
21 $ lsbom mercurial.pkg/Bom > boms.txt |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
22 |
33358
197eb93560b3
osx: override default exclude filter for pkgbuild
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
23 We've had problems with the filter logic in the past. Make sure no |
197eb93560b3
osx: override default exclude filter for pkgbuild
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
24 .DS_Store files ended up in the final package: |
197eb93560b3
osx: override default exclude filter for pkgbuild
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
25 $ grep DS_S boms.txt |
197eb93560b3
osx: override default exclude filter for pkgbuild
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
26 [1] |
197eb93560b3
osx: override default exclude filter for pkgbuild
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
27 |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
28 Spot-check some randomly selected files: |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
29 $ grep bdiff boms.txt | cut -d ' ' -f 1,2,3 |
33253
0e93dc8c0f9f
osx: update Mac packaging tests for bdiff.so install location change
Augie Fackler <augie@google.com>
parents:
32389
diff
changeset
|
30 ./Library/Python/2.7/site-packages/mercurial/cext/bdiff.so 100755 0/0 |
34376
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
31 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiff.py 100644 0/0 |
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
32 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiff.pyc 100644 0/0 |
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
33 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiff.pyo 100644 0/0 |
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
34 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiffbuild.py 100644 0/0 |
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
35 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiffbuild.pyc 100644 0/0 |
441a4550a80a
tests: update mac packaging test expectations
Augie Fackler <augie@google.com>
parents:
33987
diff
changeset
|
36 ./Library/Python/2.7/site-packages/mercurial/cffi/bdiffbuild.pyo 100644 0/0 |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
37 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.py 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
38 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.pyc 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
39 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.pyo 100644 0/0 |
33359
501d48bda912
zsh_completion: install as _hg not hg
Kyle Lippincott <spectral@google.com>
parents:
33358
diff
changeset
|
40 $ grep zsh/site-functions/_hg boms.txt | cut -d ' ' -f 1,2,3 |
501d48bda912
zsh_completion: install as _hg not hg
Kyle Lippincott <spectral@google.com>
parents:
33358
diff
changeset
|
41 ./usr/local/share/zsh/site-functions/_hg 100644 0/0 |
31921
408dcf7475a7
osx: install bash and zsh completions by default
Augie Fackler <augie@google.com>
parents:
30296
diff
changeset
|
42 $ grep hg-completion.bash boms.txt | cut -d ' ' -f 1,2,3 |
32388
8e516f71577a
osx: install completion scripts using install(1) to avoid umask badness
Augie Fackler <augie@google.com>
parents:
31921
diff
changeset
|
43 ./usr/local/hg/contrib/hg-completion.bash 100644 0/0 |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
44 $ egrep 'man[15]' boms.txt | cut -d ' ' -f 1,2,3 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
45 ./usr/local/share/man/man1 40755 0/0 |
33255
a38ed42cd23c
osx: include chg by default
Augie Fackler <augie@google.com>
parents:
33254
diff
changeset
|
46 ./usr/local/share/man/man1/chg.1 100644 0/0 |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
47 ./usr/local/share/man/man1/hg.1 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
48 ./usr/local/share/man/man5 40755 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
49 ./usr/local/share/man/man5/hgignore.5 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
50 ./usr/local/share/man/man5/hgrc.5 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
51 $ grep bser boms.txt | cut -d ' ' -f 1,2,3 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
52 ./Library/Python/2.7/site-packages/hgext/fsmonitor/pywatchman/bser.so 100755 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
53 ./Library/Python/2.7/site-packages/hgext/fsmonitor/pywatchman/pybser.py 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
54 ./Library/Python/2.7/site-packages/hgext/fsmonitor/pywatchman/pybser.pyc 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
55 ./Library/Python/2.7/site-packages/hgext/fsmonitor/pywatchman/pybser.pyo 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
56 $ grep localrepo boms.txt | cut -d ' ' -f 1,2,3 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
57 ./Library/Python/2.7/site-packages/mercurial/localrepo.py 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
58 ./Library/Python/2.7/site-packages/mercurial/localrepo.pyc 100644 0/0 |
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
59 ./Library/Python/2.7/site-packages/mercurial/localrepo.pyo 100644 0/0 |
33255
a38ed42cd23c
osx: include chg by default
Augie Fackler <augie@google.com>
parents:
33254
diff
changeset
|
60 $ egrep 'bin/' boms.txt | cut -d ' ' -f 1,2,3 |
a38ed42cd23c
osx: include chg by default
Augie Fackler <augie@google.com>
parents:
33254
diff
changeset
|
61 ./usr/local/bin/chg 100755 0/0 |
29777
db5084d27df5
osx: create a modern package including manpages
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29775
diff
changeset
|
62 ./usr/local/bin/hg 100755 0/0 |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
63 |
30296
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
64 Make sure the built binary uses the system Python interpreter |
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
65 $ bsdtar xf mercurial.pkg/Payload usr/local/bin |
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
66 Use a glob to find this to avoid check-code whining about a fixed path. |
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
67 $ head -n 1 usr/local/b?n/hg |
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
68 #!/System/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python |
da1848f07c6a
osx: explicitly build hg with /usr/bin/python2.7
Augie Fackler <augie@google.com>
parents:
29969
diff
changeset
|
69 |
29775
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
70 Note that we're not currently installing any /etc/mercurial stuff, |
f2549b0ba9ab
tests: add test for Mac OS X package construction
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
71 including merge-tool configurations. |