# HG changeset patch # User Danek Duvall # Date 1492796624 25200 # Node ID 20e6442c6ceebe6250d2961b83771d1f7fdb44e2 # Parent 40335bd603f65f0d942e46ab252076c5f8b89115 25896920 mercurial 4.1.3 22749480 mercurial should deliver 64-bit modules 23210760 problem in UTILITY/HG 24415944 bundle2 prechangegroup & incoming hooks set HG_URL=push when pushing 25896962 problem in UTILITY/HG diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/Makefile --- a/components/mercurial/Makefile Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/Makefile Fri Apr 21 10:43:44 2017 -0700 @@ -28,16 +28,16 @@ PATH=/usr/bin:/usr/gnu/bin:/usr/sbin COMPONENT_NAME= mercurial -COMPONENT_VERSION= 3.7.3 -COMPONENT_PROJECT_URL= http://mercurial.selenic.com/ +COMPONENT_VERSION= 4.1.3 +COMPONENT_PROJECT_URL= http://mercurial-scm.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30 -COMPONENT_ARCHIVE_URL= http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE) + sha256:103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8 +COMPONENT_ARCHIVE_URL= https://www.mercurial-scm.org/release/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/hg -TPNO= 27571 +TPNO= 34883 # Mercurial does not yet support Python 3. PYTHON_VERSIONS = $(PYTHON2_VERSIONS) @@ -60,6 +60,7 @@ TEST_BLACKLIST = \ test-check-code.t \ test-check-config.t \ + test-devel-warnings.t \ test-hghave.t \ test-module-imports.t \ test-run-tests.t @@ -90,7 +91,7 @@ # Only build this target if it doesn't already exist, since this recipe is just # for the component maintainer's benefit. patches/manpages.patch: $(SOURCE_DIR)/.unpacked \ - $(SOURCE_DIR)/.patched-rst.patch $(SOURCE_DIR)/.patched-hgmanpage.patch + $(SOURCE_DIR)/.rst.patched $(SOURCE_DIR)/.hgmanpage.patched if [[ -f $@ ]]; then exit 0; fi; \ if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \ cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \ @@ -107,12 +108,12 @@ done > $@; \ fi || true -# common targets -build: $(BUILD_32) +# Build and install 64-bit first, so that the 32-bit hg is what's installed. +build: $(BUILD_64) $(BUILD_32) -install: $(INSTALL_32) +install: $(INSTALL_64) $(INSTALL_32) -test: install $(TEST_32) +test: install $(TEST_64) $(TEST_32) REQUIRED_PACKAGES += runtime/python-27 diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial-GENFRAG.p5m --- a/components/mercurial/mercurial-GENFRAG.p5m Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/mercurial-GENFRAG.p5m Fri Apr 21 10:43:44 2017 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability committed> @@ -34,11 +34,19 @@ # And we don't create .pyc files for demo files. default pkg.tmp.autopyc false> # -dir path=usr -dir path=usr/demo -dir path=usr/demo/mercurial file path=usr/demo/mercurial/bash_completion +file path=usr/demo/mercurial/bdiff-torture.py file path=usr/demo/mercurial/casesmash.py +file path=usr/demo/mercurial/chg/Makefile +file path=usr/demo/mercurial/chg/README +file path=usr/demo/mercurial/chg/chg.1 +file path=usr/demo/mercurial/chg/chg.c +file path=usr/demo/mercurial/chg/hgclient.c +file path=usr/demo/mercurial/chg/hgclient.h +file path=usr/demo/mercurial/chg/procutil.c +file path=usr/demo/mercurial/chg/procutil.h +file path=usr/demo/mercurial/chg/util.c +file path=usr/demo/mercurial/chg/util.h file path=usr/demo/mercurial/debugcmdserver.py mode=555 file path=usr/demo/mercurial/debugshell.py file path=usr/demo/mercurial/dirstatenonnormalcheck.py @@ -47,7 +55,6 @@ file path=usr/demo/mercurial/hg-ssh mode=555 file path=usr/demo/mercurial/hgclient.py file path=usr/demo/mercurial/hgk mode=555 -dir path=usr/demo/mercurial/hgsh file path=usr/demo/mercurial/hgsh/Makefile file path=usr/demo/mercurial/hgsh/hgsh.c file path=usr/demo/mercurial/hgweb.fcgi mode=555 @@ -65,7 +72,6 @@ file path=usr/demo/mercurial/tcsh_completion file path=usr/demo/mercurial/tcsh_completion_build.sh mode=555 file path=usr/demo/mercurial/undumprevlog mode=555 -dir path=usr/demo/mercurial/vim file path=usr/demo/mercurial/vim/HGAnnotate.vim file path=usr/demo/mercurial/vim/hg-menu.vim file path=usr/demo/mercurial/vim/hgcommand.vim @@ -73,13 +79,9 @@ file path=usr/demo/mercurial/vim/patchreview.txt file path=usr/demo/mercurial/vim/patchreview.vim file path=usr/demo/mercurial/xml.rnc -file path=usr/demo/mercurial/zsh_completion -dir path=usr/share -dir path=usr/share/man -dir path=usr/share/man/man1 -# file hg.1 path=usr/share/man/man1/hg.1 -dir path=usr/share/man/man5 file hgignore.5 path=usr/share/man/man5/hgignore.5 file hgrc.5 path=usr/share/man/man5/hgrc.5 +file contrib/zsh_completion path=usr/share/zsh/vendor-functions/Completion/_hg +# license mercurial.copyright license=GPLv2+ diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial-PYVER.p5m --- a/components/mercurial/mercurial-PYVER.p5m Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/mercurial-PYVER.p5m Fri Apr 21 10:43:44 2017 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -46,10 +46,10 @@ dir path=usr/lib/python$(PYVER)/vendor-packages/hgext file path=usr/lib/python$(PYVER)/vendor-packages/hgext/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/acl.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/automv.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/bugzilla.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/censor.py -file path=usr/lib/python$(PYVER)/vendor-packages/hgext/chgserver.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/clonebundles.py @@ -74,14 +74,25 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/extdiff.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/factotum.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fetch.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/64/bser.so +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/bser.so +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/capabilities.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/compat.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/encoding.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/load.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/pybser.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/state.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/watchmanclient.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/gpg.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/graphlog.py -file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgcia.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgk.py dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/highlight.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/histedit.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/journal.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/keyword.py dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/__init__.py @@ -93,8 +104,10 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/proto.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/remotestore.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/reposetup.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/storefactory.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/uisetup.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/wirestore.py +file path=usr/lib/python$(PYVER)/vendor-packages/hgext/logtoprocess.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/mq.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/notify.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/pager.py @@ -113,9 +126,19 @@ dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/Zeroconf.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/__init__.py +dir path=usr/lib/python$(PYVER)/vendor-packages/hgext3rd/ +file path=usr/lib/python$(PYVER)/vendor-packages/hgext3rd/__init__.py dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial file path=usr/lib/python$(PYVER)/vendor-packages/mercurial-$(COMPONENT_VERSION)-py$(PYVER).egg-info +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/base85.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/bdiff.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/diffhelpers.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/mpatch.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/osutil.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/parsers.so +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/zstd.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__modulepolicy__.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__version__.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ancestor.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/archival.py @@ -128,7 +151,9 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/byterange.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changegroup.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changelog.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/chgserver.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cmdutil.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/color.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commands.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commandserver.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/config.py @@ -137,11 +162,13 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/crecord.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagparser.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/debugcommands.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/default.d/mergetools.rc file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/destutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstateguard.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/discovery.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dispatch.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dummycert.pem @@ -166,6 +193,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/extensions.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/filesets.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/glossary.txt +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg-ssh.8.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg.1.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.5.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.txt @@ -173,13 +201,13 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgweb.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/bundles.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/changegroups.txt +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/requirements.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/revlogs.txt +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/wireprotocol.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/merge-tools.txt -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/multirevs.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/patterns.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/phases.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revisions.txt -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revsets.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/scripting.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/subrepos.txt file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/templates.txt @@ -200,7 +228,6 @@ dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/_readers.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/socketutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpconnection.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httppeer.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/i18n.py @@ -251,6 +278,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/match.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mdiff.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/merge.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mergeutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minirst.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mpatch.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/namespaces.py @@ -263,11 +291,20 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pathutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/peer.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/phases.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/policy.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/posix.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/profiling.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/progress.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/base85.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/bdiff.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/diffhelpers.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/mpatch.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/osutil.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/parsers.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pushkey.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pvec.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/py3kcompat.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pycompat.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/registrar.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repair.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repoview.py @@ -276,17 +313,19 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmposix.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmwindows.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/server.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/setdiscovery.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/similar.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py \ - pkg.depend.bypass-generate=.* +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshpeer.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshserver.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sslutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statichttprepo.py +# pkgdepend complains about a "__main__" import: bug 15710704 +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statprof.py \ + pkg.depend.bypass-generate=.* file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/store.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/streamclone.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/strutil.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/subrepo.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tagmerge.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tags.py @@ -470,10 +509,13 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/windows.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireproto.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py +file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/zstd.so # license mercurial.copyright.excanvas license="Apache v2.0" -license mercurial.copyright.google license="BSD 3-Clause" +license mercurial.copyright.google license="BSD 3-Clause (httpclient)" +license mercurial.copyright.zstd license="BSD 3-Clause (zstd)" license mercurial.copyright license=GPLv2+ +license mercurial.copyright.statprof license=LGPLv2.1 # force a dependency on the mercurial package depend type=optional \ diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial.copyright --- a/components/mercurial/mercurial.copyright Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/mercurial.copyright Fri Apr 21 10:43:44 2017 -0700 @@ -55,7 +55,7 @@ The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,63 +278,3 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial.copyright.excanvas --- a/components/mercurial/mercurial.copyright.excanvas Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/mercurial.copyright.excanvas Fri Apr 21 10:43:44 2017 -0700 @@ -1,31 +1,3 @@ -Copyright 2006 Google Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -You may not use the identified files except in compliance with the Apache -License, Version 2.0 (the "License.") - -You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also -reproduced below. - -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. - -See the License for the specific language governing permissions and limitations -under the License. - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -202,28 +174,3 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial.copyright.statprof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/mercurial/mercurial.copyright.statprof Fri Apr 21 10:43:44 2017 -0700 @@ -0,0 +1,459 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/mercurial.copyright.zstd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/mercurial/mercurial.copyright.zstd Fri Apr 21 10:43:44 2017 -0700 @@ -0,0 +1,141 @@ +== contrib/python-zstandard ==================================================== +Copyright (c) 2016, Gregory Szorc +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +== contrib/python-zstandard/zstd, hgext/fsmonitor/pywatchman =================== +Copyright (c) 2016-present, Facebook, Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +== contrib/python-zstandard/zstd =============================================== +Additional Grant of Patent Rights Version 2 + +"Software" means the Zstandard software distributed by Facebook, Inc. + +Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software +("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable +(subject to the termination provision below) license under any Necessary +Claims, to make, have made, use, sell, offer to sell, import, and otherwise +transfer the Software. For avoidance of doubt, no license is granted under +Facebook's rights in any patent claims that are infringed by (i) modifications +to the Software made by you or any third party or (ii) the Software in +combination with any software or other technology. + +The license granted hereunder will terminate, automatically and without notice, +if you (or any of your subsidiaries, corporate affiliates or agents) initiate +directly or indirectly, or take a direct financial interest in, any Patent +Assertion: (i) against Facebook or any of its subsidiaries or corporate +affiliates, (ii) against any party if such Patent Assertion arises in whole or +in part from any software, technology, product or service of Facebook or any of +its subsidiaries or corporate affiliates, or (iii) against any party relating +to the Software. Notwithstanding the foregoing, if Facebook or any of its +subsidiaries or corporate affiliates files a lawsuit alleging patent +infringement against you in the first instance, and you respond by filing a +patent infringement counterclaim in that lawsuit against that party that is +unrelated to the Software, the license granted hereunder will not terminate +under section (i) of this paragraph due to such counterclaim. + +A "Necessary Claim" is a claim of a patent owned by Facebook that is +necessarily infringed by the Software standing alone. + +A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, +or contributory infringement or inducement to infringe any patent, including a +cross-claim or counterclaim. + +== contrib/python-zstandard/zstd/common ======================================== +Copyright (C) 2013-2016, Yann Collet. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +== contrib/python-zstandard/zstd/dictBuilder =================================== +Copyright (c) 2003-2008 Yuta Mori All Rights Reserved. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/patches/64bit-crash.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/mercurial/patches/64bit-crash.patch Fri Apr 21 10:43:44 2017 -0700 @@ -0,0 +1,31 @@ +A 64-bit build results in a segfault in the parsers module (on both SPARC +and x86). Dialing down the optimization to -xO1 eliminates the crash. + +In order to only lower the optimization for the one object that needs it +and only in a 64-bit build, we do some monkeypatching of the distutils +compiler class, and replace its _compile() method with one that does that +check and replaces the original optimization level with the lower one. + +This patch can be removed when we move to Studio 12.5. + +--- a/setup.py 2017-02-01 08:18:58.000000000 -0800 ++++ b/setup.py 2017-02-03 18:13:20.479471297 -0800 +@@ -302,7 +302,18 @@ + + return build_ext.build_extensions(self) + ++ def my_compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): ++ if src == "mercurial/parsers.c" and "-m64" in self.compiler.compiler_so: ++ for i, arg in enumerate(self.compiler.compiler_so): ++ if arg.startswith("-xO"): ++ break ++ self.compiler.compiler_so[i] = "-xO1" ++ self.compiler.old_compile(obj, src, ext, cc_args, extra_postargs, pp_opts) ++ + def build_extension(self, ext): ++ if not hasattr(self.compiler, "old_compile"): ++ self.compiler.old_compile = self.compiler._compile ++ self.compiler._compile = self.my_compile + try: + build_ext.build_extension(self, ext) + except CCompilerError: diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/patches/demandimport.patch --- a/components/mercurial/patches/demandimport.patch Wed Apr 19 03:24:59 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -Mercurial's demandload system is incompatible with sqlalchemy. - -This was reported upstream as - - https://bz.mercurial-scm.org/show_bug.cgi?id=5085 - -and is available in the upstream repository in changesets c25e3fd38ff1 and -9ff7261cc0f5. - -diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py ---- a/mercurial/demandimport.py -+++ b/mercurial/demandimport.py -@@ -174,7 +174,12 @@ def _demandimport(name, globals=None, lo - """ - symbol = getattr(mod, attr, nothing) - if symbol is nothing: -- symbol = _demandmod(attr, mod.__dict__, locals, level=1) -+ mn = '%s.%s' % (mod.__name__, attr) -+ if mn in ignore: -+ importfunc = _origimport -+ else: -+ importfunc = _demandmod -+ symbol = importfunc(attr, mod.__dict__, locals, level=1) - setattr(mod, attr, symbol) - - # Record the importing module references this symbol so we can -@@ -250,6 +255,7 @@ ignore = [ - '_sre', # issue4920 - 'rfc822', - 'mimetools', -+ 'sqlalchemy.events', # has import-time side effects (issue5085) - # setuptools 8 expects this module to explode early when not on windows - 'distutils.msvc9compiler' - ] diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/patches/hgmanpage.patch --- a/components/mercurial/patches/hgmanpage.patch Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/patches/hgmanpage.patch Fri Apr 21 10:43:44 2017 -0700 @@ -21,9 +21,9 @@ (found in rst.patch) with the patched hgmanpage.py, and updates the manpage.patch file. ---- mercurial-2.7/doc/hgmanpage.py Thu Aug 1 20:37:39 2013 -+++ mercurial-2.7/doc/hgmanpage.py Mon Aug 19 14:40:04 2013 -@@ -197,6 +197,7 @@ +--- mercurial.hg/doc/hgmanpage.py 2016-10-09 20:00:17.207404849 -0700 ++++ mercurial.hg/doc/hgmanpage.py 2016-10-10 10:04:03.695820057 -0700 +@@ -202,6 +202,7 @@ self._in_docinfo = None self._active_table = None self._in_literal = False @@ -31,7 +31,7 @@ self.header_written = 0 self._line_block = 0 self.authors = [] -@@ -212,15 +213,15 @@ +@@ -217,15 +218,15 @@ # ``B`` bold, ``I`` italic, ``R`` roman should be available. # Hopefully ``C`` courier too. self.defs = { @@ -50,7 +50,7 @@ 'emphasis': ('\\fI', '\\fP'), 'strong' : ('\\fB', '\\fP'), 'term' : ('\n.B ', '\n'), -@@ -267,6 +268,7 @@ +@@ -272,6 +273,7 @@ self.body[i - 2][:4] == '.TP\n'): self.body[i] = '.\n' elif (self.body[i - 1] == '\n' and @@ -58,15 +58,15 @@ self.body[i - 2][0] != '.' and (self.body[i - 3][:7] == '.TP\n.B ' or self.body[i - 3][:4] == '\n.B ') -@@ -284,7 +286,6 @@ +@@ -289,7 +291,6 @@ text = text.replace('\\','\\e') replace_pairs = [ - (u'-', ur'\-'), -- (u'\'', ur'\(aq'), - (u'´', ur'\''), - (u'`', ur'\(ga'), + (u'-', u'\\-'), +- (u"'", u'\\(aq'), + (u'´', u"\\'"), + (u'`', u'\\(ga'), ] -@@ -297,6 +298,15 @@ +@@ -302,6 +303,15 @@ if text[0] == '.': text = '\\&' + text text = text.replace('\n.', '\n\\&.') @@ -82,7 +82,7 @@ self.body.append(text) def depart_Text(self, node): -@@ -381,7 +391,6 @@ +@@ -386,7 +396,6 @@ if self.header_written: return self.body.append(self.header()) @@ -90,7 +90,7 @@ self.header_written = 1 def visit_address(self, node): -@@ -795,8 +804,10 @@ +@@ -800,8 +809,10 @@ def visit_literal(self, node): self.body.append(self.defs['literal'][0]) diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/patches/manpages.patch --- a/components/mercurial/patches/manpages.patch Wed Apr 19 03:24:59 2017 -0700 +++ b/components/mercurial/patches/manpages.patch Fri Apr 21 10:43:44 2017 -0700 @@ -7,8 +7,8 @@ These changes are Solaris-specific and not appropriate for upstream. ---- mercurial-3.7.3/doc/hg.1 Tue Mar 29 09:54:51 2016 -+++ mercurial-3.7.3/doc/hg.1 Tue Mar 29 10:26:31 2016 +--- mercurial-4.1/doc/hg.1 2017-02-01 08:19:54.000000000 -0800 ++++ mercurial-4.1/doc/hg.1 2017-02-03 11:20:06.570123444 -0800 @@ -3,33 +3,6 @@ .TH HG 1 "" "" "Mercurial Manual" .SH NAME @@ -650,8 +650,8 @@ -.UNINDENT +.RE .sp --See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword. -+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword. +-See \%\fBhg help revisions.bisect\fP\: for more about the \fIbisect()\fP predicate. ++See \fBhg help revisions.bisect\fP for more about the \fIbisect()\fP predicate. .sp Returns 0 on success. .sp @@ -1062,7 +1062,7 @@ .nf -.ft C +.ft - hg clone http://selenic.com/hg + hg clone https://www.mercurial\-scm.org/repo/hg/ -.ft P +.ft .fi @@ -1122,7 +1122,7 @@ .nf -.ft C +.ft - hg clone http://selenic.com/hg#stable + hg clone https://www.mercurial\-scm.org/repo/hg/#stable -.ft P +.ft .fi @@ -1297,8 +1297,8 @@ .TP .B \-u, \-\-untrusted . -@@ -1574,15 +1547,15 @@ - edit global config +@@ -1578,15 +1551,15 @@ + display with template (EXPERIMENTAL) .sp aliases: showconfig debugconfig -.UNINDENT @@ -1316,7 +1316,7 @@ .fi .sp Mark dest as having copies of source files. If dest is a -@@ -1594,12 +1567,12 @@ +@@ -1598,12 +1571,12 @@ operation is recorded, but no copying is performed. .sp This command takes effect with the next commit. To undo a copy @@ -1331,7 +1331,7 @@ .TP .B \-A, \-\-after . -@@ -1620,23 +1593,23 @@ +@@ -1624,23 +1597,23 @@ .B \-n, \-\-dry\-run . do not perform actions, just print output @@ -1362,7 +1362,7 @@ .fi .sp Show differences between revisions for the specified files. -@@ -1644,8 +1617,8 @@ +@@ -1648,8 +1621,8 @@ Differences between files are shown using the unified diff format. .IP Note . @@ -1373,7 +1373,7 @@ parent changeset if no revisions are specified. .RE .sp -@@ -1663,18 +1636,18 @@ +@@ -1667,18 +1640,18 @@ anyway, probably with undesirable results. .sp Use the \-g/\-\-git option to generate diffs in the git extended diff @@ -1396,7 +1396,7 @@ .fi .IP \(bu 2 . -@@ -1681,9 +1654,9 @@ +@@ -1685,9 +1658,9 @@ compare two historical versions of a directory, with rename info: .sp .nf @@ -1408,7 +1408,7 @@ .fi .IP \(bu 2 . -@@ -1690,9 +1663,9 @@ +@@ -1694,9 +1667,9 @@ get change stats relative to the last change on some date: .sp .nf @@ -1421,7 +1421,7 @@ .fi .IP \(bu 2 . -@@ -1699,9 +1672,9 @@ +@@ -1703,9 +1676,9 @@ diff all newly\-added files that contain a keyword: .sp .nf @@ -1433,7 +1433,7 @@ .fi .IP \(bu 2 . -@@ -1708,18 +1681,18 @@ +@@ -1712,18 +1685,18 @@ compare a revision and its parents: .sp .nf @@ -1456,7 +1456,7 @@ .TP .BI \-r, \-\-rev \ . -@@ -1788,7 +1761,7 @@ +@@ -1792,7 +1765,7 @@ .B \-S, \-\-subrepos . recurse into subrepositories @@ -1465,7 +1465,7 @@ .sp [+] marked option can be specified multiple times .SS export -@@ -1796,9 +1769,9 @@ +@@ -1800,9 +1773,9 @@ dump the header and diffs for one or more changesets: .sp .nf @@ -1477,7 +1477,7 @@ .fi .sp Print the changeset header and diffs for one or more revisions. -@@ -1809,7 +1782,7 @@ +@@ -1813,7 +1786,7 @@ comment. .IP Note . @@ -1486,7 +1486,7 @@ changesets, as it will compare the merge changeset against its first parent only. .RE -@@ -1816,7 +1789,7 @@ +@@ -1820,7 +1793,7 @@ .sp Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are as follows: @@ -1495,7 +1495,7 @@ .TP .B \fB%%\fP .sp -@@ -1853,7 +1826,7 @@ +@@ -1857,7 +1830,7 @@ .B \fB%r\fP .sp zero\-padded changeset revision number @@ -1504,7 +1504,7 @@ .sp Without the \-a/\-\-text option, export will avoid generating diffs of files it detects as binary. With \-a, export will generate a -@@ -1860,13 +1833,13 @@ +@@ -1864,13 +1837,13 @@ diff anyway, probably with undesirable results. .sp Use the \-g/\-\-git option to generate diffs in the git extended diff @@ -1520,7 +1520,7 @@ .IP \(bu 2 . use export and import to transplant a bugfix to the current -@@ -1873,9 +1846,9 @@ +@@ -1877,9 +1850,9 @@ branch: .sp .nf @@ -1532,7 +1532,7 @@ .fi .IP \(bu 2 . -@@ -1883,9 +1856,9 @@ +@@ -1887,9 +1860,9 @@ rename information: .sp .nf @@ -1544,7 +1544,7 @@ .fi .IP \(bu 2 . -@@ -1893,16 +1866,16 @@ +@@ -1897,16 +1870,16 @@ descriptive names: .sp .nf @@ -1565,7 +1565,7 @@ .TP .BI \-o, \-\-output \ . -@@ -1927,7 +1900,7 @@ +@@ -1931,7 +1904,7 @@ .B \-\-nodates . omit dates from diff headers @@ -1574,20 +1574,20 @@ .sp [+] marked option can be specified multiple times .SS files -@@ -1935,9 +1908,9 @@ +@@ -1939,9 +1912,9 @@ list tracked files: .sp .nf -.ft C +.ft - hg files [OPTION]... [PATTERN]... + hg files [OPTION]... [FILE]... -.ft P +.ft .fi .sp Print files under Mercurial control in the working directory or -@@ -1948,15 +1921,15 @@ - of all files under Mercurial control in the working directory. +@@ -1952,15 +1925,15 @@ + of all files under Mercurial control. .sp Examples: -.INDENT 0.0 @@ -1605,7 +1605,7 @@ .fi .IP \(bu 2 . -@@ -1963,9 +1936,9 @@ +@@ -1967,9 +1940,9 @@ shows sizes and flags for current revision: .sp .nf @@ -1617,7 +1617,7 @@ .fi .IP \(bu 2 . -@@ -1972,9 +1945,9 @@ +@@ -1976,9 +1949,9 @@ list all files named README: .sp .nf @@ -1629,7 +1629,7 @@ .fi .IP \(bu 2 . -@@ -1981,9 +1954,9 @@ +@@ -1985,9 +1958,9 @@ list all binary files: .sp .nf @@ -1641,7 +1641,7 @@ .fi .IP \(bu 2 . -@@ -1990,9 +1963,9 @@ +@@ -1994,9 +1967,9 @@ find files containing a regular expression: .sp .nf @@ -1654,7 +1654,7 @@ .fi .IP \(bu 2 . -@@ -1999,19 +1972,19 @@ +@@ -2003,19 +1976,19 @@ search tracked file contents with xargs and grep: .sp .nf @@ -1679,7 +1679,7 @@ .TP .BI \-r, \-\-rev \ . -@@ -2036,7 +2009,7 @@ +@@ -2040,7 +2013,7 @@ .B \-S, \-\-subrepos . recurse into subrepositories @@ -1688,7 +1688,7 @@ .sp [+] marked option can be specified multiple times .SS forget -@@ -2044,9 +2017,9 @@ +@@ -2048,9 +2021,9 @@ forget the specified files on the next commit: .sp .nf @@ -1700,7 +1700,7 @@ .fi .sp Mark the specified files so they will no longer be tracked -@@ -2056,20 +2029,20 @@ +@@ -2060,20 +2033,20 @@ entire project history, and it does not delete them from the working directory. .sp @@ -1726,7 +1726,7 @@ .fi .IP \(bu 2 . -@@ -2076,16 +2049,16 @@ +@@ -2080,16 +2053,16 @@ forget files that would be excluded by .hgignore: .sp .nf @@ -1747,7 +1747,7 @@ .TP .BI \-I, \-\-include \ . -@@ -2094,7 +2067,7 @@ +@@ -2098,7 +2071,7 @@ .BI \-X, \-\-exclude \ . exclude names matching the given patterns @@ -1756,7 +1756,7 @@ .sp [+] marked option can be specified multiple times .SS graft -@@ -2102,15 +2075,15 @@ +@@ -2106,15 +2079,15 @@ copy changes from other branches onto the current branch: .sp .nf @@ -1777,7 +1777,7 @@ description from the source changesets. .sp Changesets that are ancestors of the current revision, that have -@@ -2120,9 +2093,9 @@ +@@ -2124,9 +2097,9 @@ of the form: .sp .nf @@ -1789,7 +1789,7 @@ .fi .sp If \-\-force is specified, revisions will be grafted even if they -@@ -2140,16 +2113,16 @@ +@@ -2144,16 +2117,16 @@ .RE .sp Examples: @@ -1809,7 +1809,7 @@ .fi .IP \(bu 2 . -@@ -2156,9 +2129,9 @@ +@@ -2160,9 +2133,9 @@ graft a range of changesets with one exception, updating dates: .sp .nf @@ -1821,7 +1821,7 @@ .fi .IP \(bu 2 . -@@ -2165,9 +2138,9 @@ +@@ -2169,9 +2142,9 @@ continue a graft after resolving conflicts: .sp .nf @@ -1833,7 +1833,7 @@ .fi .IP \(bu 2 . -@@ -2174,9 +2147,9 @@ +@@ -2178,9 +2151,9 @@ show the source of a grafted changeset: .sp .nf @@ -1845,23 +1845,21 @@ .fi .IP \(bu 2 . -@@ -2183,19 +2156,19 @@ +@@ -2187,18 +2160,18 @@ show revisions sorted by date: .sp .nf -.ft C --hg log \-r \(aqsort(all(), date)\(aq --.ft P -+.ft -+hg log \-r 'sort(all(), date)' -+.ft - .fi --.UNINDENT -+.RE - .sp --See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about -+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about - specifying revisions. ++.ft + hg log \-r "sort(all(), date)" +-.ft P ++.ft + .fi +-.UNINDENT ++.RE + .sp +-See \%\fBhg help revisions\fP\: for more about specifying revisions. ++See \fBhg help revisions\fP for more about specifying revisions. .sp Returns 0 on successful completion. .sp @@ -1871,7 +1869,7 @@ .TP .BI \-r, \-\-rev \ . -@@ -2240,7 +2213,7 @@ +@@ -2243,7 +2216,7 @@ .B \-n, \-\-dry\-run . do not perform actions, just print output @@ -1880,8 +1878,8 @@ .sp [+] marked option can be specified multiple times .SS grep -@@ -2248,9 +2221,9 @@ - search for a pattern in specified files and revisions: +@@ -2251,9 +2224,9 @@ + search revision history for a pattern in specified files: .sp .nf -.ft C @@ -1891,8 +1889,17 @@ +.ft .fi .sp - Search revisions of files for a regular expression. -@@ -2269,7 +2242,7 @@ + Search revision history for a regular expression in the specified +@@ -2268,14 +2241,14 @@ + PATTERN can be any Python (roughly Perl\-compatible) regular + expression. + .sp +-If no FILEs are specified (and \-f/\-\-follow isn\(aqt set), all files in +-the repository are searched, including those that don\(aqt exist in the ++If no FILEs are specified (and \-f/\-\-follow isn't set), all files in ++the repository are searched, including those that don't exist in the + current branch or have been deleted in a prior changeset. + .sp Returns 0 if a match is found, 1 otherwise. .sp Options: @@ -1901,7 +1908,7 @@ .TP .B \-0, \-\-print0 . -@@ -2318,7 +2291,7 @@ +@@ -2328,7 +2301,7 @@ .BI \-X, \-\-exclude \ . exclude names matching the given patterns @@ -1910,7 +1917,7 @@ .sp [+] marked option can be specified multiple times .SS heads -@@ -2326,9 +2299,9 @@ +@@ -2336,9 +2309,9 @@ show branch heads: .sp .nf @@ -1922,7 +1929,7 @@ .fi .sp With no arguments, show all open branch heads in the repository. -@@ -2338,11 +2311,11 @@ +@@ -2348,11 +2321,11 @@ .sp If one or more REVs are given, only open branch heads on the branches associated with the specified changesets are shown. This @@ -1936,7 +1943,7 @@ .sp If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. -@@ -2353,7 +2326,7 @@ +@@ -2363,7 +2336,7 @@ Returns 0 if matching heads are found, 1 if not. .sp Options: @@ -1945,7 +1952,7 @@ .TP .BI \-r, \-\-rev \ . -@@ -2378,15 +2351,15 @@ +@@ -2388,15 +2361,15 @@ .BI \-T, \-\-template \