Mercurial > hg
changeset 32578:8825de36e74a stable
merge with i18n
| author | Kevin Bullock <kbullock+mercurial@ringworld.org> |
|---|---|
| date | Thu, 01 Jun 2017 12:24:16 -0500 |
| parents | 501d48bda912 (diff) 4d169167fb06 (current diff) |
| children | 7cecf18d3308 |
| files | |
| diffstat | 7 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed May 31 20:42:58 2017 -0300 +++ b/Makefile Thu Jun 01 12:24:16 2017 -0500 @@ -164,10 +164,13 @@ --root=build/mercurial/ --prefix=/usr/local/ \ --install-lib=/Library/Python/2.7/site-packages/ make -C doc all install DESTDIR="$(PWD)/build/mercurial/" + # Place a bogon .DS_Store file in the target dir so we can be + # sure it doesn't get included in the final package. + touch build/mercurial/.DS_Store # install zsh completions - this location appears to be # searched by default as of macOS Sierra. install -d build/mercurial/usr/local/share/zsh/site-functions/ - install -m 0644 contrib/zsh_completion build/mercurial/usr/local/share/zsh/site-functions/hg + install -m 0644 contrib/zsh_completion build/mercurial/usr/local/share/zsh/site-functions/_hg # install bash completions - there doesn't appear to be a # place that's searched by default for bash, so we'll follow # the lead of Apple's git install and just put it in a @@ -177,7 +180,7 @@ mkdir -p $${OUTPUTDIR:-dist} HGVER=$$((cat build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py; echo 'print(version)') | python) && \ OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ - pkgbuild --root build/mercurial/ \ + pkgbuild --filter \\.DS_Store --root build/mercurial/ \ --identifier org.mercurial-scm.mercurial \ --version "$${HGVER}" \ build/mercurial.pkg && \
--- a/hgext/bugzilla.py Wed May 31 20:42:58 2017 -0300 +++ b/hgext/bugzilla.py Thu Jun 01 12:24:16 2017 -0500 @@ -54,7 +54,7 @@ Access via the REST-API needs either a Bugzilla username and password or an apikey specified in the configuration. Comments are made under -the given username or the user assoicated with the apikey in Bugzilla. +the given username or the user associated with the apikey in Bugzilla. Configuration items common to all access modes:
--- a/hgext/win32mbcs.py Wed May 31 20:42:58 2017 -0300 +++ b/hgext/win32mbcs.py Thu Jun 01 12:24:16 2017 -0500 @@ -156,7 +156,7 @@ # because they expects argument is local encoded string and cause # problem with unicode string. rfuncs = '''mercurial.encoding.upper mercurial.encoding.lower - mercurial.pycompat.bytestr''' + mercurial.util._filenamebytestr''' # List of Windows specific functions to be wrapped. winfuncs = '''os.path.splitunc'''
--- a/mercurial/help/bundlespec.txt Wed May 31 20:42:58 2017 -0300 +++ b/mercurial/help/bundlespec.txt Thu Jun 01 12:24:16 2017 -0500 @@ -74,7 +74,7 @@ Produce a ``v2`` bundle using default options, including compression. ``none-v1`` - Produce a ``v2`` bundle with no compression. + Produce a ``v1`` bundle with no compression. ``zstd-v2`` Produce a ``v2`` bundle with zstandard compression using default
--- a/mercurial/help/color.txt Wed May 31 20:42:58 2017 -0300 +++ b/mercurial/help/color.txt Thu Jun 01 12:24:16 2017 -0500 @@ -27,9 +27,9 @@ Mode ==== -Mercurial can use various system to display color. The supported modes are +Mercurial can use various systems to display color. The supported modes are ``ansi``, ``win32``, and ``terminfo``. See :hg:`help config.color` for details -about how to control the mode +about how to control the mode. Effects =======
--- a/mercurial/util.py Wed May 31 20:42:58 2017 -0300 +++ b/mercurial/util.py Thu Jun 01 12:24:16 2017 -0500 @@ -65,6 +65,9 @@ urlreq = pycompat.urlreq xmlrpclib = pycompat.xmlrpclib +# workaround for win32mbcs +_filenamebytestr = pycompat.bytestr + def isatty(fp): try: return fp.isatty() @@ -1224,7 +1227,7 @@ for n in path.replace('\\', '/').split('/'): if not n: continue - for c in pycompat.bytestr(n): + for c in _filenamebytestr(n): if c in _winreservedchars: return _("filename contains '%s', which is reserved " "on Windows") % c
--- a/tests/test-mac-packages.t Wed May 31 20:42:58 2017 -0300 +++ b/tests/test-mac-packages.t Thu Jun 01 12:24:16 2017 -0500 @@ -18,14 +18,19 @@ Gather list of all installed files: $ lsbom mercurial.pkg/Bom > boms.txt +We've had problems with the filter logic in the past. Make sure no +.DS_Store files ended up in the final package: + $ grep DS_S boms.txt + [1] + Spot-check some randomly selected files: $ grep bdiff boms.txt | cut -d ' ' -f 1,2,3 ./Library/Python/2.7/site-packages/mercurial/bdiff.so 100755 0/0 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.py 100644 0/0 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.pyc 100644 0/0 ./Library/Python/2.7/site-packages/mercurial/pure/bdiff.pyo 100644 0/0 - $ grep zsh/site-functions/hg boms.txt | cut -d ' ' -f 1,2,3 - ./usr/local/share/zsh/site-functions/hg 100644 0/0 + $ grep zsh/site-functions/_hg boms.txt | cut -d ' ' -f 1,2,3 + ./usr/local/share/zsh/site-functions/_hg 100644 0/0 $ grep hg-completion.bash boms.txt | cut -d ' ' -f 1,2,3 ./usr/local/hg/contrib/hg-completion.bash 100644 0/0 $ egrep 'man[15]' boms.txt | cut -d ' ' -f 1,2,3