| author | Alasdair Lumsden <al@everycity.co.uk> |
| Mon, 15 Aug 2011 14:21:06 +0100 | |
| branch | oi_151a |
| changeset 230 | 86d5a64ef772 |
| parent 229 | 6b7ee4852067 |
| child 231 | 879cd0f45d48 |
--- a/components/git/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# -include ../../make-rules/shared-macros.mk - -COMPONENT_NAME= git -COMPONENT_VERSION= 1.7.6 -PERL_VERSION= 5.12 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 -COMPONENT_ARCHIVE_HASH= sha1:c519b0765c419c84b561bb4a2a86526b16d95cde -COMPONENT_ARCHIVE_URL= http://kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE) -# -# man pages are a separate archive -# -COMPONENT_ARCHIVE_1 = $(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION).tar.bz2 -COMPONENT_ARCHIVE_HASH_1 = sha1:45e0759597d649b13f684f55a186d46dafb7d414 -COMPONENT_ARCHIVE_URL_1 = http://kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE_1) - -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -CONFIGURE_PREFIX = /usr -CONFIGURE_OPTIONS += --without-openssl -CONFIGURE_OPTIONS += --libexecdir=/usr/lib -CONFIGURE_OPTIONS += --with-perl=/usr/perl5/$(PERL_VERSION)/bin/perl -CONFIGURE_OPTIONS += --with-python=$(PYTHON.32) -CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" - -COMPONENT_BUILD_ENV+= NO_PERL_MAKEMAKER=1 -COMPONENT_INSTALL_ENV+= PERL_LIB=$(shell /usr/perl5/$(PERL_VERSION)/bin/perl -MConfig -e 'print "$$Config{installvendorarch}"') - -COMPONENT_TEST_TARGETS = test - -# -# This runs configure but configure doesn't generate a Makefile. -# Instead a Makefile comes with git ... -# Anyways viewpathing doesn't work. -# Therefore we need cloney to copy a set of files to build. -# -COMPONENT_PRE_CONFIGURE_ACTION = \ - ($(CLONEY) $(SOURCE_DIR) $(@D)) - -# -# Processed man pages go here. -# -DOC=$(BUILD_DIR)/Documentation - -PKG_MACROS += PERL_ARCH=$(shell arch) -PKG_MACROS += PERL_VERSION=$(PERL_VERSION) - -build: $(BUILD_32) $(DOC)/.manpages - -install: $(INSTALL_32) - -# -# tests fully pass when done in the archive directory. -# fail here; probably due to the use of cloney. -# -test: $(TEST_32) - -# -# I know. It's ugly. -# But these man pages come in a separate archive with no Makefile -# and Solaris likes some of them moved around hence we'll just -# do it manually here. -# -$(DOC)/.manpages: - cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_1) - $(MKDIR) $(@D) - cd $(BUILD_DIR)/man1 ; for manfile in *.1; \ - do \ - name=`basename $$manfile .1`; \ - cat $$manfile > $(DOC)/$$name.1; \ - done - cd $(BUILD_DIR)/man5 ; for manfile in *.5; \ - do \ - name=`basename $$manfile .5`; \ - sed 's/"5"/"4"/' $$manfile > $(DOC)/$$name.4; \ - done - cd $(BUILD_DIR)/man7 ; for manfile in *.7; \ - do \ - name=`basename $$manfile .7`; \ - sed 's/"7"/"5"/' $$manfile > $(DOC)/$$name.5; \ - done - $(TOUCH) $@ - - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk
--- a/components/git/git.license Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,349 +0,0 @@ -Oracle elects to use only the GNU Lesser General Public License version -2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software -where a choice of LGPL/GPL license versions are made available with the -language indicating that LGPLv2.1/GPLv2 or any later version may be -used, or where a choice of which version of the LGPL/GPL is applied is -unspecified. Unless specifically stated otherwise, where a choice -exists between another license and either the GPL or the LGPL, Oracle -chooses the other license. - --------------------------------------------------------------------------------- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 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. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - 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 -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 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 -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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 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 -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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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. - - <signature of Ty Coon>, 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 Lesser General -Public License instead of this License.
--- a/components/git/git.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,487 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# - -<transform file path=usr/lib/git-core/.* -> default mode 0555> -<transform file path=usr/share/man/man./(.+$) -> set action.hash Documentation/%<\1> > -<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted> -set name=pkg.fmri \ - value=pkg:/developer/versioning/git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.description \ - value="Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency." -set name=pkg.summary value="git - Fast Version Control System" -set name=info.classification \ - value="org.opensolaris.category.2008:Development/Source Code Management" -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) -set name=info.upstream_url value=http://git-scm.com/ -set name=opensolaris.arc_url \ - value=http://arc.opensolaris.org/caselog/LSARC/2008/360 -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=usr -dir path=usr/bin -dir path=usr/lib -dir path=usr/lib/git-core -dir path=usr/lib/python2.6 -dir path=usr/lib/python2.6/site-packages -dir path=usr/lib/python2.6/site-packages/git_remote_helpers -dir path=usr/lib/python2.6/site-packages/git_remote_helpers/git -dir path=usr/perl5 -dir path=usr/perl5/vendor_perl -dir path=usr/perl5/vendor_perl/$(PERL_VERSION) -dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int -dir path=usr/share -dir path=usr/share/git-core -dir path=usr/share/git-core/templates -dir path=usr/share/git-core/templates/branches -dir path=usr/share/git-core/templates/hooks -dir path=usr/share/git-core/templates/info -dir path=usr/share/git-gui -dir path=usr/share/git-gui/lib -dir path=usr/share/git-gui/lib/msgs -dir path=usr/share/gitk -dir path=usr/share/gitk/lib -dir path=usr/share/gitk/lib/msgs -dir path=usr/share/gitweb -dir path=usr/share/gitweb/static -dir path=usr/share/man -dir path=usr/share/man/man1 -dir path=usr/share/man/man4 -dir path=usr/share/man/man5 -file path=usr/bin/git -file path=usr/bin/git-cvsserver -file path=usr/bin/git-shell -file path=usr/bin/git-upload-pack -file path=usr/bin/gitk -file path=usr/lib/git-core/git-add--interactive -file path=usr/lib/git-core/git-am -file path=usr/lib/git-core/git-archimport -file path=usr/lib/git-core/git-bisect -file path=usr/lib/git-core/git-cvsexportcommit -file path=usr/lib/git-core/git-cvsimport -file path=usr/lib/git-core/git-daemon -file path=usr/lib/git-core/git-difftool -file path=usr/lib/git-core/git-difftool--helper -file path=usr/lib/git-core/git-fast-import -file path=usr/lib/git-core/git-filter-branch -file path=usr/lib/git-core/git-gui -file path=usr/lib/git-core/git-gui--askpass -file path=usr/lib/git-core/git-http-backend -file path=usr/lib/git-core/git-http-fetch -file path=usr/lib/git-core/git-http-push -file path=usr/lib/git-core/git-imap-send -file path=usr/lib/git-core/git-instaweb -file path=usr/lib/git-core/git-lost-found -file path=usr/lib/git-core/git-merge-octopus -file path=usr/lib/git-core/git-merge-one-file -file path=usr/lib/git-core/git-merge-resolve -file path=usr/lib/git-core/git-mergetool -file path=usr/lib/git-core/git-mergetool--lib -file path=usr/lib/git-core/git-parse-remote -file path=usr/lib/git-core/git-pull -file path=usr/lib/git-core/git-quiltimport -file path=usr/lib/git-core/git-rebase -file path=usr/lib/git-core/git-rebase--am -file path=usr/lib/git-core/git-rebase--interactive -file path=usr/lib/git-core/git-rebase--merge -file path=usr/lib/git-core/git-relink -file path=usr/lib/git-core/git-remote-http -file path=usr/lib/git-core/git-remote-testgit -file path=usr/lib/git-core/git-repack -file path=usr/lib/git-core/git-request-pull -file path=usr/lib/git-core/git-send-email -file path=usr/lib/git-core/git-sh-i18n -file path=usr/lib/git-core/git-sh-i18n--envsubst -file path=usr/lib/git-core/git-sh-setup -file path=usr/lib/git-core/git-show-index -file path=usr/lib/git-core/git-stash -file path=usr/lib/git-core/git-submodule -file path=usr/lib/git-core/git-svn -file path=usr/lib/git-core/git-web--browse -file \ - path=usr/lib/python2.6/site-packages/git_remote_helpers-0.1.0-py2.6.egg-info -file path=usr/lib/python2.6/site-packages/git_remote_helpers/__init__.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/__init__.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/exporter.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/exporter.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/git.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/git.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/importer.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/importer.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/non_local.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/non_local.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.pyc -file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.py -file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.pyc -file \ - path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Error.pm -file \ - path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Git.pm -file path=usr/share/git-core/templates/description -file path=usr/share/git-core/templates/hooks/applypatch-msg.sample -file path=usr/share/git-core/templates/hooks/commit-msg.sample -file path=usr/share/git-core/templates/hooks/post-commit.sample -file path=usr/share/git-core/templates/hooks/post-receive.sample -file path=usr/share/git-core/templates/hooks/post-update.sample -file path=usr/share/git-core/templates/hooks/pre-applypatch.sample -file path=usr/share/git-core/templates/hooks/pre-commit.sample -file path=usr/share/git-core/templates/hooks/pre-rebase.sample -file path=usr/share/git-core/templates/hooks/prepare-commit-msg.sample -file path=usr/share/git-core/templates/hooks/update.sample -file path=usr/share/git-core/templates/info/exclude -file path=usr/share/git-gui/lib/about.tcl -file path=usr/share/git-gui/lib/blame.tcl -file path=usr/share/git-gui/lib/branch.tcl -file path=usr/share/git-gui/lib/branch_checkout.tcl -file path=usr/share/git-gui/lib/branch_create.tcl -file path=usr/share/git-gui/lib/branch_delete.tcl -file path=usr/share/git-gui/lib/branch_rename.tcl -file path=usr/share/git-gui/lib/browser.tcl -file path=usr/share/git-gui/lib/checkout_op.tcl -file path=usr/share/git-gui/lib/choose_font.tcl -file path=usr/share/git-gui/lib/choose_repository.tcl -file path=usr/share/git-gui/lib/choose_rev.tcl -file path=usr/share/git-gui/lib/class.tcl -file path=usr/share/git-gui/lib/commit.tcl -file path=usr/share/git-gui/lib/console.tcl -file path=usr/share/git-gui/lib/database.tcl -file path=usr/share/git-gui/lib/date.tcl -file path=usr/share/git-gui/lib/diff.tcl -file path=usr/share/git-gui/lib/encoding.tcl -file path=usr/share/git-gui/lib/error.tcl -file path=usr/share/git-gui/lib/git-gui.ico -file path=usr/share/git-gui/lib/index.tcl -file path=usr/share/git-gui/lib/logo.tcl -file path=usr/share/git-gui/lib/merge.tcl -file path=usr/share/git-gui/lib/mergetool.tcl -file path=usr/share/git-gui/lib/msgs/de.msg -file path=usr/share/git-gui/lib/msgs/el.msg -file path=usr/share/git-gui/lib/msgs/fr.msg -file path=usr/share/git-gui/lib/msgs/hu.msg -file path=usr/share/git-gui/lib/msgs/it.msg -file path=usr/share/git-gui/lib/msgs/ja.msg -file path=usr/share/git-gui/lib/msgs/nb.msg -file path=usr/share/git-gui/lib/msgs/ru.msg -file path=usr/share/git-gui/lib/msgs/sv.msg -file path=usr/share/git-gui/lib/msgs/zh_cn.msg -file path=usr/share/git-gui/lib/option.tcl -file path=usr/share/git-gui/lib/remote.tcl -file path=usr/share/git-gui/lib/remote_add.tcl -file path=usr/share/git-gui/lib/remote_branch_delete.tcl -file path=usr/share/git-gui/lib/search.tcl -file path=usr/share/git-gui/lib/shortcut.tcl -file path=usr/share/git-gui/lib/spellcheck.tcl -file path=usr/share/git-gui/lib/sshkey.tcl -file path=usr/share/git-gui/lib/status_bar.tcl -file path=usr/share/git-gui/lib/tclIndex -file path=usr/share/git-gui/lib/themed.tcl -file path=usr/share/git-gui/lib/tools.tcl -file path=usr/share/git-gui/lib/tools_dlg.tcl -file path=usr/share/git-gui/lib/transport.tcl -file path=usr/share/git-gui/lib/win32.tcl -file path=usr/share/git-gui/lib/win32_shortcut.js -file path=usr/share/gitk/lib/msgs/de.msg -file path=usr/share/gitk/lib/msgs/es.msg -file path=usr/share/gitk/lib/msgs/fr.msg -file path=usr/share/gitk/lib/msgs/hu.msg -file path=usr/share/gitk/lib/msgs/it.msg -file path=usr/share/gitk/lib/msgs/ja.msg -file path=usr/share/gitk/lib/msgs/ru.msg -file path=usr/share/gitk/lib/msgs/sv.msg -file path=usr/share/gitweb/gitweb.cgi -file path=usr/share/gitweb/static/git-favicon.png -file path=usr/share/gitweb/static/git-logo.png -file path=usr/share/gitweb/static/gitweb.css -file path=usr/share/gitweb/static/gitweb.js -file path=usr/share/man/man1/git-add.1 -file path=usr/share/man/man1/git-am.1 -file path=usr/share/man/man1/git-annotate.1 -file path=usr/share/man/man1/git-apply.1 -file path=usr/share/man/man1/git-archimport.1 -file path=usr/share/man/man1/git-archive.1 -file path=usr/share/man/man1/git-bisect.1 -file path=usr/share/man/man1/git-blame.1 -file path=usr/share/man/man1/git-branch.1 -file path=usr/share/man/man1/git-bundle.1 -file path=usr/share/man/man1/git-cat-file.1 -file path=usr/share/man/man1/git-check-attr.1 -file path=usr/share/man/man1/git-check-ref-format.1 -file path=usr/share/man/man1/git-checkout-index.1 -file path=usr/share/man/man1/git-checkout.1 -file path=usr/share/man/man1/git-cherry-pick.1 -file path=usr/share/man/man1/git-cherry.1 -file path=usr/share/man/man1/git-citool.1 -file path=usr/share/man/man1/git-clean.1 -file path=usr/share/man/man1/git-clone.1 -file path=usr/share/man/man1/git-commit-tree.1 -file path=usr/share/man/man1/git-commit.1 -file path=usr/share/man/man1/git-config.1 -file path=usr/share/man/man1/git-count-objects.1 -file path=usr/share/man/man1/git-cvsexportcommit.1 -file path=usr/share/man/man1/git-cvsimport.1 -file path=usr/share/man/man1/git-cvsserver.1 -file path=usr/share/man/man1/git-daemon.1 -file path=usr/share/man/man1/git-describe.1 -file path=usr/share/man/man1/git-diff-files.1 -file path=usr/share/man/man1/git-diff-index.1 -file path=usr/share/man/man1/git-diff-tree.1 -file path=usr/share/man/man1/git-diff.1 -file path=usr/share/man/man1/git-difftool.1 -file path=usr/share/man/man1/git-fast-export.1 -file path=usr/share/man/man1/git-fast-import.1 -file path=usr/share/man/man1/git-fetch-pack.1 -file path=usr/share/man/man1/git-fetch.1 -file path=usr/share/man/man1/git-filter-branch.1 -file path=usr/share/man/man1/git-fmt-merge-msg.1 -file path=usr/share/man/man1/git-for-each-ref.1 -file path=usr/share/man/man1/git-format-patch.1 -file path=usr/share/man/man1/git-fsck-objects.1 -file path=usr/share/man/man1/git-fsck.1 -file path=usr/share/man/man1/git-gc.1 -file path=usr/share/man/man1/git-get-tar-commit-id.1 -file path=usr/share/man/man1/git-grep.1 -file path=usr/share/man/man1/git-gui.1 -file path=usr/share/man/man1/git-hash-object.1 -file path=usr/share/man/man1/git-help.1 -file path=usr/share/man/man1/git-http-backend.1 -file path=usr/share/man/man1/git-http-fetch.1 -file path=usr/share/man/man1/git-http-push.1 -file path=usr/share/man/man1/git-imap-send.1 -file path=usr/share/man/man1/git-index-pack.1 -file path=usr/share/man/man1/git-init-db.1 -file path=usr/share/man/man1/git-init.1 -file path=usr/share/man/man1/git-instaweb.1 -file path=usr/share/man/man1/git-log.1 -file path=usr/share/man/man1/git-lost-found.1 -file path=usr/share/man/man1/git-ls-files.1 -file path=usr/share/man/man1/git-ls-remote.1 -file path=usr/share/man/man1/git-ls-tree.1 -file path=usr/share/man/man1/git-mailinfo.1 -file path=usr/share/man/man1/git-mailsplit.1 -file path=usr/share/man/man1/git-merge-base.1 -file path=usr/share/man/man1/git-merge-file.1 -file path=usr/share/man/man1/git-merge-index.1 -file path=usr/share/man/man1/git-merge-one-file.1 -file path=usr/share/man/man1/git-merge-tree.1 -file path=usr/share/man/man1/git-merge.1 -file path=usr/share/man/man1/git-mergetool--lib.1 -file path=usr/share/man/man1/git-mergetool.1 -file path=usr/share/man/man1/git-mktag.1 -file path=usr/share/man/man1/git-mktree.1 -file path=usr/share/man/man1/git-mv.1 -file path=usr/share/man/man1/git-name-rev.1 -file path=usr/share/man/man1/git-notes.1 -file path=usr/share/man/man1/git-pack-objects.1 -file path=usr/share/man/man1/git-pack-redundant.1 -file path=usr/share/man/man1/git-pack-refs.1 -file path=usr/share/man/man1/git-parse-remote.1 -file path=usr/share/man/man1/git-patch-id.1 -file path=usr/share/man/man1/git-peek-remote.1 -file path=usr/share/man/man1/git-prune-packed.1 -file path=usr/share/man/man1/git-prune.1 -file path=usr/share/man/man1/git-pull.1 -file path=usr/share/man/man1/git-push.1 -file path=usr/share/man/man1/git-quiltimport.1 -file path=usr/share/man/man1/git-read-tree.1 -file path=usr/share/man/man1/git-rebase.1 -file path=usr/share/man/man1/git-receive-pack.1 -file path=usr/share/man/man1/git-reflog.1 -file path=usr/share/man/man1/git-relink.1 -file path=usr/share/man/man1/git-remote-helpers.1 -file path=usr/share/man/man1/git-remote.1 -file path=usr/share/man/man1/git-repack.1 -file path=usr/share/man/man1/git-replace.1 -file path=usr/share/man/man1/git-repo-config.1 -file path=usr/share/man/man1/git-request-pull.1 -file path=usr/share/man/man1/git-rerere.1 -file path=usr/share/man/man1/git-reset.1 -file path=usr/share/man/man1/git-rev-list.1 -file path=usr/share/man/man1/git-rev-parse.1 -file path=usr/share/man/man1/git-revert.1 -file path=usr/share/man/man1/git-rm.1 -file path=usr/share/man/man1/git-send-email.1 -file path=usr/share/man/man1/git-send-pack.1 -file path=usr/share/man/man1/git-sh-setup.1 -file path=usr/share/man/man1/git-shell.1 -file path=usr/share/man/man1/git-shortlog.1 -file path=usr/share/man/man1/git-show-branch.1 -file path=usr/share/man/man1/git-show-index.1 -file path=usr/share/man/man1/git-show-ref.1 -file path=usr/share/man/man1/git-show.1 -file path=usr/share/man/man1/git-stage.1 -file path=usr/share/man/man1/git-stash.1 -file path=usr/share/man/man1/git-status.1 -file path=usr/share/man/man1/git-stripspace.1 -file path=usr/share/man/man1/git-submodule.1 -file path=usr/share/man/man1/git-svn.1 -file path=usr/share/man/man1/git-symbolic-ref.1 -file path=usr/share/man/man1/git-tag.1 -file path=usr/share/man/man1/git-tar-tree.1 -file path=usr/share/man/man1/git-unpack-file.1 -file path=usr/share/man/man1/git-unpack-objects.1 -file path=usr/share/man/man1/git-update-index.1 -file path=usr/share/man/man1/git-update-ref.1 -file path=usr/share/man/man1/git-update-server-info.1 -file path=usr/share/man/man1/git-upload-archive.1 -file path=usr/share/man/man1/git-upload-pack.1 -file path=usr/share/man/man1/git-var.1 -file path=usr/share/man/man1/git-verify-pack.1 -file path=usr/share/man/man1/git-verify-tag.1 -file path=usr/share/man/man1/git-web--browse.1 -file path=usr/share/man/man1/git-whatchanged.1 -file path=usr/share/man/man1/git-write-tree.1 -file path=usr/share/man/man1/git.1 -file path=usr/share/man/man1/gitk.1 -file path=usr/share/man/man4/gitattributes.4 -file path=usr/share/man/man4/githooks.4 -file path=usr/share/man/man4/gitignore.4 -file path=usr/share/man/man4/gitmodules.4 -file path=usr/share/man/man4/gitrepository-layout.4 -file path=usr/share/man/man5/gitcli.5 -file path=usr/share/man/man5/gitcore-tutorial.5 -file path=usr/share/man/man5/gitcvs-migration.5 -file path=usr/share/man/man5/gitdiffcore.5 -file path=usr/share/man/man5/gitglossary.5 -file path=usr/share/man/man5/gitrevisions.5 -file path=usr/share/man/man5/gittutorial-2.5 -file path=usr/share/man/man5/gittutorial.5 -file path=usr/share/man/man5/gitworkflows.5 -hardlink path=usr/bin/git-receive-pack target=git -hardlink path=usr/bin/git-upload-archive target=git -hardlink path=usr/lib/git-core/git target=../../bin/git -hardlink path=usr/lib/git-core/git-add target=../../bin/git -hardlink path=usr/lib/git-core/git-annotate target=../../bin/git -hardlink path=usr/lib/git-core/git-apply target=../../bin/git -hardlink path=usr/lib/git-core/git-archive target=../../bin/git -hardlink path=usr/lib/git-core/git-bisect--helper target=../../bin/git -hardlink path=usr/lib/git-core/git-blame target=../../bin/git -hardlink path=usr/lib/git-core/git-branch target=../../bin/git -hardlink path=usr/lib/git-core/git-bundle target=../../bin/git -hardlink path=usr/lib/git-core/git-cat-file target=../../bin/git -hardlink path=usr/lib/git-core/git-check-attr target=../../bin/git -hardlink path=usr/lib/git-core/git-check-ref-format target=../../bin/git -hardlink path=usr/lib/git-core/git-checkout target=../../bin/git -hardlink path=usr/lib/git-core/git-checkout-index target=../../bin/git -hardlink path=usr/lib/git-core/git-cherry target=../../bin/git -hardlink path=usr/lib/git-core/git-cherry-pick target=../../bin/git -hardlink path=usr/lib/git-core/git-citool target=git-gui -hardlink path=usr/lib/git-core/git-clean target=../../bin/git -hardlink path=usr/lib/git-core/git-clone target=../../bin/git -hardlink path=usr/lib/git-core/git-commit target=../../bin/git -hardlink path=usr/lib/git-core/git-commit-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-config target=../../bin/git -hardlink path=usr/lib/git-core/git-count-objects target=../../bin/git -hardlink path=usr/lib/git-core/git-cvsserver target=../../bin/git-cvsserver -hardlink path=usr/lib/git-core/git-describe target=../../bin/git -hardlink path=usr/lib/git-core/git-diff target=../../bin/git -hardlink path=usr/lib/git-core/git-diff-files target=../../bin/git -hardlink path=usr/lib/git-core/git-diff-index target=../../bin/git -hardlink path=usr/lib/git-core/git-diff-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-fast-export target=../../bin/git -hardlink path=usr/lib/git-core/git-fetch target=../../bin/git -hardlink path=usr/lib/git-core/git-fetch-pack target=../../bin/git -hardlink path=usr/lib/git-core/git-fmt-merge-msg target=../../bin/git -hardlink path=usr/lib/git-core/git-for-each-ref target=../../bin/git -hardlink path=usr/lib/git-core/git-format-patch target=../../bin/git -hardlink path=usr/lib/git-core/git-fsck target=../../bin/git -hardlink path=usr/lib/git-core/git-fsck-objects target=../../bin/git -hardlink path=usr/lib/git-core/git-gc target=../../bin/git -hardlink path=usr/lib/git-core/git-get-tar-commit-id target=../../bin/git -hardlink path=usr/lib/git-core/git-grep target=../../bin/git -hardlink path=usr/lib/git-core/git-hash-object target=../../bin/git -hardlink path=usr/lib/git-core/git-help target=../../bin/git -hardlink path=usr/lib/git-core/git-index-pack target=../../bin/git -hardlink path=usr/lib/git-core/git-init target=../../bin/git -hardlink path=usr/lib/git-core/git-init-db target=../../bin/git -hardlink path=usr/lib/git-core/git-log target=../../bin/git -hardlink path=usr/lib/git-core/git-ls-files target=../../bin/git -hardlink path=usr/lib/git-core/git-ls-remote target=../../bin/git -hardlink path=usr/lib/git-core/git-ls-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-mailinfo target=../../bin/git -hardlink path=usr/lib/git-core/git-mailsplit target=../../bin/git -hardlink path=usr/lib/git-core/git-merge target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-base target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-file target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-index target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-ours target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-recursive target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-subtree target=../../bin/git -hardlink path=usr/lib/git-core/git-merge-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-mktag target=../../bin/git -hardlink path=usr/lib/git-core/git-mktree target=../../bin/git -hardlink path=usr/lib/git-core/git-mv target=../../bin/git -hardlink path=usr/lib/git-core/git-name-rev target=../../bin/git -hardlink path=usr/lib/git-core/git-notes target=../../bin/git -hardlink path=usr/lib/git-core/git-pack-objects target=../../bin/git -hardlink path=usr/lib/git-core/git-pack-redundant target=../../bin/git -hardlink path=usr/lib/git-core/git-pack-refs target=../../bin/git -hardlink path=usr/lib/git-core/git-patch-id target=../../bin/git -hardlink path=usr/lib/git-core/git-peek-remote target=../../bin/git -hardlink path=usr/lib/git-core/git-prune target=../../bin/git -hardlink path=usr/lib/git-core/git-prune-packed target=../../bin/git -hardlink path=usr/lib/git-core/git-push target=../../bin/git -hardlink path=usr/lib/git-core/git-read-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-receive-pack target=../../bin/git -hardlink path=usr/lib/git-core/git-reflog target=../../bin/git -hardlink path=usr/lib/git-core/git-remote target=../../bin/git -hardlink path=usr/lib/git-core/git-remote-ftp target=git-remote-http -hardlink path=usr/lib/git-core/git-remote-ftps target=git-remote-http -hardlink path=usr/lib/git-core/git-remote-https target=git-remote-http -hardlink path=usr/lib/git-core/git-replace target=../../bin/git -hardlink path=usr/lib/git-core/git-repo-config target=../../bin/git -hardlink path=usr/lib/git-core/git-rerere target=../../bin/git -hardlink path=usr/lib/git-core/git-reset target=../../bin/git -hardlink path=usr/lib/git-core/git-rev-list target=../../bin/git -hardlink path=usr/lib/git-core/git-rev-parse target=../../bin/git -hardlink path=usr/lib/git-core/git-revert target=../../bin/git -hardlink path=usr/lib/git-core/git-rm target=../../bin/git -hardlink path=usr/lib/git-core/git-send-pack target=../../bin/git -hardlink path=usr/lib/git-core/git-shell target=../../bin/git-shell -hardlink path=usr/lib/git-core/git-shortlog target=../../bin/git -hardlink path=usr/lib/git-core/git-show target=../../bin/git -hardlink path=usr/lib/git-core/git-show-branch target=../../bin/git -hardlink path=usr/lib/git-core/git-show-ref target=../../bin/git -hardlink path=usr/lib/git-core/git-stage target=../../bin/git -hardlink path=usr/lib/git-core/git-status target=../../bin/git -hardlink path=usr/lib/git-core/git-stripspace target=../../bin/git -hardlink path=usr/lib/git-core/git-symbolic-ref target=../../bin/git -hardlink path=usr/lib/git-core/git-tag target=../../bin/git -hardlink path=usr/lib/git-core/git-tar-tree target=../../bin/git -hardlink path=usr/lib/git-core/git-unpack-file target=../../bin/git -hardlink path=usr/lib/git-core/git-unpack-objects target=../../bin/git -hardlink path=usr/lib/git-core/git-update-index target=../../bin/git -hardlink path=usr/lib/git-core/git-update-ref target=../../bin/git -hardlink path=usr/lib/git-core/git-update-server-info target=../../bin/git -hardlink path=usr/lib/git-core/git-upload-archive target=../../bin/git -hardlink path=usr/lib/git-core/git-upload-pack \ - target=../../bin/git-upload-pack -hardlink path=usr/lib/git-core/git-var target=../../bin/git -hardlink path=usr/lib/git-core/git-verify-pack target=../../bin/git -hardlink path=usr/lib/git-core/git-verify-tag target=../../bin/git -hardlink path=usr/lib/git-core/git-whatchanged target=../../bin/git -hardlink path=usr/lib/git-core/git-write-tree target=../../bin/git -legacy pkg=SUNWgit desc="GIT - Fast Version Control System (v1.7.5.4)" \ - name="git - Fast Version Control System" -license git.license license=GPLv2 -
--- a/components/git/patches/perl_Makefile.patch Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ ---- git-1.7.3.2/perl/Makefile_orig Thu Oct 21 20:49:16 2010 -+++ git-1.7.3.2/perl/Makefile Tue Mar 22 09:43:32 2011 -@@ -20,20 +20,18 @@ - $(RM) $(makfile).old - - ifdef NO_PERL_MAKEMAKER --instdir_SQ = $(subst ','\'',$(prefix)/lib) -+instdir_SQ = $(subst ','\'',$$(PERL_LIB)) - $(makfile): ../GIT-CFLAGS Makefile - echo all: private-Error.pm Git.pm > $@ - echo ' mkdir -p blib/lib' >> $@ - echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@ - echo ' $(RM) blib/lib/Error.pm' >> $@ -- '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ - echo ' cp private-Error.pm blib/lib/Error.pm' >> $@ - echo install: >> $@ -- echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@ -- echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@ -- echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ -- '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ -- echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ -+ echo ' mkdir -p "$$(DESTDIR)/$(instdir_SQ)"' >> $@ -+ echo ' $(RM) "$$(DESTDIR)/$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)/$(instdir_SQ)"' >> $@ -+ echo ' $(RM) "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@ -+ echo ' cp private-Error.pm "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@ - echo instlibdir: >> $@ - echo ' echo $(instdir_SQ)' >> $@ - else
--- a/components/ipcalc/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -include ../../make-rules/shared-macros.mk - -COMPONENT_NAME= ipcalc -COMPONENT_VERSION= 0.41 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:b75b498f2fa5ecfa30707a51da63c6a5775829f3 -COMPONENT_ARCHIVE_URL= http://jodies.de/ipcalc-archive/$(COMPONENT_ARCHIVE) - -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk - -build: prep - -install: build - [ -d $(PROTO_DIR) ] || $(MKDIR) $(PROTO_DIR) - -clean:: - [ -d $(BUILD_DIR) ] && rm -rf $(BUILD_DIR)
--- a/components/ipcalc/ipcalc.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -set name=pkg.fmri value=pkg:/network/ipcalc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="parameter calculator for IPv4 addresses" -set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities" -set name=info.upstream_url value="http://jodies.de/ipcalc" -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) - -license license license="GPLv2" - -dir path=usr -dir path=usr/bin -file ipcalc path=usr/bin/ipcalc
--- a/components/mercurial/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# -include ../../make-rules/shared-macros.mk - -PATH=/usr/bin:/usr/gnu/bin:/usr/sbin - -COMPONENT_NAME= mercurial -COMPONENT_VERSION= 1.8.4 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -$COMPONENT_ARCHIVE_HASH= sha1:394e95b3ddfb9b725368b81ad60dc39382fb9e12 -COMPONENT_ARCHIVE_URL= http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE) - -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk - -PKG_MACROS += PYTHON_LIB=$(PYTHON_LIB) -PKG_PROTO_DIRS += $(COMPONENT_SRC)/contrib -PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc - -# Set mod time of patched file from patch. Use this to ensure that the .py -# file consistently gets the same timestamp. -$(SOURCE_DIR)/.https_proxy.patched: GPATCH_FLAGS += -Z - -# common targets -build: $(BUILD_32) - -install: $(INSTALL_32) - -test: $(INSTALL_32) - (cd $(COMPONENT_SRC)/tests ; \ - PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) $(PYTHON) ./run-tests.py) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk
--- a/components/mercurial/mercurial.copyright Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,379 +0,0 @@ -Oracle elects to use only the GNU Lesser General Public License version -2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software -where a choice of LGPL/GPL license versions are made available with the -language indicating that LGPLv2.1/GPLv2 or any later version may be -used, or where a choice of which version of the LGPL/GPL is applied is -unspecified. Unless specifically stated otherwise, where a choice -exists between another license and either the GPL or the LGPL, Oracle -chooses the other license. --------------------------------------------------------------------- -Copyright (C) 2004, 2005 Canonical Ltd -Copyright (C) 2005 Paul Mackerras. All rights reserved. -Copyright (C) 2005 Steve Borho -Copyright (C) 2005 TK Soh. -Copyright (C) 2005-2008 by Intevation GmbH <[email protected]> -Copyright (C) 2006 Marco Barisione <[email protected]> -Copyright (C) 2006-2008 Brendan Cully <[email protected]> -Copyright (C) 2006 Jelmer Vernooij <[email protected]> -Copyright (C) 2007 Alexis S. L. Carvalho <[email protected]> -Copyright (C) 2007 Daniel Holth <[email protected]> -Copyright (C) 2007 Kevin Christen <[email protected]> -Copyright (c) 2008 Shun-ichi Goto <[email protected]> -Copyright 2001 Gareth Rees. All rights reserved. -Copyright (C) 2002-2004 Michael D. Stenner, Ryan Tomayko -Copyright 2004-2007 Ned Batchelder. All rights reserved. -Copyright 2005-2008 Matt Mackall <[email protected]> -Copyright 2005-2007 Benoit Boissinot <[email protected]> -Copyright 2005-2007 Chris Mason <[email protected]> -Copyright 2005-2008 Bryan O'Sullivan <[email protected]> -Copyright 2006 Eric Hopper <[email protected]> -Copyright 2006 Josef "Jeff" Sipek <[email protected]> -Copyright 2006 Vadim Gelfer <[email protected]> -Copyright 2007 Joel Rosdahl <[email protected]> -Copyright 2007 OHASHI Hideya <[email protected]> -Copyright 2007, 2008 Christian Ebert <[email protected]> -Copyright 2008 David Soria Parra <[email protected]> -Copyright 21 May 2005 - (c) 2005 Jake Edge <[email protected]> -Copyright (C) 2006 by Manpreet Singh -Copyright 2005 K. Thananchayan <[email protected]> --------------------------------------------------------------------- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - 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 -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 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 -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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 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 -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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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. - - <signature of Ty Coon>, 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.
--- a/components/mercurial/mercurial.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,446 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# - -<transform file path=usr.*/man/.+ -> default mangler.man.stability committed> - -# These are not installed, but can be found in the source contrib directory. -<transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<\1> > - -# We also ignore all dependencies implied by the demos. -<transform file path=usr/demo/mercurial/.+ -> set pkg.depend.bypass-generate .*> - -# And we don't create .pyc files for demo files. -<transform file path=usr/demo/mercurial/.*\.py$ -> default pkg.tmp.autopyc false> - -set name=pkg.fmri value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="The Mercurial Source Control Management System" -set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects." -set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" -set name=info.upstream_url value=http://mercurial.selenic.com/ -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) -set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2006/417 -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -license mercurial.copyright license='GPLv2+' - -dir path=usr -dir path=usr/bin -dir path=usr/demo -dir path=usr/demo/mercurial -dir path=usr/demo/mercurial/git-viz -dir path=usr/demo/mercurial/hgsh -dir path=usr/demo/mercurial/vim -dir path=usr/lib -dir path=usr/lib/python2.6 -dir path=$(PYTHON_LIB) -dir path=$(PYTHON_LIB)/hgext -dir path=$(PYTHON_LIB)/hgext/convert -dir path=$(PYTHON_LIB)/hgext/highlight -dir path=$(PYTHON_LIB)/hgext/zeroconf -dir path=$(PYTHON_LIB)/mercurial -dir path=$(PYTHON_LIB)/mercurial/help -dir path=$(PYTHON_LIB)/mercurial/hgweb -dir path=$(PYTHON_LIB)/mercurial/locale -dir path=$(PYTHON_LIB)/mercurial/locale/da -dir path=$(PYTHON_LIB)/mercurial/locale/da/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/de -dir path=$(PYTHON_LIB)/mercurial/locale/de/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/el -dir path=$(PYTHON_LIB)/mercurial/locale/el/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/fr -dir path=$(PYTHON_LIB)/mercurial/locale/fr/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/it -dir path=$(PYTHON_LIB)/mercurial/locale/it/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/ja -dir path=$(PYTHON_LIB)/mercurial/locale/ja/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/pt_BR -dir path=$(PYTHON_LIB)/mercurial/locale/pt_BR/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/ro -dir path=$(PYTHON_LIB)/mercurial/locale/ro/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/sv -dir path=$(PYTHON_LIB)/mercurial/locale/sv/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/zh_CN -dir path=$(PYTHON_LIB)/mercurial/locale/zh_CN/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/locale/zh_TW -dir path=$(PYTHON_LIB)/mercurial/locale/zh_TW/LC_MESSAGES -dir path=$(PYTHON_LIB)/mercurial/templates -dir path=$(PYTHON_LIB)/mercurial/templates/atom -dir path=$(PYTHON_LIB)/mercurial/templates/coal -dir path=$(PYTHON_LIB)/mercurial/templates/gitweb -dir path=$(PYTHON_LIB)/mercurial/templates/monoblue -dir path=$(PYTHON_LIB)/mercurial/templates/paper -dir path=$(PYTHON_LIB)/mercurial/templates/raw -dir path=$(PYTHON_LIB)/mercurial/templates/rss -dir path=$(PYTHON_LIB)/mercurial/templates/spartan -dir path=$(PYTHON_LIB)/mercurial/templates/static -dir path=usr/share -dir path=usr/share/man -dir path=usr/share/man/man1 -dir path=usr/share/man/man5 -file path=usr/bin/hg -file path=$(PYTHON_LIB)/hgext/__init__.py -file path=$(PYTHON_LIB)/hgext/acl.py -file path=$(PYTHON_LIB)/hgext/bugzilla.py -file path=$(PYTHON_LIB)/hgext/children.py -file path=$(PYTHON_LIB)/hgext/churn.py -file path=$(PYTHON_LIB)/hgext/color.py -file path=$(PYTHON_LIB)/hgext/convert/__init__.py -file path=$(PYTHON_LIB)/hgext/convert/bzr.py -file path=$(PYTHON_LIB)/hgext/convert/common.py -file path=$(PYTHON_LIB)/hgext/convert/convcmd.py -file path=$(PYTHON_LIB)/hgext/convert/cvs.py -file path=$(PYTHON_LIB)/hgext/convert/cvsps.py -file path=$(PYTHON_LIB)/hgext/convert/darcs.py -file path=$(PYTHON_LIB)/hgext/convert/filemap.py -file path=$(PYTHON_LIB)/hgext/convert/git.py -file path=$(PYTHON_LIB)/hgext/convert/gnuarch.py -file path=$(PYTHON_LIB)/hgext/convert/hg.py -file path=$(PYTHON_LIB)/hgext/convert/monotone.py -file path=$(PYTHON_LIB)/hgext/convert/p4.py -file path=$(PYTHON_LIB)/hgext/convert/subversion.py -file path=$(PYTHON_LIB)/hgext/convert/transport.py -file path=$(PYTHON_LIB)/hgext/eol.py -file path=$(PYTHON_LIB)/hgext/extdiff.py -file path=$(PYTHON_LIB)/hgext/fetch.py -file path=$(PYTHON_LIB)/hgext/gpg.py -file path=$(PYTHON_LIB)/hgext/graphlog.py -file path=$(PYTHON_LIB)/hgext/hgcia.py -file path=$(PYTHON_LIB)/hgext/hgk.py -file path=$(PYTHON_LIB)/hgext/highlight/__init__.py -file path=$(PYTHON_LIB)/hgext/highlight/highlight.py -file path=$(PYTHON_LIB)/hgext/interhg.py -file path=$(PYTHON_LIB)/hgext/keyword.py -file path=$(PYTHON_LIB)/hgext/mq.py -file path=$(PYTHON_LIB)/hgext/notify.py -file path=$(PYTHON_LIB)/hgext/pager.py -file path=$(PYTHON_LIB)/hgext/parentrevspec.py -file path=$(PYTHON_LIB)/hgext/patchbomb.py -file path=$(PYTHON_LIB)/hgext/progress.py -file path=$(PYTHON_LIB)/hgext/purge.py -file path=$(PYTHON_LIB)/hgext/rebase.py -file path=$(PYTHON_LIB)/hgext/record.py -file path=$(PYTHON_LIB)/hgext/relink.py -file path=$(PYTHON_LIB)/hgext/schemes.py -file path=$(PYTHON_LIB)/hgext/share.py -file path=$(PYTHON_LIB)/hgext/transplant.py -file path=$(PYTHON_LIB)/hgext/win32mbcs.py -file path=$(PYTHON_LIB)/hgext/win32text.py -file path=$(PYTHON_LIB)/hgext/zeroconf/Zeroconf.py -file path=$(PYTHON_LIB)/hgext/zeroconf/__init__.py -file path=$(PYTHON_LIB)/mercurial-$(COMPONENT_VERSION)-py2.6.egg-info -file path=$(PYTHON_LIB)/mercurial/__init__.py -file path=$(PYTHON_LIB)/mercurial/__version__.py -file path=$(PYTHON_LIB)/mercurial/ancestor.py -file path=$(PYTHON_LIB)/mercurial/archival.py -file path=$(PYTHON_LIB)/mercurial/base85.so -file path=$(PYTHON_LIB)/mercurial/bdiff.so -file path=$(PYTHON_LIB)/mercurial/bookmarks.py -file path=$(PYTHON_LIB)/mercurial/bundlerepo.py -file path=$(PYTHON_LIB)/mercurial/byterange.py -file path=$(PYTHON_LIB)/mercurial/changegroup.py -file path=$(PYTHON_LIB)/mercurial/changelog.py -file path=$(PYTHON_LIB)/mercurial/cmdutil.py -file path=$(PYTHON_LIB)/mercurial/commands.py -file path=$(PYTHON_LIB)/mercurial/config.py -file path=$(PYTHON_LIB)/mercurial/context.py -file path=$(PYTHON_LIB)/mercurial/copies.py -file path=$(PYTHON_LIB)/mercurial/dagparser.py -file path=$(PYTHON_LIB)/mercurial/demandimport.py -file path=$(PYTHON_LIB)/mercurial/diffhelpers.so -file path=$(PYTHON_LIB)/mercurial/dirstate.py -file path=$(PYTHON_LIB)/mercurial/discovery.py -file path=$(PYTHON_LIB)/mercurial/dispatch.py -file path=$(PYTHON_LIB)/mercurial/encoding.py -file path=$(PYTHON_LIB)/mercurial/error.py -file path=$(PYTHON_LIB)/mercurial/extensions.py -file path=$(PYTHON_LIB)/mercurial/fancyopts.py -file path=$(PYTHON_LIB)/mercurial/filelog.py -file path=$(PYTHON_LIB)/mercurial/filemerge.py -file path=$(PYTHON_LIB)/mercurial/graphmod.py -file path=$(PYTHON_LIB)/mercurial/hbisect.py -file path=$(PYTHON_LIB)/mercurial/help/config.txt -file path=$(PYTHON_LIB)/mercurial/help/dates.txt -file path=$(PYTHON_LIB)/mercurial/help/diffs.txt -file path=$(PYTHON_LIB)/mercurial/help/environment.txt -file path=$(PYTHON_LIB)/mercurial/help/extensions.txt -file path=$(PYTHON_LIB)/mercurial/help/glossary.txt -file path=$(PYTHON_LIB)/mercurial/help/hgweb.txt -file path=$(PYTHON_LIB)/mercurial/help/merge-tools.txt -file path=$(PYTHON_LIB)/mercurial/help/multirevs.txt -file path=$(PYTHON_LIB)/mercurial/help/patterns.txt -file path=$(PYTHON_LIB)/mercurial/help/revisions.txt -file path=$(PYTHON_LIB)/mercurial/help/revsets.txt -file path=$(PYTHON_LIB)/mercurial/help/subrepos.txt -file path=$(PYTHON_LIB)/mercurial/help/templates.txt -file path=$(PYTHON_LIB)/mercurial/help/urls.txt -file path=$(PYTHON_LIB)/mercurial/help.py -file path=$(PYTHON_LIB)/mercurial/hg.py -file path=$(PYTHON_LIB)/mercurial/hgweb/__init__.py -file path=$(PYTHON_LIB)/mercurial/hgweb/common.py -file path=$(PYTHON_LIB)/mercurial/hgweb/hgweb_mod.py -file path=$(PYTHON_LIB)/mercurial/hgweb/hgwebdir_mod.py -file path=$(PYTHON_LIB)/mercurial/hgweb/protocol.py -file path=$(PYTHON_LIB)/mercurial/hgweb/request.py -file path=$(PYTHON_LIB)/mercurial/hgweb/server.py -file path=$(PYTHON_LIB)/mercurial/hgweb/webcommands.py -file path=$(PYTHON_LIB)/mercurial/hgweb/webutil.py -file path=$(PYTHON_LIB)/mercurial/hgweb/wsgicgi.py -file path=$(PYTHON_LIB)/mercurial/hook.py -file path=$(PYTHON_LIB)/mercurial/httprepo.py -file path=$(PYTHON_LIB)/mercurial/i18n.py -file path=$(PYTHON_LIB)/mercurial/ignore.py -file path=$(PYTHON_LIB)/mercurial/keepalive.py -file path=$(PYTHON_LIB)/mercurial/locale/da/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/de/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/el/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/fr/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/it/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/ja/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/ro/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/sv/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo -file path=$(PYTHON_LIB)/mercurial/localrepo.py -file path=$(PYTHON_LIB)/mercurial/lock.py -file path=$(PYTHON_LIB)/mercurial/lsprof.py -file path=$(PYTHON_LIB)/mercurial/lsprofcalltree.py -file path=$(PYTHON_LIB)/mercurial/mail.py -file path=$(PYTHON_LIB)/mercurial/manifest.py -file path=$(PYTHON_LIB)/mercurial/match.py -file path=$(PYTHON_LIB)/mercurial/mdiff.py -file path=$(PYTHON_LIB)/mercurial/merge.py -file path=$(PYTHON_LIB)/mercurial/minirst.py -file path=$(PYTHON_LIB)/mercurial/mpatch.so -file path=$(PYTHON_LIB)/mercurial/node.py -file path=$(PYTHON_LIB)/mercurial/osutil.so -file path=$(PYTHON_LIB)/mercurial/parser.py -file path=$(PYTHON_LIB)/mercurial/parsers.so -file path=$(PYTHON_LIB)/mercurial/patch.py -file path=$(PYTHON_LIB)/mercurial/posix.py -file path=$(PYTHON_LIB)/mercurial/pushkey.py -file path=$(PYTHON_LIB)/mercurial/py3kcompat.py -file path=$(PYTHON_LIB)/mercurial/repair.py -file path=$(PYTHON_LIB)/mercurial/repo.py -file path=$(PYTHON_LIB)/mercurial/revlog.py -file path=$(PYTHON_LIB)/mercurial/revset.py -file path=$(PYTHON_LIB)/mercurial/similar.py -file path=$(PYTHON_LIB)/mercurial/simplemerge.py pkg.depend.bypass-generate=.* -file path=$(PYTHON_LIB)/mercurial/sshrepo.py -file path=$(PYTHON_LIB)/mercurial/sshserver.py -file path=$(PYTHON_LIB)/mercurial/statichttprepo.py -file path=$(PYTHON_LIB)/mercurial/store.py -file path=$(PYTHON_LIB)/mercurial/strutil.py -file path=$(PYTHON_LIB)/mercurial/subrepo.py -file path=$(PYTHON_LIB)/mercurial/tags.py -file path=$(PYTHON_LIB)/mercurial/templatefilters.py -file path=$(PYTHON_LIB)/mercurial/templatekw.py -file path=$(PYTHON_LIB)/mercurial/templater.py -file path=$(PYTHON_LIB)/mercurial/templates/atom/bookmarkentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/bookmarks.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/changelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/changelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/map -file path=$(PYTHON_LIB)/mercurial/templates/atom/tagentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/atom/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/coal/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/coal/map -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/bookmarks.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/branches.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changeset.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/fileannotate.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filediff.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filerevision.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/footer.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/graph.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/help.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/helptopics.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/index.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/manifest.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/map -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/notfound.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/search.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/shortlog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/summary.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/gitweb/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.changelog -file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.compact -file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.default -file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.xml -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/bookmarks.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/branches.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changeset.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/fileannotate.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filediff.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filerevision.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/footer.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/graph.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/help.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/helptopics.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/index.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/manifest.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/map -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/notfound.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/search.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/shortlog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/summary.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/monoblue/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/bookmarks.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/branches.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/changeset.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/fileannotate.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/filediff.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/filelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/filerevision.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/footer.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/graph.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/help.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/helptopics.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/index.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/manifest.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/map -file path=$(PYTHON_LIB)/mercurial/templates/paper/notfound.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/search.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/shortlog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/shortlogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/paper/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/changeset.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/fileannotate.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/filediff.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/index.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/manifest.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/raw/map -file path=$(PYTHON_LIB)/mercurial/templates/raw/notfound.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/bookmarkentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/bookmarks.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/changelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/changelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/filelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/map -file path=$(PYTHON_LIB)/mercurial/templates/rss/tagentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/rss/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/branches.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/changelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/changelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/changeset.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/error.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/fileannotate.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/filediff.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/filelog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/filelogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/filerevision.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/footer.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/graph.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/header.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/index.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/manifest.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/map -file path=$(PYTHON_LIB)/mercurial/templates/spartan/notfound.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/search.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/shortlog.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/shortlogentry.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/spartan/tags.tmpl -file path=$(PYTHON_LIB)/mercurial/templates/static/background.png -file path=$(PYTHON_LIB)/mercurial/templates/static/coal-file.png -file path=$(PYTHON_LIB)/mercurial/templates/static/coal-folder.png -file path=$(PYTHON_LIB)/mercurial/templates/static/excanvas.js -file path=$(PYTHON_LIB)/mercurial/templates/static/graph.js -file path=$(PYTHON_LIB)/mercurial/templates/static/hgicon.png -file path=$(PYTHON_LIB)/mercurial/templates/static/hglogo.png -file path=$(PYTHON_LIB)/mercurial/templates/static/style-coal.css -file path=$(PYTHON_LIB)/mercurial/templates/static/style-gitweb.css -file path=$(PYTHON_LIB)/mercurial/templates/static/style-monoblue.css -file path=$(PYTHON_LIB)/mercurial/templates/static/style-paper.css -file path=$(PYTHON_LIB)/mercurial/templates/static/style.css -file path=$(PYTHON_LIB)/mercurial/templates/template-vars.txt -file path=$(PYTHON_LIB)/mercurial/transaction.py -file path=$(PYTHON_LIB)/mercurial/ui.py -file path=$(PYTHON_LIB)/mercurial/url.py -file path=$(PYTHON_LIB)/mercurial/util.py -file path=$(PYTHON_LIB)/mercurial/verify.py -file path=$(PYTHON_LIB)/mercurial/win32.py -file path=$(PYTHON_LIB)/mercurial/windows.py -file path=$(PYTHON_LIB)/mercurial/wireproto.py - -file path=usr/demo/mercurial/bash_completion -file path=usr/demo/mercurial/check-code.py mode=555 -file path=usr/demo/mercurial/convert-repo mode=555 -file path=usr/demo/mercurial/debugshell.py -file path=usr/demo/mercurial/dumprevlog mode=555 -file path=usr/demo/mercurial/hg-ssh mode=555 -file path=usr/demo/mercurial/hgk mode=555 -file path=usr/demo/mercurial/hgsh/Makefile -file path=usr/demo/mercurial/hgsh/hgsh.c -file path=usr/demo/mercurial/hgweb.fcgi mode=555 -file path=usr/demo/mercurial/hgweb.wsgi -file path=usr/demo/mercurial/logo-droplets.svg -file path=usr/demo/mercurial/memory.py -file path=usr/demo/mercurial/mercurial.el -file path=usr/demo/mercurial/mergetools.hgrc -file path=usr/demo/mercurial/mq.el -file path=usr/demo/mercurial/perf.py -file path=usr/demo/mercurial/pylintrc -file path=usr/demo/mercurial/python-hook-examples.py -file path=usr/demo/mercurial/sample.hgrc -file path=usr/demo/mercurial/shrink-revlog.py -file path=usr/demo/mercurial/simplemerge mode=555 -file path=usr/demo/mercurial/tcsh_completion -file path=usr/demo/mercurial/tcsh_completion_build.sh mode=555 -file path=usr/demo/mercurial/tmplrewrite.py mode=555 -file path=usr/demo/mercurial/undumprevlog mode=555 -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 -file path=usr/demo/mercurial/vim/hgtest.vim -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 - -file hg.1 path=usr/share/man/man1/hg.1 -file hgignore.5 path=usr/share/man/man5/hgignore.5 -file hgrc.5 path=usr/share/man/man5/hgrc.5 - -legacy pkg=SUNWmercurial \ - desc="A fast, lightweight source control management system designed for efficient handling of very large distributed projects." \ - name="The Mercurial Source Control Management System"
--- a/components/mercurial/patches/https_proxy.patch Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -# 7029500 Mercurial doesn't work through https in snv_161 - ---- mercurial-1.8.2/mercurial/keepalive.py.orig Fri Apr 1 17:41:52 2011 -+++ mercurial-1.8.2/mercurial/keepalive.py Fri Apr 1 11:07:32 2011 -@@ -249,6 +249,8 @@ - else: - # no (working) free connections were found. Create a new one. - h = http_class(host) -+ if req._tunnel_host: -+ h._set_tunnel(req._tunnel_host) - if DEBUG: - DEBUG.info("creating new connection to %s (%d)", - host, id(h))
--- a/components/mercurial/patches/magic.patch Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ ---- mercurial-1.8.2/contrib/check-code.py.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/check-code.py Fri Apr 1 11:10:58 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # - # check-code - a style and portability checker for Mercurial - # ---- mercurial-1.8.2/contrib/convert-repo.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/convert-repo Fri Apr 1 11:11:01 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # - # Wrapper script around the convert.py hgext extension - # for foreign SCM conversion to mercurial format. ---- mercurial-1.8.2/contrib/dumprevlog.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/dumprevlog Fri Apr 1 11:11:03 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # Dump revlogs as raw data stream - # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump - ---- mercurial-1.8.2/contrib/hg-ssh.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/hg-ssh Fri Apr 1 11:11:05 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # - # Copyright 2005-2007 by Intevation GmbH <[email protected]> - # ---- mercurial-1.8.2/contrib/hgweb.fcgi.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/hgweb.fcgi Fri Apr 1 11:11:07 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # - # An example FastCGI script for use with flup, edit as necessary - ---- mercurial-1.8.2/contrib/simplemerge.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/simplemerge Fri Apr 1 11:11:08 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - - from mercurial import demandimport - demandimport.enable() ---- mercurial-1.8.2/contrib/undumprevlog.orig Fri Apr 1 10:41:52 2011 -+++ mercurial-1.8.2/contrib/undumprevlog Fri Apr 1 11:11:10 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2.6 - # Undump a dump from dumprevlog - # $ hg init - # $ undumprevlog < repo.dump
--- a/components/mercurial/patches/manpages.patch Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4922 +0,0 @@ -diff -ruN mercurial-1.8.4.orig/doc/hg.1 mercurial-1.8.4/doc/hg.1 ---- mercurial-1.8.4.orig/doc/hg.1 2011-06-01 22:32:50.000000000 +0100 -+++ mercurial-1.8.4/doc/hg.1 2011-06-06 14:50:45.342902665 +0100 -@@ -1,35 +1,9 @@ -+'\" t - .\" Man page generated from reStructeredText. - . - .TH HG 1 "" "" "Mercurial Manual" - .SH NAME - hg \- Mercurial source code management system --. --.nr rst2man-indent-level 0 --. --.de1 rstReportMargin --\\$1 \\n[an-margin] --level \\n[rst2man-indent-level] --level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] --- --\\n[rst2man-indent0] --\\n[rst2man-indent1] --\\n[rst2man-indent2] --.. --.de1 INDENT --.\" .rstReportMargin pre: --. RS \\$1 --. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] --. nr rst2man-indent-level +1 --.\" .rstReportMargin post: --.. --.de UNINDENT --. RE --.\" indent \\n[an-margin] --.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] --.nr rst2man-indent-level -1 --.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] --.in \\n[rst2man-indent\\n[rst2man-indent-level]]u --.. - .SH SYNOPSIS - .sp - \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]... -@@ -43,7 +17,7 @@ - .B files... - . - indicates one or more filename or relative path filenames; see --\%File Name Patterns\: for information on pattern matching -+File Name Patterns for information on pattern matching - .TP - .B path - . -@@ -73,7 +47,7 @@ - .TP - .B \-y, \-\-noninteractive - . --do not prompt, assume \(aqyes\(aq for any required answers -+do not prompt, assume 'yes' for any required answers - .TP - .B \-q, \-\-quiet - . -@@ -85,7 +59,7 @@ - .TP - .B \-\-config - . --set/override config option (use \(aqsection.name=value\(aq) -+set/override config option (use 'section.name=value') - .TP - .B \-\-debug - . -@@ -127,24 +101,24 @@ - .SS add - .sp - .nf --.ft C -+.ft - hg add [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Schedule files to be version controlled and added to the - repository. - .sp - The files will be added to the repository at the next commit. To --undo an add before that, see \%\fBhg forget\fP\:. -+undo an add before that, see \fBhg forget\fP. - .sp - If no names are given, add all files to the repository. - .sp - An example showing how new (unknown) files are added --automatically by \%\fBhg add\fP\:: -+automatically by \fBhg add\fP: - .sp - .nf --.ft C -+.ft - $ ls - foo.c - $ hg status -@@ -153,7 +127,7 @@ - adding foo.c - $ hg status - A foo.c --.ft P -+.ft - .fi - .sp - Returns 0 if all files are successfully added. -@@ -180,9 +154,9 @@ - .SS addremove - .sp - .nf --.ft C -+.ft - hg addremove [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Add all new files and remove all missing files from the -@@ -197,7 +171,7 @@ - every added file and records those similar enough as renames. This - option takes a percentage between 0 (disabled) and 100 (files must - be identical) as its parameter. Detecting renamed files this way --can be expensive. After using this option, \%\fBhg status \-C\fP\: can be -+can be expensive. After using this option, \fBhg status \-C\fP can be - used to check which files were identified as moved or renamed. - .sp - Returns 0 if all files are successfully added. -@@ -224,9 +198,9 @@ - .SS annotate - .sp - .nf --.ft C -+.ft - hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE... --.ft P -+.ft - .fi - .sp - List changes in files, showing the revision id responsible for -@@ -255,7 +229,7 @@ - .TP - .B \-\-no\-follow - . --don\(aqt follow copies and renames -+don't follow copies and renames - .TP - .B \-a, \-\-text - . -@@ -298,9 +272,9 @@ - .SS archive - .sp - .nf --.ft C -+.ft - hg archive [OPTION]... DEST --.ft P -+.ft - .fi - .sp - By default, the revision used is the parent of the working -@@ -338,7 +312,7 @@ - .UNINDENT - .sp - The exact name of the destination archive or directory is given --using a format string; see \%\fBhg help export\fP\: for details. -+using a format string; see \fBhg help export\fP for details. - .sp - Each member added to an archive file has a directory prefix - prepended. Use \-p/\-\-prefix to specify a format string for the -@@ -381,9 +355,9 @@ - .SS backout - .sp - .nf --.ft C -+.ft - hg backout [OPTION]... [\-r] REV --.ft P -+.ft - .fi - .sp - Prepare a new changeset with the effect of REV undone in the -@@ -399,11 +373,11 @@ - directory and a new child of REV that simply undoes REV. - .sp - Before version 1.7, the behavior without \-\-merge was equivalent to --specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to cancel -+specifying \-\-merge followed by \fBhg update \-\-clean .\fP to cancel - the merge and leave the child of REV as a head to be merged - separately. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Returns 0 on success. - .sp -@@ -453,9 +427,9 @@ - .SS bisect - .sp - .nf --.ft C -+.ft - hg bisect [\-gbsr] [\-U] [\-c CMD] [REV] --.ft P -+.ft - .fi - .sp - This command helps to find changesets which introduce problems. To -@@ -508,23 +482,23 @@ - .SS bookmarks - .sp - .nf --.ft C -+.ft - hg bookmarks [\-f] [\-d] [\-m NAME] [\-r REV] [NAME] --.ft P -+.ft - .fi - .sp - Bookmarks are pointers to certain commits that move when - committing. Bookmarks are local. They can be renamed, copied and --deleted. It is possible to use bookmark names in \%\fBhg merge\fP\: and --\%\fBhg update\fP\: to merge and update respectively to a given bookmark. -+deleted. It is possible to use bookmark names in \fBhg merge\fP and -+\fBhg update\fP to merge and update respectively to a given bookmark. - .sp --You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working --directory\(aqs parent revision with the given name. If you specify -+You can use \fBhg bookmark NAME\fP to set a bookmark on the working -+directory's parent revision with the given name. If you specify - a revision using \-r REV (where REV may be an existing bookmark), - the bookmark is assigned to that revision. - .sp --Bookmarks can be pushed and pulled between repositories (see \%\fBhg help --push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote -+Bookmarks can be pushed and pulled between repositories (see \fBhg help -+push\fP and \fBhg help pull\fP). This requires both the local and remote - repositories to support bookmarks. For versions prior to 1.8, this means - the bookmarks extension must be enabled. - .sp -@@ -550,26 +524,26 @@ - .SS branch - .sp - .nf --.ft C -+.ft - hg branch [\-fC] [NAME] --.ft P -+.ft - .fi - .sp - With no argument, show the current branch name. With one argument, - set the working directory branch name (the branch will not exist - in the repository until the next commit). Standard practice --recommends that primary development take place on the \(aqdefault\(aq -+recommends that primary development take place on the 'default' - branch. - .sp - Unless \-f/\-\-force is specified, branch will not let you set a --branch name that already exists, even if it\(aqs inactive. -+branch name that already exists, even if it's inactive. - .sp - Use \-C/\-\-clean to reset the working directory branch to that of - the parent of the working directory, negating a previous branch - change. - .sp --Use the command \%\fBhg update\fP\: to switch to an existing branch. Use --\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed. -+Use the command \fBhg update\fP to switch to an existing branch. Use -+\fBhg commit \-\-close\-branch\fP to mark this branch as closed. - .sp - Returns 0 on success. - .sp -@@ -587,19 +561,19 @@ - .SS branches - .sp - .nf --.ft C -+.ft - hg branches [\-ac] --.ft P -+.ft - .fi - .sp --List the repository\(aqs named branches, indicating which ones are -+List the repository's named branches, indicating which ones are - inactive. If \-c/\-\-closed is specified, also list branches which have --been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:). -+been marked closed (see \fBhg commit \-\-close\-branch\fP). - .sp - If \-a/\-\-active is specified, only show active branches. A branch - is considered active if it contains repository heads. - .sp --Use the command \%\fBhg update\fP\: to switch to an existing branch. -+Use the command \fBhg update\fP to switch to an existing branch. - .sp - Returns 0. - .sp -@@ -617,9 +591,9 @@ - .SS bundle - .sp - .nf --.ft C -+.ft - hg bundle [\-f] [\-t TYPE] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST] --.ft P -+.ft - .fi - .sp - Generate a compressed changegroup file collecting changesets not -@@ -686,9 +660,9 @@ - .SS cat - .sp - .nf --.ft C -+.ft - hg cat [OPTION]... FILE... --.ft P -+.ft - .fi - .sp - Print the specified files as they were at the given revision. If -@@ -706,7 +680,7 @@ - .TP - .B \fB%d\fP - .sp --dirname of file being printed, or \(aq.\(aq if in repository root -+dirname of file being printed, or '.' if in repository root - .TP - .B \fB%p\fP - .sp -@@ -741,9 +715,9 @@ - .SS clone - .sp - .nf --.ft C -+.ft - hg clone [OPTION]... SOURCE [DEST] --.ft P -+.ft - .fi - .sp - Create a copy of an existing repository in a new directory. -@@ -751,14 +725,14 @@ - If no destination directory name is specified, it defaults to the - basename of the source. - .sp --The location of the source is added to the new repository\(aqs -+The location of the source is added to the new repository's - \fB.hg/hgrc\fP file, as the default to be used for future pulls. - .sp --See \%\fBhg help urls\fP\: for valid source format details. -+See \fBhg help urls\fP for valid source format details. - .sp - It is possible to specify an \fBssh://\fP URL as the destination, but no - \fB.hg/hgrc\fP and working directory will be created on the remote side. --Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP URLs. -+Please see \fBhg help urls\fP for important details about \fBssh://\fP URLs. - .sp - A set of changesets (tags, or branch names) to pull may be specified - by listing each changeset (tag, or branch name) with \-r/\-\-rev. -@@ -769,7 +743,7 @@ - No subsequent changesets (including subsequent tags) will be present - in the destination. - .sp --Using \-r/\-\-rev (or \(aqclone src#rev dest\(aq) implies \-\-pull, even for -+Using \-r/\-\-rev (or 'clone src#rev dest') implies \-\-pull, even for - local source repositories. - .sp - For efficiency, hardlinks are used for cloning whenever the source -@@ -783,9 +757,9 @@ - using full hardlinks with - .sp - .nf --.ft C --$ cp \-al REPO REPOCLONE --.ft P -+.ft -+$ /usr/gnu/bin/cp \-al REPO REPOCLONE -+.ft - .fi - .sp - This is the fastest way to clone, but it is not always safe. The -@@ -804,7 +778,7 @@ - .IP b. 3 - . - if \-u . and the source repository is local, the first parent of --the source repository\(aqs working directory -+the source repository's working directory - .IP c. 3 - . - the changeset specified with \-u (if a branch name, this means the -@@ -870,16 +844,16 @@ - .SS commit - .sp - .nf --.ft C -+.ft - hg commit [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Commit changes to the given files into the repository. Unlike a - centralized SCM, this operation is a local operation. See --\%\fBhg push\fP\: for a way to actively distribute your changes. -+\fBhg push\fP for a way to actively distribute your changes. - .sp --If a list of files is omitted, all changes reported by \%\fBhg status\fP\: -+If a list of files is omitted, all changes reported by \fBhg status\fP - will be committed. - .sp - If you are committing the result of a merge, do not provide any -@@ -890,7 +864,7 @@ - commit fails, you will find a backup of your message in - \fB.hg/last\-message.txt\fP. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Returns 0 on success, 1 if nothing changed. - .sp -@@ -934,9 +908,9 @@ - .SS copy - .sp - .nf --.ft C -+.ft - hg copy [OPTION]... [SOURCE]... DEST --.ft P -+.ft - .fi - .sp - Mark dest as having copies of source files. If dest is a -@@ -948,7 +922,7 @@ - operation is recorded, but no copying is performed. - .sp - This command takes effect with the next commit. To undo a copy --before that, see \%\fBhg revert\fP\:. -+before that, see \fBhg revert\fP. - .sp - Returns 0 on success, 1 if errors are encountered. - .sp -@@ -980,9 +954,9 @@ - .SS diff - .sp - .nf --.ft C -+.ft - hg diff [OPTION]... ([\-c REV] | [\-r REV1 [\-r REV2]]) [FILE]... --.ft P -+.ft - .fi - .sp - Show differences between revisions for the specified files. -@@ -991,7 +965,7 @@ - .IP Note - . - diff may generate unexpected results for merges, as it will --default to comparing against the working directory\(aqs first -+default to comparing against the working directory's first - parent changeset if no revisions are specified. - .RE - .sp -@@ -1009,7 +983,7 @@ - anyway, probably with undesirable results. - .sp - Use the \-g/\-\-git option to generate diffs in the git extended diff --format. For more information, read \%\fBhg help diffs\fP\:. -+format. For more information, read \fBhg help diffs\fP. - .sp - Returns 0 on success. - .sp -@@ -1079,9 +1053,9 @@ - .SS export - .sp - .nf --.ft C -+.ft - hg export [OPTION]... [\-o OUTFILESPEC] REV... --.ft P -+.ft - .fi - .sp - Print the changeset header and diffs for one or more revisions. -@@ -1138,7 +1112,7 @@ - diff anyway, probably with undesirable results. - .sp - Use the \-g/\-\-git option to generate diffs in the git extended diff --format. See \%\fBhg help diffs\fP\: for more information. -+format. See \fBhg help diffs\fP for more information. - .sp - With the \-\-switch\-parent option, the diff will be against the - second parent. It can be useful to review a merge. -@@ -1175,9 +1149,9 @@ - .SS forget - .sp - .nf --.ft C -+.ft - hg forget [OPTION]... FILE... --.ft P -+.ft - .fi - .sp - Mark the specified files so they will no longer be tracked -@@ -1187,7 +1161,7 @@ - entire project history, and it does not delete them from the - working directory. - .sp --To undo a forget before the next commit, see \%\fBhg add\fP\:. -+To undo a forget before the next commit, see \fBhg add\fP. - .sp - Returns 0 on success. - .sp -@@ -1205,9 +1179,9 @@ - .SS grep - .sp - .nf --.ft C -+.ft - hg grep [OPTION]... PATTERN [FILE]... --.ft P -+.ft - .fi - .sp - Search revisions of files for a regular expression. -@@ -1275,9 +1249,9 @@ - .SS heads - .sp - .nf --.ft C -+.ft - hg heads [\-ac] [\-r STARTREV] [REV]... --.ft P -+.ft - .fi - .sp - With no arguments, show all repository branch heads. -@@ -1291,7 +1265,7 @@ - associated with the specified changesets are shown. - .sp - If \-c/\-\-closed is specified, also show branch heads marked closed --(see \%\fBhg commit \-\-close\-branch\fP\:). -+(see \fBhg commit \-\-close\-branch\fP). - .sp - If STARTREV is specified, only those heads that are descendants of - STARTREV will be displayed. -@@ -1331,9 +1305,9 @@ - .SS help - .sp - .nf --.ft C -+.ft - hg help [TOPIC] --.ft P -+.ft - .fi - .sp - With no arguments, print a list of commands with short help messages. -@@ -1345,9 +1319,9 @@ - .SS identify - .sp - .nf --.ft C -+.ft - hg identify [\-nibtB] [\-r REV] [SOURCE] --.ft P -+.ft - .fi - .sp - Print a summary identifying the repository state at REV using one or -@@ -1395,9 +1369,9 @@ - .SS import - .sp - .nf --.ft C -+.ft - hg import [OPTION]... PATCH... --.ft P -+.ft - .fi - .sp - Import a list of patches and commit them individually (unless -@@ -1413,7 +1387,7 @@ - text/plain body parts before first diff are added to commit - message. - .sp --If the imported patch was generated by \%\fBhg export\fP\:, user and -+If the imported patch was generated by \fBhg export\fP, user and - description from patch override values from message headers and - body. Values given on command line with \-m/\-\-message and \-u/\-\-user - override these. -@@ -1425,11 +1399,11 @@ - deficiencies in the text patch format. - .sp - With \-s/\-\-similarity, hg will attempt to discover renames and --copies in the patch in the same way as \(aqaddremove\(aq. -+copies in the patch in the same way as 'addremove'. - .sp - To read a patch from standard input, use "\-" as the patch name. If - a URL is specified, the patch will be downloaded from it. --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Returns 0 on success. - .sp -@@ -1450,7 +1424,7 @@ - .TP - .B \-\-no\-commit - . --don\(aqt commit, just update the working directory -+don't commit, just update the working directory - .TP - .B \-\-exact - . -@@ -1485,9 +1459,9 @@ - .SS incoming - .sp - .nf --.ft C -+.ft - hg incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE] --.ft P -+.ft - .fi - .sp - Show new changesets found in the specified path/URL or the default -@@ -1577,9 +1551,9 @@ - .SS init - .sp - .nf --.ft C -+.ft - hg init [\-e CMD] [\-\-remotecmd CMD] [DEST] --.ft P -+.ft - .fi - .sp - Initialize a new repository in the given directory. If the given -@@ -1588,7 +1562,7 @@ - If no directory is given, the current directory is used. - .sp - It is possible to specify an \fBssh://\fP URL as the destination. --See \%\fBhg help urls\fP\: for more information. -+See \fBhg help urls\fP for more information. - .sp - Returns 0 on success. - .sp -@@ -1610,9 +1584,9 @@ - .SS locate - .sp - .nf --.ft C -+.ft - hg locate [OPTION]... [PATTERN]... --.ft P -+.ft - .fi - .sp - Print files under Mercurial control in the working directory whose -@@ -1658,9 +1632,9 @@ - .SS log - .sp - .nf --.ft C -+.ft - hg log [OPTION]... [FILE] --.ft P -+.ft - .fi - .sp - Print the revision history of the specified files or the entire -@@ -1675,9 +1649,9 @@ - If no revision range is specified, the default is \fBtip:0\fP unless - \-\-follow is set, in which case the working directory parent is - used as the starting revision. You can specify a revision set for --log, see \%\fBhg help revsets\fP\: for more information. -+log, see \fBhg help revsets\fP for more information. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - By default this command prints revision number and changeset id, - tags, non\-trivial parents, user, date and time, and a summary for -@@ -1785,9 +1759,9 @@ - .SS manifest - .sp - .nf --.ft C -+.ft - hg manifest [\-r REV] --.ft P -+.ft - .fi - .sp - Print a list of version controlled files for the given revision. -@@ -1809,9 +1783,9 @@ - .SS merge - .sp - .nf --.ft C -+.ft - hg merge [\-P] [\-f] [[\-r] REV] --.ft P -+.ft - .fi - .sp - The current working directory is updated with all changes made in -@@ -1826,14 +1800,14 @@ - merges. It overrides the HGMERGE environment variable and your - configuration files. - .sp --If no revision is specified, the working directory\(aqs parent is a -+If no revision is specified, the working directory's parent is a - head revision, and the current branch contains exactly one other - head, the other head is merged with by default. Otherwise, an - explicit revision with which to merge with must be provided. - .sp --\%\fBhg resolve\fP\: must be used to resolve unresolved files. -+\fBhg resolve\fP must be used to resolve unresolved files. - .sp --To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which -+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which - will check out a clean copy of the original merge parent, losing - all changes. - .sp -@@ -1861,9 +1835,9 @@ - .SS outgoing - .sp - .nf --.ft C -+.ft - hg outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST] --.ft P -+.ft - .fi - .sp - Show changesets not found in the specified destination repository -@@ -1946,12 +1920,12 @@ - .SS parents - .sp - .nf --.ft C -+.ft - hg parents [\-r REV] [FILE] --.ft P -+.ft - .fi - .sp --Print the working directory\(aqs parent revisions. If a revision is -+Print the working directory's parent revisions. If a revision is - given via \-r/\-\-rev, the parent of that revision will be printed. - If a file argument is given, the revision in which the file was - last changed (before the working directory revision or the -@@ -1977,9 +1951,9 @@ - .SS paths - .sp - .nf --.ft C -+.ft - hg paths [NAME] --.ft P -+.ft - .fi - .sp - Show definition of symbolic path name NAME. If no name is given, -@@ -1997,18 +1971,18 @@ - as the fallback for both. When cloning a repository, the clone - source is written as \fBdefault\fP in \fB.hg/hgrc\fP. Note that - \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g. --\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and --\%\fBhg bundle\fP\:) operations. -+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and -+\fBhg bundle\fP) operations. - .sp --See \%\fBhg help urls\fP\: for more information. -+See \fBhg help urls\fP for more information. - .sp - Returns 0 on success. - .SS pull - .sp - .nf --.ft C -+.ft - hg pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE] --.ft P -+.ft - .fi - .sp - Pull changes from a remote repository to a local one. -@@ -2018,13 +1992,13 @@ - \-R is specified). By default, this does not update the copy of the - project in the working directory. - .sp --Use \%\fBhg incoming\fP\: if you want to see what would have been added -+Use \fBhg incoming\fP if you want to see what would have been added - by a pull at the time you issued this command. If you then decide --to add those changes to the repository, you should use \%\fBhg pull --\-r X\fP\: where \fBX\fP is the last changeset listed by \%\fBhg incoming\fP\:. -+to add those changes to the repository, you should use \fBhg pull -+\-r X\fP where \fBX\fP is the last changeset listed by \fBhg incoming\fP. - .sp --If SOURCE is omitted, the \(aqdefault\(aq path will be used. --See \%\fBhg help urls\fP\: for more information. -+If SOURCE is omitted, the 'default' path will be used. -+See \fBhg help urls\fP for more information. - .sp - Returns 0 on success, 1 if an update had unresolved files. - .sp -@@ -2066,9 +2040,9 @@ - .SS push - .sp - .nf --.ft C -+.ft - hg push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST] --.ft P -+.ft - .fi - .sp - Push changesets from the local repository to the specified -@@ -2092,7 +2066,7 @@ - If \-r/\-\-rev is used, the specified revision and all its ancestors - will be pushed to the remote repository. - .sp --Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP -+Please see \fBhg help urls\fP for important details about \fBssh://\fP - URLs. If DESTINATION is omitted, a default path will be used. - .sp - Returns 0 if push was successful, 1 if nothing to push. -@@ -2135,9 +2109,9 @@ - .SS recover - .sp - .nf --.ft C -+.ft - hg recover --.ft P -+.ft - .fi - .sp - Recover from an interrupted commit or pull. -@@ -2150,9 +2124,9 @@ - .SS remove - .sp - .nf --.ft C -+.ft - hg remove [OPTION]... FILE... --.ft P -+.ft - .fi - .sp - Schedule the indicated files for removal from the repository. -@@ -2166,21 +2140,21 @@ - The following table details the behavior of remove for different - file states (columns) and option combinations (rows). The file - states are Added [A], Clean [C], Modified [M] and Missing [!] (as --reported by \%\fBhg status\fP\:). The actions are Warn, Remove (from -+reported by \fBhg status\fP). The actions are Warn, Remove (from - branch) and Delete (from disk): - .sp - .nf --.ft C -+.ft - A C M ! - none W RD W R - \-f R RD RD R - \-A W W W R - \-Af R R R R --.ft P -+.ft - .fi - .sp - This command schedules the files to be removed at the next commit. --To undo a remove before that, see \%\fBhg revert\fP\:. -+To undo a remove before that, see \fBhg revert\fP. - .sp - Returns 0 on success, 1 if any warnings encountered. - .sp -@@ -2208,9 +2182,9 @@ - .SS rename - .sp - .nf --.ft C -+.ft - hg rename [OPTION]... SOURCE... DEST --.ft P -+.ft - .fi - .sp - Mark dest as copies of sources; mark sources for deletion. If dest -@@ -2222,7 +2196,7 @@ - operation is recorded, but no copying is performed. - .sp - This command takes effect at the next commit. To undo a rename --before that, see \%\fBhg revert\fP\:. -+before that, see \fBhg revert\fP. - .sp - Returns 0 on success, 1 if errors are encountered. - .sp -@@ -2254,23 +2228,23 @@ - .SS resolve - .sp - .nf --.ft C -+.ft - hg resolve [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Merges with unresolved conflicts are often the result of - non\-interactive merging using the \fBinternal:merge\fP configuration - setting, or a command\-line merge tool like \fBdiff3\fP. The resolve - command is used to manage the files involved in a merge, after --\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the -+\fBhg merge\fP has been run, and before \fBhg commit\fP is run (i.e. the - working directory must have two parents). - .sp - The resolve command can be used in the following ways: - .INDENT 0.0 - .IP \(bu 2 - . --\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified -+\fBhg resolve [\-\-tool TOOL] FILE...\fP: attempt to re\-merge the specified - files, discarding any previous merge attempts. Re\-merging is not - performed for files already marked as resolved. Use \fB\-\-all/\-a\fP - to selects all unresolved files. \fB\-\-tool\fP can be used to specify -@@ -2278,21 +2252,21 @@ - environment variable and your configuration files. - .IP \(bu 2 - . --\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved -+\fBhg resolve \-m [FILE]\fP: mark a file as having been resolved - (e.g. after having manually fixed\-up the files). The default is - to mark all unresolved files. - .IP \(bu 2 - . --\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The -+\fBhg resolve \-u [FILE]...\fP: mark a file as unresolved. The - default is to mark all resolved files. - .IP \(bu 2 - . --\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts. -+\fBhg resolve \-l\fP: list files which had or still have conflicts. - In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved. - .UNINDENT - .sp - Note that Mercurial will not let you commit files with unresolved --merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can -+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can - commit after a conflicting merge. - .sp - Returns 0 on success, 1 if any files fail a resolve attempt. -@@ -2335,17 +2309,17 @@ - .SS revert - .sp - .nf --.ft C -+.ft - hg revert [OPTION]... [\-r REV] [NAME]... --.ft P -+.ft - .fi - .IP Note - . - This command is most likely not what you are looking for. - Revert will partially overwrite content in the working - directory without changing the working directory parents. Use --\%\fBhg update \-r rev\fP\: to check out earlier revisions, or --\%\fBhg update \-\-clean .\fP\: to undo a merge which has added another -+\fBhg update \-r rev\fP to check out earlier revisions, or -+\fBhg update \-\-clean .\fP to undo a merge which has added another - parent. - .RE - .sp -@@ -2358,8 +2332,8 @@ - .sp - Using the \-r/\-\-rev option, revert the given files or directories - to their contents as of a specific revision. This can be helpful --to "roll back" some or all of an earlier change. See \%\fBhg help --dates\fP\: for a list of formats valid for \-d/\-\-date. -+to "roll back" some or all of an earlier change. See \fBhg help -+dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Revert modifies the working directory. It does not commit any - changes, or change the parent of the working directory. If you -@@ -2412,9 +2386,9 @@ - .SS rollback - .sp - .nf --.ft C -+.ft - hg rollback --.ft P -+.ft - .fi - .sp - This command should be used with care. There is only one level of -@@ -2464,9 +2438,9 @@ - .SS root - .sp - .nf --.ft C -+.ft - hg root --.ft P -+.ft - .fi - .sp - Print the root directory of the current repository. -@@ -2475,9 +2449,9 @@ - .SS serve - .sp - .nf --.ft C -+.ft - hg serve [OPTION]... --.ft P -+.ft - .fi - .sp - Start a local HTTP repository browser and pull server. You can use -@@ -2571,9 +2545,9 @@ - .SS showconfig - .sp - .nf --.ft C -+.ft - hg showconfig [\-u] [NAME]... --.ft P -+.ft - .fi - .sp - With no arguments, print names and values of all config items. -@@ -2601,9 +2575,9 @@ - .SS status - .sp - .nf --.ft C -+.ft - hg status [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Show status of files in the repository. If names are given, only -@@ -2631,7 +2605,7 @@ - The codes used to show the status of files are: - .sp - .nf --.ft C -+.ft - M = modified - A = added - R = removed -@@ -2640,7 +2614,7 @@ - ? = not tracked - I = ignored - = origin of the previous file listed as A (added) --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -2717,9 +2691,9 @@ - .SS summary - .sp - .nf --.ft C -+.ft - hg summary [\-\-remote] --.ft P -+.ft - .fi - .sp - This generates a brief summary of the working directory state, -@@ -2742,9 +2716,9 @@ - .SS tag - .sp - .nf --.ft C -+.ft - hg tag [\-f] [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME... --.ft P -+.ft - .fi - .sp - Name a particular revision using <name>. -@@ -2765,11 +2739,11 @@ - repositories). - .sp - Tag commits are usually made at the head of a branch. If the parent --of the working directory is not a branch head, \%\fBhg tag\fP\: aborts; use -+of the working directory is not a branch head, \fBhg tag\fP aborts; use - \-f/\-\-force to force the tag commit to be based on a non\-head - changeset. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Since tag names have priority over branch names during revision - lookup, using an existing branch name as a tag name is discouraged. -@@ -2814,9 +2788,9 @@ - .SS tags - .sp - .nf --.ft C -+.ft - hg tags --.ft P -+.ft - .fi - .sp - This lists both regular and local tags. When the \-v/\-\-verbose -@@ -2826,9 +2800,9 @@ - .SS tip - .sp - .nf --.ft C -+.ft - hg tip [\-p] [\-g] --.ft P -+.ft - .fi - .sp - The tip revision (usually just called the tip) is the changeset -@@ -2864,9 +2838,9 @@ - .SS unbundle - .sp - .nf --.ft C -+.ft - hg unbundle [\-u] FILE... --.ft P -+.ft - .fi - .sp - Apply one or more compressed changegroup files generated by the -@@ -2884,16 +2858,16 @@ - .SS update - .sp - .nf --.ft C -+.ft - hg update [\-c] [\-C] [\-d DATE] [[\-r] REV] --.ft P -+.ft - .fi - .sp --Update the repository\(aqs working directory to the specified -+Update the repository's working directory to the specified - changeset. If no changeset is specified, update to the tip of the - current named branch. - .sp --If the changeset is not a descendant of the working directory\(aqs -+If the changeset is not a descendant of the working directory's - parent, the update is aborted. With the \-c/\-\-check option, the - working directory is checked for uncommitted changes; if none are - found, the working directory is updated to the specified -@@ -2906,7 +2880,7 @@ - . - If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if - the requested changeset is an ancestor or descendant of --the working directory\(aqs parent, the uncommitted changes -+the working directory's parent, the uncommitted changes - are merged into the requested changeset and the merged - result is left uncommitted. If the requested changeset is - not an ancestor or descendant (that is, it is on another -@@ -2923,12 +2897,12 @@ - .UNINDENT - .sp - Use null as the changeset to remove the working directory (like --\%\fBhg clone \-U\fP\:). -+\fBhg clone \-U\fP). - .sp - If you want to update just one file to an older changeset, use --\%\fBhg revert\fP\:. -+\fBhg revert\fP. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Returns 0 on success, 1 if there are unresolved files. - .sp -@@ -2956,14 +2930,14 @@ - .SS verify - .sp - .nf --.ft C -+.ft - hg verify --.ft P -+.ft - .fi - .sp - Verify the integrity of the current repository. - .sp --This will perform an extensive check of the repository\(aqs -+This will perform an extensive check of the repository's - integrity, validating the hashes and checksums of each entry in - the changelog, manifest, and tracked files, as well as the - integrity of their crosslinks and indices. -@@ -2972,9 +2946,9 @@ - .SS version - .sp - .nf --.ft C -+.ft - hg version --.ft P -+.ft - .fi - .sp - output version and copyright information -@@ -3046,9 +3020,9 @@ - the active user, Mercurial will warn you that the file is skipped: - .sp - .nf --.ft C -+.ft - not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP --.ft P -+.ft - .fi - .sp - If this bothers you, the warning can be silenced (the file would still -@@ -3071,11 +3045,11 @@ - and followed by \fBname = value\fP entries: - .sp - .nf --.ft C -+.ft - [ui] - username = Firstname Lastname <[email protected]> - verbose = True --.ft P -+.ft - .fi - .sp - The above entries will be referred to as \fBui.username\fP and -@@ -3087,7 +3061,7 @@ - on Unix\-like systems: \fBman hgrc\fP - .IP \(bu 2 - . --online: \%http://www.selenic.com/mercurial/hgrc.5.html\: -+online: http://www.selenic.com/mercurial/hgrc.5.html - .UNINDENT - .SH DATE FORMATS - .sp -@@ -3144,7 +3118,7 @@ - \fB12/6/6\fP (Dec 6 2006) - .UNINDENT - .sp --Lastly, there is Mercurial\(aqs internal format: -+Lastly, there is Mercurial's internal format: - .INDENT 0.0 - .IP \(bu 2 - . -@@ -3203,17 +3177,17 @@ - Plain examples: - .sp - .nf --.ft C -+.ft - path:foo/bar a name bar in a directory named foo in the root - of the repository - path:path:name a file or directory named "path:name" --.ft P -+.ft - .fi - .sp - Glob examples: - .sp - .nf --.ft C -+.ft - glob:*.c any name ending in ".c" in the current directory - *.c any name ending in ".c" in the current directory - **.c any name ending in ".c" in any subdirectory of the -@@ -3221,34 +3195,34 @@ - foo/*.c any name ending in ".c" in the directory foo - foo/**.c any name ending in ".c" in any subdirectory of foo - including itself. --.ft P -+.ft - .fi - .sp - Regexp examples: - .sp - .nf --.ft C -+.ft - re:.*\e.c$ any name ending in ".c", anywhere in the repository --.ft P -+.ft - .fi - .sp - File examples: - .sp - .nf --.ft C -+.ft - listfile:list.txt read list from list.txt with one file pattern per line - listfile0:list.txt read list from list.txt with null byte delimiters --.ft P -+.ft - .fi - .SH ENVIRONMENT VARIABLES - .INDENT 0.0 - .TP - .B HG - . --Path to the \(aqhg\(aq executable, automatically passed when running -+Path to the 'hg' executable, automatically passed when running - hooks, extensions or external tools. If unset or empty, this is --the hg executable\(aqs name if it\(aqs frozen, or an executable named --\(aqhg\(aq (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on -+the hg executable's name if it's frozen, or an executable named -+\'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on - Windows) is searched. - .TP - .B HGEDITOR -@@ -3266,16 +3240,16 @@ - .TP - .B HGENCODINGMODE - . --This sets Mercurial\(aqs behavior for handling unknown characters -+This sets Mercurial's behavior for handling unknown characters - while transcoding user input. The default is "strict", which --causes Mercurial to abort if it can\(aqt map a character. Other -+causes Mercurial to abort if it can't map a character. Other - settings include "replace", which replaces unknown characters, and - "ignore", which drops them. This setting can be overridden with - the \-\-encodingmode command\-line option. - .TP - .B HGENCODINGAMBIGUOUS - . --This sets Mercurial\(aqs behavior for handling characters with -+This sets Mercurial's behavior for handling characters with - "ambiguous" widths like accented Latin characters with East Asian - fonts. By default, Mercurial assumes ambiguous characters are - narrow, set this variable to "wide" if such characters cause -@@ -3300,7 +3274,7 @@ - .INDENT 7.0 - .IP \(bu 2 - . --if it\(aqs a directory, all files ending with .rc are added -+if it's a directory, all files ending with .rc are added - .IP \(bu 2 - . - otherwise, the file itself will be added -@@ -3309,7 +3283,7 @@ - .B HGPLAIN - . - When set, this disables any configuration settings that might --change Mercurial\(aqs default output. This includes encoding, -+change Mercurial's default output. This includes encoding, - defaults, verbose mode, debug mode, quiet mode, tracebacks, and - localization. This can be useful when scripting against Mercurial - in the face of existing user configuration. -@@ -3360,7 +3334,7 @@ - editor it uses is determined by looking at the environment - variables HGEDITOR, VISUAL and EDITOR, in that order. The first - non\-empty one is chosen. If all of them are empty, the editor --defaults to \(aqvi\(aq. -+defaults to 'vi'. - .TP - .B PYTHONPATH - . -@@ -3428,7 +3402,7 @@ - .sp - Special characters can be used in quoted identifiers by escaping them, - e.g., \fB\en\fP is interpreted as a newline. To prevent them from being --interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP. -+interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP. - .sp - There is a single prefix operator: - .INDENT 0.0 -@@ -3474,10 +3448,10 @@ - .\" predicatesmarker - . - .sp --Command line equivalents for \%\fBhg log\fP\:: -+Command line equivalents for \fBhg log\fP: - .sp - .nf --.ft C -+.ft - \-f \-> ::. - \-d x \-> date(x) - \-k x \-> keyword(x) -@@ -3486,7 +3460,7 @@ - \-b x \-> branch(x) - \-P x \-> !::x - \-l x \-> limit(expr, x) --.ft P -+.ft - .fi - .sp - Some sample queries: -@@ -3496,27 +3470,27 @@ - Changesets on the default branch: - .sp - .nf --.ft C -+.ft - hg log \-r "branch(default)" --.ft P -+.ft - .fi - .IP \(bu 2 - . - Changesets on the default branch since tag 1.5 (excluding merges): - .sp - .nf --.ft C -+.ft - hg log \-r "branch(default) and 1.5:: and not merge()" --.ft P -+.ft - .fi - .IP \(bu 2 - . - Open branch heads: - .sp - .nf --.ft C -+.ft - hg log \-r "head() and not closed()" --.ft P -+.ft - .fi - .IP \(bu 2 - . -@@ -3524,18 +3498,18 @@ - \fBhgext/*\fP: - .sp - .nf --.ft C --hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)" --.ft P -+.ft -+hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')" -+.ft - .fi - .IP \(bu 2 - . - Changesets committed in May 2008, sorted by user: - .sp - .nf --.ft C --hg log \-r "sort(date(\(aqMay 2008\(aq), user)" --.ft P -+.ft -+hg log \-r "sort(date('May 2008'), user)" -+.ft - .fi - .IP \(bu 2 - . -@@ -3543,14 +3517,14 @@ - release: - .sp - .nf --.ft C -+.ft - hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())" --.ft P -+.ft - .fi - .UNINDENT - .SH DIFF FORMATS - .sp --Mercurial\(aqs default format for showing changes between two versions of -+Mercurial's default format for showing changes between two versions of - a file is compatible with the unified format of GNU diff, which can be - used by GNU patch and many other standard tools. - .sp -@@ -3577,15 +3551,15 @@ - format. - .sp - This means that when generating diffs from a Mercurial repository --(e.g. with \%\fBhg export\fP\:), you should be careful about things like file -+(e.g. with \fBhg export\fP), you should be careful about things like file - copies and renames or other things mentioned above, because when - applying a standard diff to a different repository, this extra --information is lost. Mercurial\(aqs internal operations (like push and -+information is lost. Mercurial's internal operations (like push and - pull) are not affected by this, because they use an internal binary - format for communicating changes. - .sp - To make Mercurial produce the git extended diff format, use the \-\-git --option available for many commands, or set \(aqgit = True\(aq in the [diff] -+option available for many commands, or set 'git = True' in the [diff] - section of your configuration file. You do not need to set this option - when importing diffs in this format or using them in the mq extension. - .SH MERGE TOOLS -@@ -3597,8 +3571,8 @@ - ancestor of the two file versions, so they can determine the changes - made on both branches. - .sp --Merge tools are used both for \%\fBhg resolve\fP\:, \%\fBhg merge\fP\:, \%\fBhg update\fP\:, --\%\fBhg backout\fP\: and in several extensions. -+Merge tools are used both for \fBhg resolve\fP, \fBhg merge\fP, \fBhg update\fP, -+\fBhg backout\fP and in several extensions. - .sp - Usually, the merge tool tries to automatically reconcile the files by - combining all non\-overlapping changes that occurred separately in -@@ -3706,7 +3680,7 @@ - .IP Note - . - After selecting a merge program, Mercurial will by default attempt --to merge the files using a simple merge algorithm first. Only if it doesn\(aqt -+to merge the files using a simple merge algorithm first. Only if it doesn't - succeed because of conflicting changes Mercurial will actually execute the - merge program. Whether to use the simple merge algorithm first can be - controlled by the premerge setting of the merge tool. Premerge is enabled by -@@ -3731,19 +3705,19 @@ - Usage: - .sp - .nf --.ft C -+.ft - $ hg log \-r1 \-\-style changelog --.ft P -+.ft - .fi - .sp - A template is a piece of text, with markup to invoke variable - expansion: - .sp - .nf --.ft C -+.ft - $ hg log \-r1 \-\-template "{node}\en" - b56ce7b07c52de7d5fd79fb89701ea538af65746 --.ft P -+.ft - .fi - .sp - Strings in curly braces are called keywords. The availability of -@@ -3840,15 +3814,15 @@ - The "date" keyword does not produce human\-readable output. If you - want to use a date in your output, you can use a filter to process - it. Filters are functions which return a string based on the input --variable. Be sure to use the stringify filter first when you\(aqre -+variable. Be sure to use the stringify filter first when you're - applying a string\-input filter to a list\-like input variable. - You can also use a chain of filters to get the desired output: - .sp - .nf --.ft C -+.ft - $ hg tip \-\-template "{date|isodate}\en" - 2008\-08\-21 18:22 +0000 --.ft P -+.ft - .fi - .sp - List of filters: -@@ -3917,7 +3891,7 @@ - .TP - .B nonempty - . --Any text. Returns \(aq(none)\(aq if the string is empty. -+Any text. Returns '(none)' if the string is empty. - .TP - .B hgdate - . -@@ -3995,24 +3969,24 @@ - Valid URLs are of the form: - .sp - .nf --.ft C -+.ft - local/filesystem/path[#revision] - file://local/filesystem/path[#revision] - http://[user[:pass]@]host[:port]/[path][#revision] - https://[user[:pass]@]host[:port]/[path][#revision] - ssh://[user@]host[:port]/[path][#revision] --.ft P -+.ft - .fi - .sp - Paths in the local filesystem can either point to Mercurial --repositories or to bundle files (as created by \%\fBhg bundle\fP\: or :hg:\(ga --incoming \-\-bundle\(ga). See also \%\fBhg help paths\fP\:. -+repositories or to bundle files (as created by \fBhg bundle\fP or :hg:\(ga -+incoming \-\-bundle\(ga). See also \fBhg help paths\fP. - .sp - An optional identifier after # indicates a particular branch, tag, or --changeset to use from the remote repository. See also \%\fBhg help --revisions\fP\:. -+changeset to use from the remote repository. See also \fBhg help -+revisions\fP. - .sp --Some features, such as pushing to \%http://\: and \%https://\: URLs are only -+Some features, such as pushing to http:// and https:// URLs are only - possible if the feature is explicitly enabled on the remote Mercurial - server. - .sp -@@ -4027,26 +4001,26 @@ - and a copy of hg in the remote path or specified with as remotecmd. - .IP \(bu 2 - . --path is relative to the remote user\(aqs home directory by default. Use -+path is relative to the remote user's home directory by default. Use - an extra slash at the start of a path to specify an absolute path: - .sp - .nf --.ft C -+.ft - ssh://example.com//tmp/repository --.ft P -+.ft - .fi - .IP \(bu 2 - . --Mercurial doesn\(aqt use its own compression via SSH; the right thing -+Mercurial doesn't use its own compression via SSH; the right thing - to do is to configure it in your ~/.ssh/config, e.g.: - .sp - .nf --.ft C -+.ft - Host *.mylocalnetwork.example.com - Compression no - Host * - Compression yes --.ft P -+.ft - .fi - .sp - Alternatively specify "ssh \-C" as your ssh command in your -@@ -4057,16 +4031,16 @@ - aliases under the [paths] section like so: - .sp - .nf --.ft C -+.ft - [paths] - alias1 = URL1 - alias2 = URL2 - \&... --.ft P -+.ft - .fi - .sp - You can then use the alias for any command that uses a URL (for --example \%\fBhg pull alias1\fP\: will be treated as \%\fBhg pull URL1\fP\:). -+example \fBhg pull alias1\fP will be treated as \fBhg pull URL1\fP). - .sp - Two path aliases are special because they are used as defaults when - you do not provide the URL to a command: -@@ -4075,14 +4049,14 @@ - .B default: - . - When you create a repository with hg clone, the clone command saves --the location of the source repository as the new repository\(aqs --\(aqdefault\(aq path. This is then used when you omit path from push\- and -+the location of the source repository as the new repository's -+\'default' path. This is then used when you omit path from push\- and - pull\-like commands (including incoming and outgoing). - .TP - .B default\-push: - . --The push command will look for a path named \(aqdefault\-push\(aq, and --prefer it over \(aqdefault\(aq if both are defined. -+The push command will look for a path named 'default\-push', and -+prefer it over 'default' if both are defined. - .UNINDENT - .SH USING ADDITIONAL FEATURES - .sp -@@ -4104,32 +4078,32 @@ - like this: - .sp - .nf --.ft C -+.ft - [extensions] - foo = --.ft P -+.ft - .fi - .sp - You may also specify the full path to an extension: - .sp - .nf --.ft C -+.ft - [extensions] - myfeature = ~/.hgext/myfeature.py --.ft P -+.ft - .fi - .sp - To explicitly disable an extension enabled in a configuration file of - broader scope, prepend its path with !: - .sp - .nf --.ft C -+.ft - [extensions] - # disabling extension bar residing in /path/to/extension/bar.py - bar = !/path/to/extension/bar.py - # ditto, but no path was supplied for extension baz - baz = ! --.ft P -+.ft - .fi - .sp - disabled extensions: -@@ -4195,7 +4169,7 @@ - .TP - .B inotify - . --accelerate status report using Linux\(aqs inotify service -+accelerate status report using Linux's inotify service - .TP - .B interhg - . -@@ -4293,7 +4267,7 @@ - .INDENT 3.0 - .INDENT 3.5 - .sp --path/to/nested = \%https://example.com/nested/repo/path\: -+path/to/nested = https://example.com/nested/repo/path - .UNINDENT - .UNINDENT - .sp -@@ -4368,7 +4342,7 @@ - their state and finally committing it in the parent - repository. Mercurial can be made to abort if any subrepository - content is modified by setting "ui.commitsubrepos=no" in a --configuration file (see \%\fBhg help config\fP\:). -+configuration file (see \fBhg help config\fP). - .TP - .B diff - . -@@ -4392,7 +4366,7 @@ - .B pull - . - pull is not recursive since it is not clear what to pull prior --to running \%\fBhg update\fP\:. Listing and retrieving all -+to running \fBhg update\fP. Listing and retrieving all - subrepositories changes referenced by the parent repository pulled - changesets is expensive at best, impossible in the Subversion - case. -@@ -4429,7 +4403,7 @@ - hgrc(5) for more details. - .SH CONFIGURING HGWEB - .sp --Mercurial\(aqs internal web server, hgweb, can serve either a single -+Mercurial's internal web server, hgweb, can serve either a single - repository, or a collection of them. In the latter case, a special - configuration file can be used to specify the repository paths to use - and global web configuration options. -@@ -4453,21 +4427,21 @@ - .UNINDENT - .sp - The \fBweb\fP section can specify all the settings described in the web --section of the hgrc(5) documentation. See \%\fBhg help config\fP\: for -+section of the hgrc(5) documentation. See \fBhg help config\fP\: for - information on where to find the manual page. - .sp - The \fBpaths\fP section provides mappings of physical repository - paths to virtual ones. For instance: - .sp - .nf --.ft C -+.ft - [paths] - projects/a = /foo/bar - projects/b = /baz/quux - web/root = /real/root/* - / = /real/root2/* - virtual/root2 = /real/root2/** --.ft P -+.ft - .fi - .INDENT 0.0 - .IP \(bu 2 -@@ -4476,14 +4450,14 @@ - appear under the same directory in the web interface - .IP \(bu 2 - . --The third entry maps every Mercurial repository found in \(aq/real/root\(aq --into \(aqweb/root\(aq. This format is preferred over the [collections] one, -+The third entry maps every Mercurial repository found in '/real/root' -+into 'web/root'. This format is preferred over the [collections] one, - since using absolute paths as configuration keys is not supported on every - platform (especially on Windows). - .IP \(bu 2 - . - The fourth entry is a special case mapping all repositories in --\(aq/real/root2\(aq in the root of the virtual directory. -+\'/real/root2' in the root of the virtual directory. - .IP \(bu 2 - . - The fifth entry recursively finds all repositories under the real -@@ -4495,10 +4469,10 @@ - preferred. For instance: - .sp - .nf --.ft C -+.ft - [collections] - /foo = /foo --.ft P -+.ft - .fi - .sp - Here, the left side will be stripped off all repositories found in the -@@ -4513,15 +4487,15 @@ - changesets from a given changeset. More precisely, the ancestors - of a changeset can be defined by two properties: a parent of a - changeset is an ancestor, and a parent of an ancestor is an --ancestor. See also: \(aqDescendant\(aq. -+ancestor. See also: 'Descendant'. - .TP - .B Branch - . - (Noun) A child changeset that has been created from a parent that - is not a head. These are known as topological branches, see --\(aqBranch, topological\(aq. If a topological branch is named, it becomes -+\'Branch, topological'. If a topological branch is named, it becomes - a named branch. If a topological branch is not named, it becomes --an anonymous branch. See \(aqBranch, anonymous\(aq and \(aqBranch, named\(aq. -+an anonymous branch. See 'Branch, anonymous' and 'Branch, named'. - .sp - Branches may be created when changes are pulled from or pushed to - a remote repository, since new heads may be created by these -@@ -4536,7 +4510,7 @@ - (Verb) The action of creating a child changeset which results in - its parent having more than one child. - .sp --Example: "I\(aqm going to branch at X". -+Example: "I'm going to branch at X". - .TP - .B Branch, anonymous - . -@@ -4555,27 +4529,27 @@ - .TP - .B Branch head - . --See \(aqHead, branch\(aq. -+See 'Head, branch'. - .TP - .B Branch, inactive - . - If a named branch has no topological heads, it is considered to be - inactive. As an example, a feature branch becomes inactive when it --is merged into the default branch. The \%\fBhg branches\fP\: command -+is merged into the default branch. The \fBhg branches\fP command - shows inactive branches by default, though they can be hidden with --\%\fBhg branches \-\-active\fP\:. -+\fBhg branches \-\-active\fP. - .sp - NOTE: this concept is deprecated because it is too implicit. --Branches should now be explicitly closed using \%\fBhg commit --\-\-close\-branch\fP\: when they are no longer needed. -+Branches should now be explicitly closed using \fBhg commit -+\-\-close\-branch\fP when they are no longer needed. - .TP - .B Branch, named - . - A collection of changesets which have the same branch name. By - default, children of a changeset in a named branch belong to the - same named branch. A child can be explicitly assigned to a --different branch. See \%\fBhg help branch\fP\:, \%\fBhg help branches\fP\: and --\%\fBhg commit \-\-close\-branch\fP\: for more information on managing -+different branch. See \fBhg help branch\fP, \fBhg help branches\fP and -+\fBhg commit \-\-close\-branch\fP for more information on managing - branches. - .sp - Named branches can be thought of as a kind of namespace, dividing -@@ -4588,7 +4562,7 @@ - .TP - .B Branch tip - . --See \(aqTip, branch\(aq. -+See 'Tip, branch'. - .TP - .B Branch, topological - . -@@ -4638,24 +4612,24 @@ - revision. This use should probably be avoided where possible, as - changeset is much more appropriate than checkout in this context. - .sp --Example: "I\(aqm using checkout X." -+Example: "I'm using checkout X." - .sp - (Verb) Updating the working directory to a specific changeset. See --\%\fBhg help update\fP\:. -+\fBhg help update\fP. - .sp --Example: "I\(aqm going to check out changeset X." -+Example: "I'm going to check out changeset X." - .TP - .B Child changeset - . --See \(aqChangeset, child\(aq. -+See 'Changeset, child'. - .TP - .B Close changeset - . --See \(aqChangeset, close\(aq. -+See 'Changeset, close'. - .TP - .B Closed branch - . --See \(aqBranch, closed\(aq. -+See 'Branch, closed'. - .TP - .B Clone - . -@@ -4664,13 +4638,13 @@ - .sp - Example: "Is your clone up to date?". - .sp --(Verb) The process of creating a clone, using \%\fBhg clone\fP\:. -+(Verb) The process of creating a clone, using \fBhg clone\fP. - .sp --Example: "I\(aqm going to clone the repository". -+Example: "I'm going to clone the repository". - .TP - .B Closed branch head - . --See \(aqHead, closed branch\(aq. -+See 'Head, closed branch'. - .TP - .B Commit - . -@@ -4695,13 +4669,13 @@ - system (DVCS) can be described as a directed acyclic graph (DAG), - consisting of nodes and edges, where nodes correspond to - changesets and edges imply a parent \-> child relation. This graph --can be visualized by graphical tools such as \%\fBhg glog\fP\: -+can be visualized by graphical tools such as \fBhg glog\fP - (graphlog). In Mercurial, the DAG is limited by the requirement - for children to have at most two parents. - .TP - .B Default branch - . --See \(aqBranch, default\(aq. -+See 'Branch, default'. - .TP - .B Descendant - . -@@ -4709,7 +4683,7 @@ - from a given changeset. More precisely, the descendants of a - changeset can be defined by two properties: the child of a - changeset is a descendant, and the child of a descendant is a --descendant. See also: \(aqAncestor\(aq. -+descendant. See also: 'Ancestor'. - .TP - .B Diff - . -@@ -4734,19 +4708,19 @@ - Mercurial, that will be recorded in the next commit. The working - directory initially corresponds to the snapshot at an existing - changeset, known as the parent of the working directory. See --\(aqParent, working directory\(aq. The state may be modified by changes -+\'Parent, working directory'. The state may be modified by changes - to the files introduced manually or by a merge. The repository - metadata exists in the .hg directory inside the working directory. - .TP - .B Graph - . --See DAG and \%\fBhg help graphlog\fP\:. -+See DAG and \fBhg help graphlog\fP. - .TP - .B Head - . --The term \(aqhead\(aq may be used to refer to both a branch head or a --repository head, depending on the context. See \(aqHead, branch\(aq and --\(aqHead, repository\(aq for specific definitions. -+The term 'head' may be used to refer to both a branch head or a -+repository head, depending on the context. See 'Head, branch' and -+\'Head, repository' for specific definitions. - .sp - Heads are where development generally takes place and are the - usual targets for update and merge operations. -@@ -4758,9 +4732,9 @@ - .B Head, closed branch - . - A changeset that marks a head as no longer interesting. The closed --head is no longer listed by \%\fBhg heads\fP\:. A branch is considered -+head is no longer listed by \fBhg heads\fP. A branch is considered - closed when all its heads are closed and consequently is not --listed by \%\fBhg branches\fP\:. -+listed by \fBhg branches\fP. - .TP - .B Head, repository - . -@@ -4786,11 +4760,11 @@ - .TP - .B Immutable history - . --See \(aqHistory, immutable\(aq. -+See 'History, immutable'. - .TP - .B Merge changeset - . --See \(aqChangeset, merge\(aq. -+See 'Changeset, merge'. - .TP - .B Manifest - . -@@ -4807,37 +4781,37 @@ - .TP - .B Named branch - . --See \(aqBranch, named\(aq. -+See 'Branch, named'. - .TP - .B Null changeset - . - The empty changeset. It is the parent state of newly\-initialized - repositories and repositories with no checked out revision. It is - thus the parent of root changesets and the effective ancestor when --merging unrelated changesets. Can be specified by the alias \(aqnull\(aq --or by the changeset ID \(aq000000000000\(aq. -+merging unrelated changesets. Can be specified by the alias 'null' -+or by the changeset ID '000000000000'. - .TP - .B Parent - . --See \(aqChangeset, parent\(aq. -+See 'Changeset, parent'. - .TP - .B Parent changeset - . --See \(aqChangeset, parent\(aq. -+See 'Changeset, parent'. - .TP - .B Parent, working directory - . - The working directory parent reflects a virtual revision which is - the child of the changeset (or two changesets with an uncommitted --merge) shown by \%\fBhg parents\fP\:. This is changed with --\%\fBhg update\fP\:. Other commands to see the working directory parent --are \%\fBhg summary\fP\: and \%\fBhg id\fP\:. Can be specified by the alias ".". -+merge) shown by \fBhg parents\fP. This is changed with -+\fBhg update\fP. Other commands to see the working directory parent -+are \fBhg summary\fP and \fBhg id\fP. Can be specified by the alias ".". - .TP - .B Patch - . - (Noun) The product of a diff operation. - .sp --Example: "I\(aqve sent you my patch." -+Example: "I've sent you my patch." - .sp - (Verb) The process of using a patch file to transform one - changeset into another. -@@ -4850,7 +4824,7 @@ - not in the local repository are brought into the local - repository. Note that this operation without special arguments - only updates the repository, it does not update the files in the --working directory. See \%\fBhg help pull\fP\:. -+working directory. See \fBhg help pull\fP. - .TP - .B Push - . -@@ -4858,7 +4832,7 @@ - not in a remote repository are sent to the remote repository. Note - that this operation only adds changesets which have been committed - locally to the remote repository. Uncommitted changes are not --sent. See \%\fBhg help push\fP\:. -+sent. See \fBhg help push\fP. - .TP - .B Repository - . -@@ -4871,13 +4845,13 @@ - .TP - .B Repository head - . --See \(aqHead, repository\(aq. -+See 'Head, repository'. - .TP - .B Revision - . - A state of the repository at some point in time. Earlier revisions --can be updated to by using \%\fBhg update\fP\:. See also \(aqRevision --number\(aq; See also \(aqChangeset\(aq. -+can be updated to by using \fBhg update\fP. See also 'Revision -+number'; See also 'Changeset'. - .TP - .B Revision number - . -@@ -4886,7 +4860,7 @@ - to a repository, starting with revision number 0. Note that the - revision number may be different in each clone of a repository. To - identify changesets uniquely between different clones, see --\(aqChangeset id\(aq. -+\'Changeset id'. - .TP - .B Revlog - . -@@ -4897,7 +4871,7 @@ - .TP - .B Rewriting history - . --See \(aqHistory, rewriting\(aq. -+See 'History, rewriting'. - .TP - .B Root - . -@@ -4913,7 +4887,7 @@ - . - The head of a given branch with the highest revision number. When - a branch name is used as a revision identifier, it refers to the --branch tip. See also \(aqBranch, head\(aq. Note that because revision -+branch tip. See also 'Branch, head'. Note that because revision - numbers may be different in different repository clones, the - branch tip may be different in different cloned repositories. - .TP -@@ -4921,21 +4895,21 @@ - . - (Noun) Another synonym of changeset. - .sp --Example: "I\(aqve pushed an update". -+Example: "I've pushed an update". - .sp - (Verb) This term is usually used to describe updating the state of - the working directory to that of a specific changeset. See --\%\fBhg help update\fP\:. -+\fBhg help update\fP. - .sp - Example: "You should update". - .TP - .B Working directory - . --See \(aqDirectory, working\(aq. -+See 'Directory, working'. - .TP - .B Working directory parent - . --See \(aqParent, working directory\(aq. -+See 'Parent, working directory'. - .UNINDENT - .SH EXTENSIONS - .sp -@@ -5017,7 +4991,7 @@ - .SS Example Configuration - .sp - .nf --.ft C -+.ft - [hooks] - - # Use this if you want to check access restrictions at commit time -@@ -5093,7 +5067,7 @@ - src/main/resources/** = * - - \&.hgtags = release_engineer --.ft P -+.ft - .fi - .SS bugzilla - .sp -@@ -5108,8 +5082,8 @@ - .sp - The hook relies on a Bugzilla script to send bug change notification - emails. That script changes between Bugzilla versions; the --\(aqprocessmail\(aq script used prior to 2.18 is replaced in 2.18 and --subsequent versions by \(aqconfig/sendbugmail.pl\(aq. Note that these will -+\'processmail' script used prior to 2.18 is replaced in 2.18 and -+subsequent versions by 'config/sendbugmail.pl'. Note that these will - be run by Mercurial as the user pushing the change; you will need to - ensure the Bugzilla install file permissions are set appropriately. - .sp -@@ -5123,11 +5097,11 @@ - .TP - .B db - . --Name of the Bugzilla database in MySQL. Default \(aqbugs\(aq. -+Name of the Bugzilla database in MySQL. Default 'bugs'. - .TP - .B user - . --Username to use to access MySQL server. Default \(aqbugs\(aq. -+Username to use to access MySQL server. Default 'bugs'. - .TP - .B password - . -@@ -5139,8 +5113,8 @@ - .TP - .B version - . --Bugzilla version. Specify \(aq3.0\(aq for Bugzilla versions 3.0 and later, --\(aq2.18\(aq for Bugzilla versions from 2.18 and \(aq2.16\(aq for versions prior -+Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later, -+\'2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior - to 2.18. - .TP - .B bzuser -@@ -5151,22 +5125,22 @@ - .B bzdir - . - Bugzilla install directory. Used by default notify. Default --\(aq/var/www/html/bugzilla\(aq. -+\'/var/www/html/bugzilla'. - .TP - .B notify - . - The command to run to get Bugzilla to send bug change notification --emails. Substitutes from a map with 3 keys, \(aqbzdir\(aq, \(aqid\(aq (bug id) --and \(aquser\(aq (committer bugzilla email). Default depends on version; -+emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id) -+and 'user' (committer bugzilla email). Default depends on version; - from 2.18 it is "cd %(bzdir)s && perl \-T contrib/sendbugmail.pl - %(id)s %(user)s". - .TP - .B regexp - . - Regular expression to match bug IDs in changeset commit message. --Must contain one "()" group. The default expression matches \(aqBug --1234\(aq, \(aqBug no. 1234\(aq, \(aqBug number 1234\(aq, \(aqBugs 1234,5678\(aq, \(aqBug --1234 and 5678\(aq and variations thereof. Matching is case insensitive. -+Must contain one "()" group. The default expression matches 'Bug -+1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug -+1234 and 5678' and variations thereof. Matching is case insensitive. - .TP - .B style - . -@@ -5179,18 +5153,18 @@ - extension specifies: - .sp - .nf --.ft C -+.ft - {bug} The Bugzilla bug ID. - {root} The full pathname of the Mercurial repository. - {webroot} Stripped pathname of the Mercurial repository. - {hgweb} Base URL for browsing Mercurial repositories. --.ft P -+.ft - .fi - .INDENT 7.0 - .TP --.B Default \(aqchangeset {node|short} in repo {root} refers \(aq -+.B Default 'changeset {node|short} in repo {root} refers ' - . --\(aqto bug {bug}.ndetails:nt{desc|tabindent}\(aq -+\'to bug {bug}.ndetails:nt{desc|tabindent}' - .UNINDENT - .TP - .B strip -@@ -5221,14 +5195,14 @@ - Activating the extension: - .sp - .nf --.ft C -+.ft - [extensions] - bugzilla = - - [hooks] - # run bugzilla hook on every change pulled or pushed in here - incoming.bugzilla = python:hgext.bugzilla.hook --.ft P -+.ft - .fi - .sp - Example configuration: -@@ -5238,7 +5212,7 @@ - installation in /opt/bugzilla\-3.2. - .sp - .nf --.ft C -+.ft - [bugzilla] - host=localhost - password=XYZZY -@@ -5255,18 +5229,18 @@ - - [usermap] - [email protected][email protected] --.ft P -+.ft - .fi - .sp - Commits add a comment to the Bugzilla bug record of the form: - .sp - .nf --.ft C -+.ft - Changeset 3b16791d6642 in repository\-name. - http://dev.domain.com/hg/repository\-name/rev/3b16791d6642 - - Changeset commit comment. Bug 1234. --.ft P -+.ft - .fi - .SS children - .sp -@@ -5275,12 +5249,12 @@ - .SS children - .sp - .nf --.ft C -+.ft - hg children [\-r REV] [FILE] --.ft P -+.ft - .fi - .sp --Print the children of the working directory\(aqs revisions. If a -+Print the children of the working directory's revisions. If a - revision is given via \-r/\-\-rev, the children of that revision will - be printed. If a file argument is given, revision in which the - file was last changed (after the working directory revision or the -@@ -5308,9 +5282,9 @@ - .SS churn - .sp - .nf --.ft C -+.ft - hg churn [\-d DATE] [\-r REV] [\-\-aliases FILE] [FILE] --.ft P -+.ft - .fi - .sp - This command will display a histogram representing the number -@@ -5326,28 +5300,28 @@ - Examples: - .sp - .nf --.ft C -+.ft - # display count of changed lines for every committer --hg churn \-t \(aq{author|email}\(aq -+hg churn \-t '{author|email}' - - # display daily activity graph --hg churn \-f \(aq%H\(aq \-s \-c -+hg churn \-f '%H' \-s \-c - - # display activity of developers by month --hg churn \-f \(aq%Y\-%m\(aq \-s \-c -+hg churn \-f '%Y\-%m' \-s \-c - - # display count of lines changed in every year --hg churn \-f \(aq%Y\(aq \-s --.ft P -+hg churn \-f '%Y' \-s -+.ft - .fi - .sp - It is possible to map alternate email addresses to a main address - by providing a file using the following format: - .sp - .nf --.ft C -+.ft - <alias email> = <actual email> --.ft P -+.ft - .fi - .sp - Such a file may be specified with the \-\-aliases option, otherwise -@@ -5413,7 +5387,7 @@ - Default effects may be overridden from your configuration file: - .sp - .nf --.ft C -+.ft - [color] - status.modified = blue bold underline red_background - status.added = green bold -@@ -5422,7 +5396,7 @@ - status.unknown = magenta bold underline - status.ignored = black bold - --# \(aqnone\(aq turns off all effects -+# 'none' turns off all effects - status.clean = none - status.copied = none - -@@ -5449,20 +5423,20 @@ - branches.closed = black bold - branches.current = green - branches.inactive = none --.ft P -+.ft - .fi - .sp - The color extension will try to detect whether to use ANSI codes or - Win32 console APIs, unless it is made explicit: - .sp - .nf --.ft C -+.ft - [color] - mode = ansi --.ft P -+.ft - .fi - .sp --Any value other than \(aqansi\(aq, \(aqwin32\(aq, or \(aqauto\(aq will disable color. -+Any value other than 'ansi', 'win32', or 'auto' will disable color. - .SS convert - .sp - import revisions from foreign VCS repositories into Mercurial -@@ -5470,9 +5444,9 @@ - .SS convert - .sp - .nf --.ft C -+.ft - hg convert [OPTION]... SOURCE [DEST [REVMAP]] --.ft P -+.ft - .fi - .sp - Accepted source formats [identifiers]: -@@ -5522,7 +5496,7 @@ - .sp - If no destination directory name is specified, it defaults to the - basename of the source with \fB\-hg\fP appended. If the destination --repository doesn\(aqt exist, it will be created. -+repository doesn't exist, it will be created. - .sp - By default, all sources except Mercurial will use \-\-branchsort. - Mercurial uses \-\-sourcesort to preserve original revision numbers -@@ -5548,19 +5522,19 @@ - supported by Mercurial sources. - .UNINDENT - .sp --If \fBREVMAP\fP isn\(aqt given, it will be put in a default location -+If \fBREVMAP\fP isn't given, it will be put in a default location - (\fB<dest>/.hg/shamap\fP by default). The \fBREVMAP\fP is a simple - text file that maps each source commit ID to the destination ID - for that revision, like so: - .sp - .nf --.ft C -+.ft - <source ID> <destination ID> --.ft P -+.ft - .fi - .sp --If the file doesn\(aqt exist, it\(aqs automatically created. It\(aqs --updated on each commit copied, so \%\fBhg convert\fP\: can be interrupted -+If the file doesn't exist, it's automatically created. It's -+updated on each commit copied, so \fBhg convert\fP can be interrupted - and can be run repeatedly to copy new commits. - .sp - The authormap is a simple text file that maps each source commit -@@ -5569,9 +5543,9 @@ - author mapping and the line format is: - .sp - .nf --.ft C -+.ft - source author = destination author --.ft P -+.ft - .fi - .sp - Empty lines and lines starting with a \fB#\fP are ignored. -@@ -5581,13 +5555,13 @@ - directives: - .sp - .nf --.ft C -+.ft - include path/to/file\-or\-dir - - exclude path/to/file\-or\-dir - - rename path/to/source path/to/destination --.ft P -+.ft - .fi - .sp - Comment lines start with \fB#\fP. A specified path matches if it -@@ -5611,9 +5585,9 @@ - comma\-separated values: - .sp - .nf --.ft C -+.ft - key parent1, parent2 --.ft P -+.ft - .fi - .sp - The key is the revision ID in the source -@@ -5633,9 +5607,9 @@ - lines of the form: - .sp - .nf --.ft C -+.ft - original_branch_name new_branch_name --.ft P -+.ft - .fi - .sp - where "original_branch_name" is the name of the branch in the -@@ -5882,9 +5856,9 @@ - Files with the declared format of \fBCRLF\fP or \fBLF\fP are always - checked out and stored in the repository in that format and files - declared to be binary (\fBBIN\fP) are left unchanged. Additionally, --\fBnative\fP is an alias for checking out in the platform\(aqs default line -+\fBnative\fP is an alias for checking out in the platform's default line - ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on --Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs -+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's - default behaviour; it is only needed if you need to override a later, - more general pattern. - .sp -@@ -5901,7 +5875,7 @@ - Example versioned \fB.hgeol\fP file: - .sp - .nf --.ft C -+.ft - [patterns] - **.py = native - **.vcproj = CRLF -@@ -5911,7 +5885,7 @@ - - [repository] - native = LF --.ft P -+.ft - .fi - .IP Note - . -@@ -5927,7 +5901,7 @@ - . - \fBeol.native\fP (default \fBos.linesep\fP) can be set to \fBLF\fP or - \fBCRLF\fP to override the default interpretation of \fBnative\fP for --checkout. This can be used with \%\fBhg archive\fP\: on Unix, say, to -+checkout. This can be used with \fBhg archive\fP on Unix, say, to - generate an archive where files have line endings for Windows. - .IP \(bu 2 - . -@@ -5950,7 +5924,7 @@ - Remember to enable the eol extension in the repository where you - install the hook. - .sp --See \%\fBhg help patterns\fP\: for more information about the glob patterns -+See \fBhg help patterns\fP for more information about the glob patterns - used. - .SS extdiff - .sp -@@ -5963,12 +5937,12 @@ - files to compare. - .sp - The extdiff extension also allows to configure new diff commands, so --you do not need to type \%\fBhg extdiff \-p kdiff3\fP\: always. -+you do not need to type \fBhg extdiff \-p kdiff3\fP always. - .sp - .nf --.ft C -+.ft - [extdiff] --# add new command that runs GNU diff(1) in \(aqcontext diff\(aq mode -+# add new command that runs GNU diff(1) in 'context diff' mode - cdiff = gdiff \-Nprc5 - ## or the old way: - #cmd.cdiff = gdiff -@@ -5984,45 +5958,45 @@ - # (see http://www.vim.org/scripts/script.php?script_id=102) Non - # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in - # your .vimrc --vimdiff = gvim \-f \(aq+next\(aq \(aq+execute "DirDiff" argv(0) argv(1)\(aq --.ft P -+vimdiff = gvim \-f '+next' '+execute "DirDiff" argv(0) argv(1)' -+.ft - .fi - .sp - Tool arguments can include variables that are expanded at runtime: - .sp - .nf --.ft C -+.ft - $parent1, $plabel1 \- filename, descriptive label of first parent - $child, $clabel \- filename, descriptive label of child revision - $parent2, $plabel2 \- filename, descriptive label of second parent - $parent is an alias for $parent1. --.ft P -+.ft - .fi - .sp - The extdiff extension will look in your [diff\-tools] and [merge\-tools] - sections for diff tool arguments, when none are specified in [extdiff]. - .sp - .nf --.ft C -+.ft - [extdiff] - kdiff3 = - - [diff\-tools] --kdiff3.diffargs=\-\-L1 \(aq$plabel1\(aq \-\-L2 \(aq$clabel\(aq $parent $child --.ft P -+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child -+.ft - .fi - .sp - You can use \-I/\-X and list of file or directory names like normal --\%\fBhg diff\fP\: command. The extdiff extension makes snapshots of only -+\fBhg diff\fP command. The extdiff extension makes snapshots of only - needed files, so running the external diff program will actually be - pretty fast (at least faster than having to compare the entire tree). - .SS Commands - .SS extdiff - .sp - .nf --.ft C -+.ft - hg extdiff [OPT]... [FILE]... --.ft P -+.ft - .fi - .sp - Show differences between revisions for the specified files, using -@@ -6074,9 +6048,9 @@ - .SS fetch - .sp - .nf --.ft C -+.ft - hg fetch [SOURCE] --.ft P -+.ft - .fi - .sp - This finds all changes from the repository at the specified path -@@ -6092,7 +6066,7 @@ - parent, with local changes as the second. To switch the merge - order, use \-\-switch\-parent. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Returns 0 on success. - .sp -@@ -6150,24 +6124,24 @@ - .SS sigcheck - .sp - .nf --.ft C -+.ft - hg sigcheck REVISION --.ft P -+.ft - .fi - .sp - verify all the signatures there may be for a particular revision - .SS sign - .sp - .nf --.ft C -+.ft - hg sign [OPTION]... [REVISION]... --.ft P -+.ft - .fi - .sp - If no revision is given, the parent of the working directory is used, - or tip if no revision is checked out. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - Options: - .INDENT 0.0 -@@ -6203,9 +6177,9 @@ - .SS sigs - .sp - .nf --.ft C -+.ft - hg sigs --.ft P -+.ft - .fi - .sp - list signed changesets -@@ -6220,9 +6194,9 @@ - .SS glog - .sp - .nf --.ft C -+.ft - hg glog [OPTION]... [FILE] --.ft P -+.ft - .fi - .sp - Print a revision history alongside a revision graph drawn with -@@ -6262,7 +6236,7 @@ - configure it, set the following options in your hgrc: - .sp - .nf --.ft C -+.ft - [cia] - # your registered CIA user name - user = foo -@@ -6292,7 +6266,7 @@ - [web] - # If you want hyperlinks (optional) - baseurl = http://server/path/to/repo --.ft P -+.ft - .fi - .SS hgk - .sp -@@ -6308,25 +6282,25 @@ - the contrib directory, and the extension is shipped in the hgext - repository, and needs to be enabled. - .sp --The \%\fBhg view\fP\: command will launch the hgk Tcl script. For this command -+The \fBhg view\fP command will launch the hgk Tcl script. For this command - to work, hgk must be in your search path. Alternately, you can specify - the path to hgk in your configuration file: - .sp - .nf --.ft C -+.ft - [hgk] - path=/location/of/hgk --.ft P -+.ft - .fi - .sp - hgk can make use of the extdiff extension to visualize revisions. - Assuming you had already configured extdiff vdiff command, just add: - .sp - .nf --.ft C -+.ft - [hgk] - vdiff=vdiff --.ft P -+.ft - .fi - .sp - Revisions context menu will now display additional entries to fire -@@ -6335,9 +6309,9 @@ - .SS view - .sp - .nf --.ft C -+.ft - hg view [\-l LIMIT] [REVRANGE] --.ft P -+.ft - .fi - .sp - start interactive history viewer -@@ -6354,28 +6328,28 @@ - syntax highlighting for hgweb (requires Pygments) - .sp - It depends on the Pygments syntax highlighting library: --\%http://pygments.org/\: -+http://pygments.org/ - .sp - There is a single configuration option: - .sp - .nf --.ft C -+.ft - [web] - pygments_style = <style> --.ft P -+.ft - .fi - .sp --The default is \(aqcolorful\(aq. -+The default is 'colorful'. - .SS inotify - .sp --accelerate status report using Linux\(aqs inotify service -+accelerate status report using Linux's inotify service - .SS Commands - .SS inserve - .sp - .nf --.ft C -+.ft - hg inserve [OPTION]... --.ft P -+.ft - .fi - .sp - start an inotify server for this repository -@@ -6411,12 +6385,12 @@ - in your hgrc: - .sp - .nf --.ft C -+.ft - [interhg] - issues = s!issue(\ed+)!<a href="http://bts/issue\e1">issue\e1</a>! - bugzilla = s!((?:bug|b=|(?=#?\ed{4,}))(?:\es*#?)(\ed+))!<a..=\e2">\e1</a>!i - boldify = s!(^|\es)#(\ed+)\eb! <b>#\e2</b>! --.ft P -+.ft - .fi - .SS keyword - .sp -@@ -6438,7 +6412,7 @@ - Example: - .sp - .nf --.ft C -+.ft - [keyword] - # expand keywords in every python file except those matching "x*" - **.py = -@@ -6447,7 +6421,7 @@ - [keywordset] - # prefer svn\- over cvs\-like default keywordmaps - svn = True --.ft P -+.ft - .fi - .IP Note - . -@@ -6456,39 +6430,39 @@ - .RE - .sp - For [keywordmaps] template mapping and expansion demonstration and --control run \%\fBhg kwdemo\fP\:. See \%\fBhg help templates\fP\: for a list of -+control run \fBhg kwdemo\fP. See \fBhg help templates\fP for a list of - available templates and filters. - .sp - Three additional date template filters are provided: - .sp - .nf --.ft C -+.ft - utcdate "2006/09/18 15:13:13" - svnutcdate "2006\-09\-18 15:13:13Z" - svnisodate "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)" --.ft P -+.ft - .fi - .sp --The default template mappings (view with \%\fBhg kwdemo \-d\fP\:) can be -+The default template mappings (view with \fBhg kwdemo \-d\fP) can be - replaced with customized keywords and templates. Again, run --\%\fBhg kwdemo\fP\: to control the results of your configuration changes. -+\fBhg kwdemo\fP to control the results of your configuration changes. - .sp --Before changing/disabling active keywords, you must run \%\fBhg kwshrink\fP\: -+Before changing/disabling active keywords, you must run \fBhg kwshrink\fP - to avoid storing expanded keywords in the change history. - .sp - To force expansion after enabling it, or a configuration change, run --\%\fBhg kwexpand\fP\:. -+\fBhg kwexpand\fP. - .sp - Expansions spanning more than one line and incremental expansions, --like CVS\(aq $Log$, are not supported. A keyword template map "Log = -+like CVS' $Log$, are not supported. A keyword template map "Log = - {desc}" expands to the first line of the changeset description. - .SS Commands - .SS kwdemo - .sp - .nf --.ft C -+.ft - hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]... --.ft P -+.ft - .fi - .sp - Show current, custom, or default keyword template maps and their -@@ -6499,7 +6473,7 @@ - .sp - Use \-d/\-\-default to disable current configuration. - .sp --See \%\fBhg help templates\fP\: for information on templates and filters. -+See \fBhg help templates\fP for information on templates and filters. - .sp - Options: - .INDENT 0.0 -@@ -6515,9 +6489,9 @@ - .SS kwexpand - .sp - .nf --.ft C -+.ft - hg kwexpand [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Run after (re)enabling keyword expansion. -@@ -6538,9 +6512,9 @@ - .SS kwfiles - .sp - .nf --.ft C -+.ft - hg kwfiles [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - List which files in the working directory are matched by the -@@ -6550,19 +6524,19 @@ - execution by including only files that are actual candidates for - expansion. - .sp --See \%\fBhg help keyword\fP\: on how to construct patterns both for -+See \fBhg help keyword\fP on how to construct patterns both for - inclusion and exclusion of files. - .sp - With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status - of files are: - .sp - .nf --.ft C -+.ft - K = keyword expansion candidate - k = keyword expansion candidate (not tracked) - I = ignored - i = ignored (not tracked) --.ft P -+.ft - .fi - .sp - Options: -@@ -6591,9 +6565,9 @@ - .SS kwshrink - .sp - .nf --.ft C -+.ft - hg kwshrink [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Must be run before changing/disabling active keywords. -@@ -6622,10 +6596,10 @@ - Known patches are represented as patch files in the .hg/patches - directory. Applied patches are both patch files and changesets. - .sp --Common tasks (use \%\fBhg help command\fP\: for more details): -+Common tasks (use \fBhg help command\fP for more details): - .sp - .nf --.ft C -+.ft - create new patch qnew - import existing patch qimport - -@@ -6635,7 +6609,7 @@ - add known patch to applied stack qpush - remove patch from applied stack qpop - refresh contents of top applied patch qrefresh --.ft P -+.ft - .fi - .sp - By default, mq will automatically use git patches when required to -@@ -6643,26 +6617,26 @@ - files creations or deletions. This behaviour can be configured with: - .sp - .nf --.ft C -+.ft - [mq] - git = auto/keep/yes/no --.ft P -+.ft - .fi - .sp --If set to \(aqkeep\(aq, mq will obey the [diff] section configuration while --preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or --\(aqno\(aq, mq will override the [diff] section and always generate git or -+If set to 'keep', mq will obey the [diff] section configuration while -+preserving existing git patches upon qrefresh. If set to 'yes' or -+\'no', mq will override the [diff] section and always generate git or - regular patches, possibly losing data in the second case. - .sp - You will by default be managing a patch queue named "patches". You can --create other, independent patch queues with the \%\fBhg qqueue\fP\: command. -+create other, independent patch queues with the \fBhg qqueue\fP command. - .SS Commands - .SS qapplied - .sp - .nf --.ft C -+.ft - hg qapplied [\-1] [\-s] [PATCH] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -6681,9 +6655,9 @@ - .SS qclone - .sp - .nf --.ft C -+.ft - hg qclone [OPTION]... SOURCE [DEST] --.ft P -+.ft - .fi - .sp - If source is local, destination will have no patches applied. If -@@ -6696,7 +6670,7 @@ - default. Use \-p <url> to change. - .sp - The patch directory must be a nested Mercurial repository, as --would be created by \%\fBhg init \-\-mq\fP\:. -+would be created by \fBhg init \-\-mq\fP. - .sp - Return 0 on success. - .sp -@@ -6734,12 +6708,12 @@ - .SS qcommit - .sp - .nf --.ft C -+.ft - hg qcommit [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp --This command is deprecated; use \%\fBhg commit \-\-mq\fP\: instead. -+This command is deprecated; use \fBhg commit \-\-mq\fP instead. - .sp - Options: - .INDENT 0.0 -@@ -6781,16 +6755,16 @@ - .SS qdelete - .sp - .nf --.ft C -+.ft - hg qdelete [\-k] [PATCH]... --.ft P -+.ft - .fi - .sp - The patches must not be applied, and at least one patch is required. With - \-k/\-\-keep, the patch files are preserved in the patch directory. - .sp - To stop managing a patch and move it into permanent history, --use the \%\fBhg qfinish\fP\: command. -+use the \fBhg qfinish\fP command. - .sp - Options: - .INDENT 0.0 -@@ -6808,9 +6782,9 @@ - .SS qdiff - .sp - .nf --.ft C -+.ft - hg qdiff [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp - Shows a diff which includes the current patch as well as any -@@ -6818,8 +6792,8 @@ - last refresh (thus showing what the current patch would become - after a qrefresh). - .sp --Use \%\fBhg diff\fP\: if you only want to see the changes made since the --last qrefresh, or \%\fBhg export qtip\fP\: if you want to see changes -+Use \fBhg diff\fP if you only want to see the changes made since the -+last qrefresh, or \fBhg export qtip\fP if you want to see changes - made by the current patch without including changes made since the - qrefresh. - .sp -@@ -6879,9 +6853,9 @@ - .SS qfinish - .sp - .nf --.ft C -+.ft - hg qfinish [\-a] [REV]... --.ft P -+.ft - .fi - .sp - Finishes the specified revisions (corresponding to applied -@@ -6909,9 +6883,9 @@ - .SS qfold - .sp - .nf --.ft C -+.ft - hg qfold [\-e] [\-k] [\-m TEXT] [\-l FILE] PATCH... --.ft P -+.ft - .fi - .sp - Patches must not yet be applied. Each patch will be successively -@@ -6948,9 +6922,9 @@ - .SS qgoto - .sp - .nf --.ft C -+.ft - hg qgoto [OPTION]... PATCH --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -6965,30 +6939,30 @@ - .SS qguard - .sp - .nf --.ft C -+.ft - hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...] --.ft P -+.ft - .fi - .sp - Guards control whether a patch can be pushed. A patch with no - guards is always pushed. A patch with a positive guard ("+foo") is --pushed only if the \%\fBhg qselect\fP\: command has activated it. A patch with --a negative guard ("\-foo") is never pushed if the \%\fBhg qselect\fP\: command -+pushed only if the \fBhg qselect\fP command has activated it. A patch with -+a negative guard ("\-foo") is never pushed if the \fBhg qselect\fP command - has activated it. - .sp - With no arguments, print the currently active guards. - With arguments, set guards for the named patch. - .IP Note - . --Specifying negative guards now requires \(aq\-\-\(aq. -+Specifying negative guards now requires '\-\-'. - .RE - .sp - To set guards on another patch: - .sp - .nf --.ft C -+.ft - hg qguard other.patch \-\- +2.6.17 \-stable --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7007,18 +6981,18 @@ - .SS qheader - .sp - .nf --.ft C -+.ft - hg qheader [PATCH] --.ft P -+.ft - .fi - .sp - Returns 0 on success. - .SS qimport - .sp - .nf --.ft C -+.ft - hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... FILE... --.ft P -+.ft - .fi - .sp - The patch is inserted into the series after the last applied -@@ -7048,9 +7022,9 @@ - To import an existing patch while renaming it: - .sp - .nf --.ft C -+.ft - hg qimport \-e existing\-patch \-n new\-name --.ft P -+.ft - .fi - .sp - Returns 0 if import succeeded. -@@ -7085,9 +7059,9 @@ - .SS qinit - .sp - .nf --.ft C -+.ft - hg qinit [\-c] --.ft P -+.ft - .fi - .sp - The queue repository is unversioned by default. If -@@ -7096,8 +7070,8 @@ - an unversioned patch repository into a versioned one). You can use - qcommit to commit changes to this queue repository. - .sp --This command is deprecated. Without \-c, it\(aqs implied by other relevant --commands. With \-c, use \%\fBhg init \-\-mq\fP\: instead. -+This command is deprecated. Without \-c, it's implied by other relevant -+commands. With \-c, use \fBhg init \-\-mq\fP instead. - .sp - Options: - .INDENT 0.0 -@@ -7109,9 +7083,9 @@ - .SS qnew - .sp - .nf --.ft C -+.ft - hg qnew [\-e] [\-m TEXT] [\-l FILE] PATCH [FILE]... --.ft P -+.ft - .fi - .sp - qnew creates a new patch on top of the currently\-applied patch (if -@@ -7127,7 +7101,7 @@ - .sp - \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as - well as the commit message. If none is specified, the header is --empty and the commit message is \(aq[mq]: PATCH\(aq. -+empty and the commit message is '[mq]: PATCH'. - .sp - Use the \-g/\-\-git option to keep the patch in the git extended diff - format. Read the diffs help topic for more information on why this -@@ -7186,9 +7160,9 @@ - .SS qnext - .sp - .nf --.ft C -+.ft - hg qnext [\-s] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7203,9 +7177,9 @@ - .SS qpop - .sp - .nf --.ft C -+.ft - hg qpop [\-a] [\-f] [PATCH | INDEX] --.ft P -+.ft - .fi - .sp - By default, pops off the top of the patch stack. If given a patch -@@ -7232,9 +7206,9 @@ - .SS qprev - .sp - .nf --.ft C -+.ft - hg qprev [\-s] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7249,9 +7223,9 @@ - .SS qpush - .sp - .nf --.ft C -+.ft - hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX] --.ft P -+.ft - .fi - .sp - When \-f/\-\-force is applied, all local changes in patched files -@@ -7293,9 +7267,9 @@ - .SS qqueue - .sp - .nf --.ft C -+.ft - hg qqueue [OPTION] [QUEUE] --.ft P -+.ft - .fi - .sp - Supports switching between different patch queues, as well as creating -@@ -7341,9 +7315,9 @@ - .SS qrefresh - .sp - .nf --.ft C -+.ft - hg qrefresh [\-I] [\-X] [\-e] [\-m TEXT] [\-l FILE] [\-s] [FILE]... --.ft P -+.ft - .fi - .sp - If any file patterns are provided, the refreshed patch will -@@ -7414,9 +7388,9 @@ - .SS qrename - .sp - .nf --.ft C -+.ft - hg qrename PATCH1 [PATCH2] --.ft P -+.ft - .fi - .sp - With one argument, renames the current patch to PATCH1. -@@ -7432,12 +7406,12 @@ - .SS qrestore - .sp - .nf --.ft C -+.ft - hg qrestore [\-d] [\-u] REV --.ft P -+.ft - .fi - .sp --This command is deprecated, use \%\fBhg rebase\fP\: instead. -+This command is deprecated, use \fBhg rebase\fP instead. - .sp - Options: - .INDENT 0.0 -@@ -7453,12 +7427,12 @@ - .SS qsave - .sp - .nf --.ft C -+.ft - hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f] --.ft P -+.ft - .fi - .sp --This command is deprecated, use \%\fBhg rebase\fP\: instead. -+This command is deprecated, use \fBhg rebase\fP instead. - .sp - Options: - .INDENT 0.0 -@@ -7490,23 +7464,23 @@ - .SS qselect - .sp - .nf --.ft C -+.ft - hg qselect [OPTION]... [GUARD]... --.ft P -+.ft - .fi - .sp --Use the \%\fBhg qguard\fP\: command to set or print guards on patch, then use -+Use the \fBhg qguard\fP command to set or print guards on patch, then use - qselect to tell mq which guards to use. A patch will be pushed if - it has no guards or any positive guards match the currently - selected guard, but will not be pushed if any negative guards - match the current guard. For example: - .sp - .nf --.ft C -+.ft - qguard foo.patch \-\- \-stable (negative guard) - qguard bar.patch +stable (positive guard) - qselect stable --.ft P -+.ft - .fi - .sp - This activates the "stable" guard. mq will skip foo.patch (because -@@ -7553,9 +7527,9 @@ - .SS qseries - .sp - .nf --.ft C -+.ft - hg qseries [\-ms] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7574,9 +7548,9 @@ - .SS qtop - .sp - .nf --.ft C -+.ft - hg qtop [\-s] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7591,9 +7565,9 @@ - .SS qunapplied - .sp - .nf --.ft C -+.ft - hg qunapplied [\-1] [\-s] [PATCH] --.ft P -+.ft - .fi - .sp - Returns 0 on success. -@@ -7612,9 +7586,9 @@ - .SS strip - .sp - .nf --.ft C -+.ft - hg strip [\-k] [\-f] [\-n] REV... --.ft P -+.ft - .fi - .sp - The strip command removes the specified changesets and all their -@@ -7628,8 +7602,8 @@ - completes. - .sp - Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a --bundle (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:). They can --be restored by running \%\fBhg unbundle .hg/strip\-backup/BUNDLE\fP\:, -+bundle (see \fBhg help bundle\fP and \fBhg help unbundle\fP). They can -+be restored by running \fBhg unbundle .hg/strip\-backup/BUNDLE\fP, - where BUNDLE is the bundle file created by the strip. Note that - the local revision numbers will in general be different after the - restore. -@@ -7673,7 +7647,7 @@ - this: - .sp - .nf --.ft C -+.ft - [extensions] - notify = - -@@ -7685,21 +7659,21 @@ - - [notify] - # config items go here --.ft P -+.ft - .fi - .sp - Required configuration items: - .sp - .nf --.ft C -+.ft - config = /path/to/file # file containing subscriptions --.ft P -+.ft - .fi - .sp - Optional configuration items: - .sp - .nf --.ft C -+.ft - test = True # print messages to stdout for testing - strip = 3 # number of slashes to strip for url paths - domain = example.com # domain to use if committer missing domain -@@ -7717,7 +7691,7 @@ - from = [email protected] # email address to send as if none given - [web] - baseurl = http://hgserver/... # root of hg web site for browsing commits --.ft P -+.ft - .fi - .sp - The notify config file has same format as a regular hgrc file. It has -@@ -7725,7 +7699,7 @@ - handier for you. - .sp - .nf --.ft C -+.ft - [usersubs] - # key is subscriber email, value is ","\-separated list of glob patterns - user@host = pattern -@@ -7733,7 +7707,7 @@ - [reposubs] - # key is glob pattern, value is ","\-separated list of subscriber emails - pattern = user@host --.ft P -+.ft - .fi - .sp - Glob patterns are matched against path to repository root. -@@ -7747,10 +7721,10 @@ - To set the pager that should be used, set the application variable: - .sp - .nf --.ft C -+.ft - [pager] - pager = less \-FRSX --.ft P -+.ft - .fi - .sp - If no pager is set, the pager extensions uses the environment variable -@@ -7760,30 +7734,30 @@ - setting: - .sp - .nf --.ft C -+.ft - [pager] - quiet = True --.ft P -+.ft - .fi - .sp - You can disable the pager for certain commands by adding them to the - pager.ignore list: - .sp - .nf --.ft C -+.ft - [pager] - ignore = version, help, update --.ft P -+.ft - .fi - .sp - You can also enable the pager only for certain commands using - pager.attend. Below is the default list of commands to be paged: - .sp - .nf --.ft C -+.ft - [pager] - attend = annotate, cat, diff, export, glog, log, qdiff --.ft P -+.ft - .fi - .sp - Setting pager.attend to an empty value will cause all commands to be -@@ -7791,7 +7765,7 @@ - .sp - If pager.attend is present, pager.ignore will be ignored. - .sp --To ignore global commands like \%\fBhg version\fP\: or \%\fBhg help\fP\:, you have -+To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have - to specify them in your user configuration file. - .sp - The \-\-pager=... option can also be used to control when the pager is -@@ -7807,7 +7781,7 @@ - For example, if you can refer to a revision as "foo", then: - .sp - .nf --.ft C -+.ft - foo^N = Nth parent of foo - foo^0 = foo - foo^1 = first parent of foo -@@ -7818,7 +7792,7 @@ - foo~0 = foo - foo~1 = foo^1 = foo^ = first parent of foo - foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo --.ft P -+.ft - .fi - .SS patchbomb - .sp -@@ -7839,7 +7813,7 @@ - [Optional] The result of running diffstat on the patch. - .IP \(bu 2 - . --The patch itself, as generated by \%\fBhg export\fP\:. -+The patch itself, as generated by \fBhg export\fP. - .UNINDENT - .sp - Each message refers to the first in the series using the In\-Reply\-To -@@ -7850,20 +7824,20 @@ - configuration file: - .sp - .nf --.ft C -+.ft - [email] - from = My Name <my@email> - to = recipient1, recipient2, ... - cc = cc1, cc2, ... - bcc = bcc1, bcc2, ... - reply\-to = address1, address2, ... --.ft P -+.ft - .fi - .sp - Use \fB[patchbomb]\fP as configuration section name if you need to - override global \fB[email]\fP address settings. - .sp --Then you can use the \%\fBhg email\fP\: command to mail a series of -+Then you can use the \fBhg email\fP command to mail a series of - changesets as a patchbomb. - .sp - You can also either configure the method option in the email section -@@ -7875,13 +7849,13 @@ - .SS email - .sp - .nf --.ft C -+.ft - hg email [OPTION]... [DEST]... --.ft P -+.ft - .fi - .sp - By default, diffs are sent in the format generated by --\%\fBhg export\fP\:, one per message. The series starts with a "[PATCH 0 -+\fBhg export\fP, one per message. The series starts with a "[PATCH 0 - of N]" introduction, which describes the series as a whole. - .sp - Each patch email has a Subject line of "[PATCH M of N] ...", using -@@ -7892,7 +7866,7 @@ - With the \-d/\-\-diffstat option, if the diffstat program is - installed, the result of running diffstat on the patch is inserted. - .sp --Finally, the patch itself, as generated by \%\fBhg export\fP\:. -+Finally, the patch itself, as generated by \fBhg export\fP. - .sp - With the \-d/\-\-diffstat or \-c/\-\-confirm options, you will be presented - with a final summary of all messages and asked for confirmation before -@@ -7930,7 +7904,7 @@ - Examples: - .sp - .nf --.ft C -+.ft - hg email \-r 3000 # send patch 3000 only - hg email \-r 3000 \-r 3001 # send patches 3000 and 3001 - hg email \-r 3000:3005 # send patches 3000 through 3005 -@@ -7951,7 +7925,7 @@ - hg email \-o \-m mbox && # generate an mbox file ... - formail \-s sendmail \e # ... and use formail to send from the mbox - \-bm \-t < mbox # ... using sendmail --.ft P -+.ft - .fi - .sp - Before using this command, you will need to enable email in your -@@ -8084,18 +8058,18 @@ - The following settings are available: - .sp - .nf --.ft C -+.ft - [progress] - delay = 3 # number of seconds (float) before showing the progress bar - refresh = 0.1 # time in seconds between refreshes of the progress bar - format = topic bar number estimate # format of the progress bar - width = <none> # if set, the maximum width of the progress information - # (that is, min(width, term width) will be used) --clear\-complete = True # clear the progress bar after it\(aqs done --disable = False # if true, don\(aqt show a progress bar -+clear\-complete = True # clear the progress bar after it's done -+disable = False # if true, don't show a progress bar - assume\-tty = False # if true, ALWAYS show a progress bar, unless - # disable is given --.ft P -+.ft - .fi - .sp - Valid entries for the format field are topic, bar, number, unit, -@@ -8110,9 +8084,9 @@ - .SS purge - .sp - .nf --.ft C -+.ft - hg purge [OPTION]... [DIR]... --.ft P -+.ft - .fi - .sp - Delete files not known to Mercurial. This is useful to test local -@@ -8122,7 +8096,7 @@ - .INDENT 0.0 - .IP \(bu 2 - . --Unknown files: files marked with "?" by \%\fBhg status\fP\: -+Unknown files: files marked with "?" by \fBhg status\fP - .IP \(bu 2 - . - Empty directories: in fact Mercurial ignores directories unless -@@ -8139,7 +8113,7 @@ - Ignored files (unless \-\-all is specified) - .IP \(bu 2 - . --New files added to the repository (with \%\fBhg add\fP\:) -+New files added to the repository (with \fBhg add\fP) - .UNINDENT - .sp - If directories are given on the command line, only files in these -@@ -8187,15 +8161,15 @@ - repository. - .sp - For more information: --\%http://mercurial.selenic.com/wiki/RebaseExtension\: -+http://mercurial.selenic.com/wiki/RebaseExtension - .SS Commands - .SS rebase - .sp - .nf --.ft C -+.ft - hg rebase [\-s REV | \-b REV] [\-d REV] [options] - hg rebase {\-a|\-c} --.ft P -+.ft - .fi - .sp - Rebase uses repeated merging to graft changesets from one part of -@@ -8208,7 +8182,7 @@ - same rebase or they will end up with duplicated changesets after - pulling in your rebased changesets. - .sp --If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP), -+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP), - rebase uses the tipmost head of the current named branch as the - destination. (The destination changeset is not modified by - rebasing, but new changesets are added as its descendants.) -@@ -8235,7 +8209,7 @@ - and source branch is that, unlike \fBmerge\fP, rebase will do - nothing if you are at the latest (tipmost) head of a named branch - with two heads. You need to explicitly specify source and/or --destination (or \fBupdate\fP to the other head, if it\(aqs the head of -+destination (or \fBupdate\fP to the other head, if it's the head of - the intended source branch). - .sp - If a rebase is interrupted to manually resolve a merge, it can be -@@ -8297,15 +8271,15 @@ - .SS record - .sp - .nf --.ft C -+.ft - hg record [OPTION]... [FILE]... --.ft P -+.ft - .fi - .sp --If a list of files is omitted, all changes reported by \%\fBhg status\fP\: -+If a list of files is omitted, all changes reported by \fBhg status\fP - will be candidates for recording. - .sp --See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. -+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date. - .sp - You will be prompted for whether to record changes to each - modified file, and for files with multiple changes, for each -@@ -8313,7 +8287,7 @@ - possible: - .sp - .nf --.ft C -+.ft - y \- record this change - n \- skip this change - -@@ -8325,7 +8299,7 @@ - q \- quit, recording no changes - - ? \- display help --.ft P -+.ft - .fi - .sp - This command is not available when committing a merge. -@@ -8372,9 +8346,9 @@ - .SS relink - .sp - .nf --.ft C -+.ft - hg relink [ORIGIN] --.ft P -+.ft - .fi - .sp - When repositories are cloned locally, their data files will be -@@ -8406,28 +8380,28 @@ - lot of repositories to act like a scheme, for example: - .sp - .nf --.ft C -+.ft - [schemes] - py = http://code.python.org/hg/ --.ft P -+.ft - .fi - .sp - After that you can use it like: - .sp - .nf --.ft C -+.ft - hg clone py://trunk/ --.ft P -+.ft - .fi - .sp - Additionally there is support for some more complex schemas, for - example used by Google Code: - .sp - .nf --.ft C -+.ft - [schemes] - gcode = http://{1}.googlecode.com/hg/ --.ft P -+.ft - .fi - .sp - The syntax is taken from Mercurial templates, and you have unlimited -@@ -8439,14 +8413,14 @@ - For convenience, the extension adds these schemes by default: - .sp - .nf --.ft C -+.ft - [schemes] - py = http://hg.python.org/ - bb = https://bitbucket.org/ - bb+ssh = ssh://[email protected]/ - gcode = https://{1}.googlecode.com/hg/ - kiln = https://{1}.kilnhg.com/Repo/ --.ft P -+.ft - .fi - .sp - You can override a predefined scheme by defining a new scheme with the -@@ -8458,9 +8432,9 @@ - .SS share - .sp - .nf --.ft C -+.ft - hg share [\-U] SOURCE [DEST] --.ft P -+.ft - .fi - .sp - Initialize a new repository and working directory that shares its -@@ -8497,9 +8471,9 @@ - .SS transplant - .sp - .nf --.ft C -+.ft - hg transplant [\-s REPO] [\-b BRANCH [\-a]] [\-p REV] [\-m REV] [REV]... --.ft P -+.ft - .fi - .sp - Selected changesets will be applied on top of the current working -@@ -8512,9 +8486,9 @@ - of the form: - .sp - .nf --.ft C -+.ft - (transplanted from CHANGESETHASH) --.ft P -+.ft - .fi - .sp - You can rewrite the changelog message with the \-\-filter option. -@@ -8528,7 +8502,7 @@ - transplanted, otherwise you will be prompted to select the - changesets you want. - .sp --\%\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the -+\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the - selected branch (up to the named revision) onto your current - working directory. - .sp -@@ -8537,12 +8511,12 @@ - of a merged transplant, and you can merge descendants of them - normally instead of transplanting them. - .sp --If no merges or revisions are provided, \%\fBhg transplant\fP\: will -+If no merges or revisions are provided, \fBhg transplant\fP will - start an interactive changeset browser. - .sp - If a changeset application fails, you can fix the merge by hand --and then resume where you left off by calling \%\fBhg transplant --\-\-continue/\-c\fP\:. -+and then resume where you left off by calling \fBhg transplant -+\-\-continue/\-c\fP. - .sp - Options: - .INDENT 0.0 -@@ -8631,10 +8605,10 @@ - You can specify the encoding by config option: - .sp - .nf --.ft C -+.ft - [win32mbcs] - encoding = sjis --.ft P -+.ft - .fi - .sp - It is useful for the users who want to commit with UTF\-8 log message. -@@ -8657,7 +8631,7 @@ - To perform automatic newline conversion, use: - .sp - .nf --.ft C -+.ft - [extensions] - win32text = - [encode] -@@ -8667,28 +8641,28 @@ - [decode] - ** = cleverdecode: - # or ** = macdecode: --.ft P -+.ft - .fi - .sp - If not doing conversion, to make sure you do not commit CRLF/CR by accident: - .sp - .nf --.ft C -+.ft - [hooks] - pretxncommit.crlf = python:hgext.win32text.forbidcrlf - # or pretxncommit.cr = python:hgext.win32text.forbidcr --.ft P -+.ft - .fi - .sp - To do the same check on a server to prevent CRLF/CR from being - pushed or pulled: - .sp - .nf --.ft C -+.ft - [hooks] - pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf - # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr --.ft P -+.ft - .fi - .SS zeroconf - .sp -@@ -8699,23 +8673,23 @@ - without knowing their actual IP address. - .sp - To allow other people to discover your repository using run --\%\fBhg serve\fP\: in your repository: -+\fBhg serve\fP in your repository: - .sp - .nf --.ft C -+.ft - $ cd test - $ hg serve --.ft P -+.ft - .fi - .sp - You can discover Zeroconf\-enabled repositories by running --\%\fBhg paths\fP\:: -+\fBhg paths\fP: - .sp - .nf --.ft C -+.ft - $ hg paths - zc\-test = http://example.com:8000/test --.ft P -+.ft - .fi - .SH FILES - .INDENT 0.0 -@@ -8724,7 +8698,7 @@ - .sp - This file contains regular expressions (one per line) that - describe file names that should be ignored by \fBhg\fP. For details, --see \%\fBhgignore\fP(5)\:. -+see \fBhgignore\fP(5). - .TP - .B \fB.hgtags\fP - .sp -@@ -8737,30 +8711,35 @@ - This file contains defaults and configuration. Values in - \fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override - settings made in the global \fB/etc/mercurial/hgrc\fP configuration. --See \%\fBhgrc\fP(5)\: for details of the contents and format of these -+See \fBhgrc\fP(5) for details of the contents and format of these - files. - .UNINDENT - .sp - Some commands (e.g. revert) produce backup files ending in \fB.orig\fP, - if the \fB.orig\fP file already exists and is not tracked by Mercurial, - it will be overwritten. -+.TP -+.B /usr/demo/mercurial -+This directory contains assorted files which are part of the Mercurial -+distribution, but not core to its functionality. They will generally -+need to be copied elsewhere to be of use. - .SH BUGS - .sp --Probably lots, please post them to the mailing list (see \%Resources\: -+Probably lots, please post them to the mailing list (see Resources - below) when you find them. - .SH SEE ALSO - .sp --\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\: -+\fBhgignore\fP(5), \fBhgrc\fP(5) - .SH AUTHOR - .sp --Written by Matt Mackall <\%[email protected]\:> -+Written by Matt Mackall <[email protected]> - .SH RESOURCES - .sp --Main Web Site: \%http://mercurial.selenic.com/\: -+Main Web Site: http://mercurial.selenic.com/ - .sp --Source code repository: \%http://selenic.com/hg\: -+Source code repository: http://selenic.com/hg - .sp --Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\: -+Mailing list: http://selenic.com/mailman/listinfo/mercurial - .SH COPYING - .sp - Copyright (C) 2005\-2010 Matt Mackall. -diff -ruN mercurial-1.8.4.orig/doc/hgignore.5 mercurial-1.8.4/doc/hgignore.5 ---- mercurial-1.8.4.orig/doc/hgignore.5 2011-06-01 22:32:50.000000000 +0100 -+++ mercurial-1.8.4/doc/hgignore.5 2011-06-06 14:50:45.343248008 +0100 -@@ -1,35 +1,9 @@ -+'\" t - .\" Man page generated from reStructeredText. - . - .TH HGIGNORE 5 "" "" "Mercurial Manual" - .SH NAME - hgignore \- syntax for Mercurial ignore files --. --.nr rst2man-indent-level 0 --. --.de1 rstReportMargin --\\$1 \\n[an-margin] --level \\n[rst2man-indent-level] --level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] --- --\\n[rst2man-indent0] --\\n[rst2man-indent1] --\\n[rst2man-indent2] --.. --.de1 INDENT --.\" .rstReportMargin pre: --. RS \\$1 --. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] --. nr rst2man-indent-level +1 --.\" .rstReportMargin post: --.. --.de UNINDENT --. RE --.\" indent \\n[an-margin] --.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] --.nr rst2man-indent-level -1 --.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] --.in \\n[rst2man-indent\\n[rst2man-indent-level]]u --.. - .SH SYNOPSIS - .sp - The Mercurial system uses a file called \fB.hgignore\fP in the root -@@ -54,12 +28,12 @@ - if any pattern in \fB.hgignore\fP matches \fBa/b/file.c\fP, \fBa/b\fP or \fBa\fP. - .sp - In addition, a Mercurial configuration file can reference a set of --per\-user or global ignore files. See the \%\fBhgrc\fP(5)\: man page for details -+per\-user or global ignore files. See the \fBhgrc\fP(5) man page for details - of how to configure these files. Look for the "ignore" entry in the - "ui" section. - .sp --To control Mercurial\(aqs handling of files that it manages, see the --\%\fBhg\fP(1)\: man page. Look for the \fB\-I\fP and \fB\-X\fP options. -+To control Mercurial's handling of files that it manages, see the -+\fBhg\fP(1) man page. Look for the \fB\-I\fP and \fB\-X\fP options. - .SH SYNTAX - .sp - An ignore file is a plain text file consisting of a list of patterns, -@@ -73,9 +47,9 @@ - To change the syntax used, use a line of the following form: - .sp - .nf --.ft C -+.ft - syntax: NAME --.ft P -+.ft - .fi - .sp - where \fBNAME\fP is one of the following: -@@ -102,7 +76,7 @@ - Here is an example ignore file. - .sp - .nf --.ft C -+.ft - # use glob syntax. - syntax: glob - -@@ -113,16 +87,16 @@ - # switch to regexp syntax. - syntax: regexp - ^\e.pc/ --.ft P -+.ft - .fi - .SH AUTHOR - .sp --Vadim Gelfer <\%[email protected]\:> -+Vadim Gelfer <[email protected]> - .sp --Mercurial was written by Matt Mackall <\%[email protected]\:>. -+Mercurial was written by Matt Mackall <[email protected]>. - .SH SEE ALSO - .sp --\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\: -+\fBhg\fP(1), \fBhgrc\fP(5) - .SH COPYING - .sp - This manual page is copyright 2006 Vadim Gelfer. -diff -ruN mercurial-1.8.4.orig/doc/hgrc.5 mercurial-1.8.4/doc/hgrc.5 ---- mercurial-1.8.4.orig/doc/hgrc.5 2011-06-01 22:32:50.000000000 +0100 -+++ mercurial-1.8.4/doc/hgrc.5 2011-06-06 14:52:38.062837319 +0100 -@@ -1,35 +1,9 @@ -+'\" t - .\" Man page generated from reStructeredText. - . - .TH HGRC 5 "" "" "Mercurial Manual" - .SH NAME - hgrc \- configuration files for Mercurial --. --.nr rst2man-indent-level 0 --. --.de1 rstReportMargin --\\$1 \\n[an-margin] --level \\n[rst2man-indent-level] --level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] --- --\\n[rst2man-indent0] --\\n[rst2man-indent1] --\\n[rst2man-indent2] --.. --.de1 INDENT --.\" .rstReportMargin pre: --. RS \\$1 --. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] --. nr rst2man-indent-level +1 --.\" .rstReportMargin post: --.. --.de UNINDENT --. RE --.\" indent \\n[an-margin] --.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] --.nr rst2man-indent-level -1 --.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] --.in \\n[rst2man-indent\\n[rst2man-indent-level]]u --.. - .SH SYNOPSIS - .sp - The Mercurial system uses a set of configuration files to control -@@ -44,7 +18,7 @@ - ones. - .sp - .nf --(Unix, Windows) \fB<repo>/.hg/hgrc\fP -+\fB<repo>/.hg/hgrc\fP - .fi - .sp - .INDENT 0.0 -@@ -53,35 +27,30 @@ - Per\-repository configuration options that only apply in a - particular repository. This file is not version\-controlled, and - will not get transferred during a "clone" operation. Options in --this file override options in all other configuration files. On --Unix, most of this file will be ignored if it doesn\(aqt belong to a -+this file override options in all other configuration files. -+Most of this file will be ignored if it doesn't belong to a - trusted user or to a trusted group. See the documentation for the --\%trusted\: section below for more details. -+trusted section below for more details. - .UNINDENT - .UNINDENT - .sp - .nf --(Unix) \fB$HOME/.hgrc\fP --(Windows) \fB%USERPROFILE%\e.hgrc\fP --(Windows) \fB%USERPROFILE%\eMercurial.ini\fP --(Windows) \fB%HOME%\e.hgrc\fP --(Windows) \fB%HOME%\eMercurial.ini\fP -+\fB$HOME/.hgrc\fP - .fi - .sp - .INDENT 0.0 - .INDENT 3.5 - .sp --Per\-user configuration file(s), for the user running Mercurial. On --Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these --files apply to all Mercurial commands executed by this user in any --directory. Options in these files override per\-system and per\-installation --options. -+Per\-user configuration file(s), for the user running Mercurial. -+Options in this file apply to all Mercurial commands executed by this -+user in any directory. Options in this file override per\-system and -+per\-installation options. - .UNINDENT - .UNINDENT - .sp - .nf --(Unix) \fB/etc/mercurial/hgrc\fP --(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP -+\fB/etc/mercurial/hgrc\fP -+\fB/etc/mercurial/hgrc.d/*.rc\fP - .fi - .sp - .INDENT 0.0 -@@ -93,44 +62,6 @@ - override per\-installation options. - .UNINDENT - .UNINDENT --.sp --.nf --(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP --(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP --.fi --.sp --.INDENT 0.0 --.INDENT 3.5 --.sp --Per\-installation configuration files, searched for in the --directory where Mercurial is installed. \fB<install\-root>\fP is the --parent directory of the \fBhg\fP executable (or symlink) being run. For --example, if installed in \fB/shared/tools/bin/hg\fP, Mercurial will look --in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply --to all Mercurial commands executed by any user in any directory. --.UNINDENT --.UNINDENT --.sp --.nf --(Windows) \fB<install\-dir>\eMercurial.ini\fP --(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP --(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP --.fi --.sp --.INDENT 0.0 --.INDENT 3.5 --.sp --Per\-installation/system configuration files, for the system on --which Mercurial is running. Options in these files apply to all --Mercurial commands executed by any user in any directory. Registry --keys contain PATH\-like strings, every part of which must reference --a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will --be read. Mercurial checks each of these locations in the specified --order until one or more configuration files are detected. If the --pywin32 extensions are not installed, Mercurial will only look for --site\-wide configuration in \fBC:\eMercurial\eMercurial.ini\fP. --.UNINDENT --.UNINDENT - .SH SYNTAX - .sp - A configuration file consists of sections, led by a \fB[section]\fP header -@@ -138,12 +69,12 @@ - \fBconfiguration keys\fP): - .sp - .nf --.ft C -+.ft - [spam] - eggs=ham - green= - eggs --.ft P -+.ft - .fi - .sp - Each line contains one entry. If the lines that follow are indented, -@@ -155,12 +86,12 @@ - will use the value that was configured last. As an example: - .sp - .nf --.ft C -+.ft - [spam] - eggs=large - ham=serrano - eggs=small --.ft P -+.ft - .fi - .sp - This would set the configuration key named \fBeggs\fP to \fBsmall\fP. -@@ -169,7 +100,7 @@ - be redefined on the same and/or on different hgrc files. For example: - .sp - .nf --.ft C -+.ft - [foo] - eggs=large - ham=serrano -@@ -184,7 +115,7 @@ - ham=prosciutto - eggs=medium - bread=toasted --.ft P -+.ft - .fi - .sp - This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys -@@ -206,9 +137,9 @@ - \fBfile\fP. This lets you do something like: - .sp - .nf --.ft C -+.ft - %include ~/.hgrc.d/$HOST.rc --.ft P -+.ft - .fi - .sp - to include a different configuration file on each computer you use. -@@ -225,9 +156,9 @@ - placed in double quotation marks: - .sp - .nf --.ft C -+.ft - allow_read = "John Doe, PhD", brian, betty --.ft P -+.ft - .fi - .sp - Quotation marks can be escaped by prefixing them with a backslash. Only -@@ -247,26 +178,26 @@ - Alias definitions consist of lines of the form: - .sp - .nf --.ft C -+.ft - <alias> = <command> [<argument]... --.ft P -+.ft - .fi - .sp - For example, this definition: - .sp - .nf --.ft C -+.ft - latest = log \-\-limit 5 --.ft P -+.ft - .fi - .sp - creates a new command \fBlatest\fP that shows only the five most recent - changesets. You can define subsequent aliases using earlier ones: - .sp - .nf --.ft C -+.ft - stable5 = latest \-b stable --.ft P -+.ft - .fi - .IP Note - . -@@ -307,22 +238,22 @@ - .sp - Authentication credentials for HTTP authentication. This section - allows you to store usernames and passwords for use when logging --\fIinto\fP HTTP servers. See the \%web\: configuration section if you want to -+\fIinto\fP HTTP servers. See the web configuration section if you want to - configure \fIwho\fP can login to your HTTP server. - .sp - Each line has the following format: - .sp - .nf --.ft C -+.ft - <name>.<argument> = <value> --.ft P -+.ft - .fi - .sp - where \fB<name>\fP is used to group arguments into authentication - entries. Example: - .sp - .nf --.ft C -+.ft - foo.prefix = hg.intevation.org/mercurial - foo.username = foo - foo.password = bar -@@ -332,7 +263,7 @@ - bar.key = path/to/file.key - bar.cert = path/to/file.cert - bar.schemes = https --.ft P -+.ft - .fi - .sp - Supported arguments: -@@ -343,7 +274,7 @@ - Either \fB*\fP or a URI prefix with or without the scheme part. - The authentication entry with the longest matching prefix is used - (where \fB*\fP matches everything and counts as a match of length --1). If the prefix doesn\(aqt include a scheme, the match is performed -+1). If the prefix doesn't include a scheme, the match is performed - against the URI with its scheme stripped as well, and the schemes - argument, q.v., is then subsequently consulted. - .TP -@@ -373,7 +304,7 @@ - .B \fBschemes\fP - .sp - Optional. Space separated list of URI schemes to use this --authentication entry with. Only used if the prefix doesn\(aqt include -+authentication entry with. Only used if the prefix doesn't include - a scheme. Supported schemes are http and https. They will match - static\-http and static\-https respectively, as well. - Default: https. -@@ -403,7 +334,7 @@ - Pipe example: - .sp - .nf --.ft C -+.ft - [encode] - # uncompress gzip files on checkin to improve delta compression - # note: not necessarily a good idea, just an example -@@ -411,9 +342,9 @@ - - [decode] - # recompress gzip files when writing them to the working dir (we --# can safely omit "pipe:", because it\(aqs the default) -+# can safely omit "pipe:", because it's the default) - *.gz = gzip --.ft P -+.ft - .fi - .sp - A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced -@@ -421,32 +352,26 @@ - filtered by the command. The string \fBOUTFILE\fP is replaced with the name - of an empty temporary file, where the filtered data must be written by - the command. --.IP Note --. --The tempfile mechanism is recommended for Windows systems, --where the standard shell I/O redirection operators often have --strange effects and may corrupt the contents of your files. --.RE - .sp - This filter mechanism is used internally by the \fBeol\fP extension to - translate line ending characters between Windows (CRLF) and Unix (LF) - format. We suggest you use the \fBeol\fP extension for convenience. - .SS \fBdefaults\fP - .sp --(defaults are deprecated. Don\(aqt use them. Use aliases instead) -+(defaults are deprecated. Don't use them. Use aliases instead) - .sp - Use the \fB[defaults]\fP section to define command defaults, i.e. the - default options/arguments to pass to the specified commands. - .sp --The following example makes \%\fBhg log\fP\: run in verbose mode, and --\%\fBhg status\fP\: show only the modified files, by default: -+The following example makes \fBhg log\fP run in verbose mode, and -+\fBhg status\fP show only the modified files, by default: - .sp - .nf --.ft C -+.ft - [defaults] - log = \-v - status = \-m --.ft P -+.ft - .fi - .sp - The actual commands, instead of their aliases, must be used when -@@ -464,7 +389,7 @@ - .TP - .B \fBnodates\fP - .sp --Don\(aqt include dates in diff headers. -+Don't include dates in diff headers. - .TP - .B \fBshowfunc\fP - .sp -@@ -498,22 +423,22 @@ - .TP - .B \fBto\fP - .sp --Optional. Comma\-separated list of recipients\(aq email addresses. -+Optional. Comma\-separated list of recipients' email addresses. - .TP - .B \fBcc\fP - .sp --Optional. Comma\-separated list of carbon copy recipients\(aq -+Optional. Comma\-separated list of carbon copy recipients' - email addresses. - .TP - .B \fBbcc\fP - .sp --Optional. Comma\-separated list of blind carbon copy recipients\(aq -+Optional. Comma\-separated list of blind carbon copy recipients' - email addresses. - .TP - .B \fBmethod\fP - .sp - Optional. Method to use to send email messages. If value is \fBsmtp\fP --(default), use SMTP (see the \%SMTP\: section for configuration). -+(default), use SMTP (see the SMTP section for configuration). - Otherwise, use as name of program to run that acts like sendmail - (takes \fB\-f\fP option for sender, list of recipients on command line, - message on stdin). Normally, setting this to \fBsendmail\fP or -@@ -552,21 +477,21 @@ - Email example: - .sp - .nf --.ft C -+.ft - [email] - from = Joseph User <[email protected]> - method = /usr/sbin/sendmail - # charsets for western Europeans - # us\-ascii, utf\-8 omitted, as they are tried first and last - charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252 --.ft P -+.ft - .fi - .SS \fBextensions\fP - .sp - Mercurial has an extension mechanism for adding new features. To - enable an extension, create an entry for it in this section. - .sp --If you know that the extension is already in Python\(aqs search path, -+If you know that the extension is already in Python's search path, - you can give the name of the module, followed by \fB=\fP, with nothing - after the \fB=\fP. - .sp -@@ -581,13 +506,13 @@ - Example for \fB~/.hgrc\fP: - .sp - .nf --.ft C -+.ft - [extensions] --# (the mq extension will get loaded from Mercurial\(aqs path) -+# (the mq extension will get loaded from Mercurial's path) - mq = - # (this extension will get loaded from the file specified) - myfeature = ~/.hgext/myfeature.py --.ft P -+.ft - .fi - .SS \fBhostfingerprints\fP - .sp -@@ -601,10 +526,10 @@ - For example: - .sp - .nf --.ft C -+.ft - [hostfingerprints] - hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc --.ft P -+.ft - .fi - .sp - This feature is only supported when using Python 2.6 or later. -@@ -648,11 +573,11 @@ - Example: - .sp - .nf --.ft C -+.ft - [merge\-patterns] - **.c = kdiff3 - **.jpg = myimgmerge --.ft P -+.ft - .fi - .SS \fBmerge\-tools\fP - .sp -@@ -662,7 +587,7 @@ - Example \fB~/.hgrc\fP: - .sp - .nf --.ft C -+.ft - [merge\-tools] - # Override stock tool location - kdiff3.executable = ~/bin/kdiff3 -@@ -675,7 +600,7 @@ - myHtmlTool.args = \-m $local $other $base $output - myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge - myHtmlTool.priority = 1 --.ft P -+.ft - .fi - .sp - Supported arguments: -@@ -688,8 +613,7 @@ - .TP - .B \fBexecutable\fP - .sp --Either just the name of the executable or its pathname. On Windows, --the path can use environment variables with ${ProgramFiles} syntax. -+Either just the name of the executable or its pathname. - Default: the tool name. - .TP - .B \fBargs\fP -@@ -752,32 +676,6 @@ - .B \fBgui\fP - .sp - This tool requires a graphical interface to run. Default: False --.TP --.B \fBregkey\fP --.sp --Windows registry key which describes install location of this --tool. Mercurial will search for this key first under --\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP. --Default: None --.TP --.B \fBregkeyalt\fP --.sp --An alternate Windows registry key to try if the first key is not --found. The alternate key uses the same \fBregname\fP and \fBregappend\fP --semantics of the primary key. The most common use for this key --is to search for 32bit applications on 64bit operating systems. --Default: None --.TP --.B \fBregname\fP --.sp --Name of value to read from specified registry key. Defaults to the --unnamed (default) value. --.TP --.B \fBregappend\fP --.sp --String to append to the value read from the registry, typically --the executable name of the tool. --Default: None - .UNINDENT - .SS \fBhooks\fP - .sp -@@ -790,7 +688,7 @@ - Example \fB.hg/hgrc\fP: - .sp - .nf --.ft C -+.ft - [hooks] - # update working directory after adding changesets - changegroup.update = hg update -@@ -798,7 +696,7 @@ - incoming = - incoming.email = /my/email/hook - incoming.autobuild = /my/build/hook --.ft P -+.ft - .fi - .sp - Most hooks are run with environment variables set that give useful -@@ -848,7 +746,7 @@ - representations of the data internally passed to <command>. \fB$HG_OPTS\fP - is a dictionary of options (with unspecified options set to their - defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns --failure, the command doesn\(aqt execute and Mercurial returns the failure -+failure, the command doesn't execute and Mercurial returns the failure - code. - .TP - .B \fBprechangegroup\fP -@@ -930,21 +828,14 @@ - Also, hooks like "commit" will be called in all contexts that - generate a commit (e.g. tag) and not just the commit command. - .RE --.IP Note --. --Environment variables with empty values may not be passed to --hooks on platforms such as Windows. As an example, \fB$HG_PARENT2\fP --will have an empty value under Unix\-like platforms for non\-merge --changesets, while it will not be available at all under Windows. --.RE - .sp - The syntax for Python hooks is as follows: - .sp - .nf --.ft C -+.ft - hookname = python:modulename.submodule.callable - hookname = python:/path/to/python/module.py:callable --.ft P -+.ft - .fi - .sp - Python hooks are run within the Mercurial process. Each hook is -@@ -1016,18 +907,18 @@ - .TP - .B \fBlocal_hostname\fP - .sp --Optional. It\(aqs the hostname that the sender can use to identify -+Optional. It's the hostname that the sender can use to identify - itself to the MTA. - .UNINDENT - .SS \fBpatch\fP - .sp --Settings used when applying patches, for instance through the \(aqimport\(aq -+Settings used when applying patches, for instance through the 'import' - command or with Mercurial Queues extension. - .INDENT 0.0 - .TP - .B \fBeol\fP - .sp --When set to \(aqstrict\(aq patch content and patched files end of lines -+When set to 'strict' patch content and patched files end of lines - are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of - lines are ignored when patching and the result line endings are - normalized to either LF (Unix) or CRLF (Windows). When set to -@@ -1059,8 +950,8 @@ - .SS \fBprofiling\fP - .sp - Specifies profiling format and file output. In this section --description, \(aqprofiling data\(aq stands for the raw data collected --during profiling, while \(aqprofiling report\(aq stands for a statistical -+description, 'profiling data' stands for the raw data collected -+during profiling, while 'profiling report' stands for a statistical - text report generated from the profiling data. The profiling is done - using lsprof. - .INDENT 0.0 -@@ -1119,9 +1010,9 @@ - Defines subrepositories source locations rewriting rules of the form: - .sp - .nf --.ft C -+.ft - <pattern> = <replacement> --.ft P -+.ft - .fi - .sp - Where \fBpattern\fP is a regular expression matching the source and -@@ -1130,9 +1021,9 @@ - instance: - .sp - .nf --.ft C -+.ft - http://server/(.*)\-hg/ = http://hg.server/\e1/ --.ft P -+.ft - .fi - .sp - rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP. -@@ -1140,8 +1031,8 @@ - All patterns are applied in definition order. - .SS \fBtrusted\fP - .sp --Mercurial will not use the settings in the --\fB.hg/hgrc\fP file from a repository if it doesn\(aqt belong to a trusted -+Mercurial will not use the settings in the \fB.hg/hgrc\fP file from a -+repository if it doesn't belong to a trusted - user or to a trusted group, as various hgrc features allow arbitrary - commands to be run. This issue is often encountered when configuring - hooks or extensions for shared repositories or servers. However, -@@ -1172,7 +1063,7 @@ - .sp - Whether to include the .hg_archival.txt file containing meta data - (hashes for the repository base and for tip) in archives created --by the \%\fBhg archive\fP\: command or downloaded via hgweb. -+by the \fBhg archive\fP command or downloaded via hgweb. - Default is True. - .TP - .B \fBaskusername\fP -@@ -1200,7 +1091,7 @@ - .TP - .B \fBfallbackencoding\fP - .sp --Encoding to try if it\(aqs not possible to decode the changelog using -+Encoding to try if it's not possible to decode the changelog using - UTF\-8. Default is ISO\-8859\-1. - .TP - .B \fBignore\fP -@@ -1210,7 +1101,7 @@ - option supports hook syntax, so if you want to specify multiple - ignore files, you can do so by setting something like - \fBignore.other = ~/.hgignore2\fP. For details of the ignore file --format, see the \%\fBhgignore\fP(5)\: man page. -+format, see the \fBhgignore\fP(5) man page. - .TP - .B \fBinteractive\fP - .sp -@@ -1223,8 +1114,8 @@ - .B \fBmerge\fP - .sp - The conflict resolution program to use during a manual merge. --For more information on merge tools see \%\fBhg help merge\-tools\fP\:. --For configuring merge tools see the \%merge\-tools\: section. -+For more information on merge tools see \fBhg help merge\-tools\fP. -+For configuring merge tools see the merge\-tools section. - .TP - .B \fBpatch\fP - .sp -@@ -1280,7 +1171,7 @@ - .B \fBusername\fP - .sp - The committer of a changeset created when running "commit". --Typically a person\(aqs name and email address, e.g. \fBFred Widget -+Typically a person's name and email address, e.g. \fBFred Widget - <[email protected]>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If - the username in hgrc is empty, it has to be specified manually or - in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set -@@ -1294,7 +1185,7 @@ - .SS \fBweb\fP - .sp - Web interface configuration. The settings in this section apply to --both the builtin webserver (started by \%\fBhg serve\fP\:) and the script you -+both the builtin webserver (started by \fBhg serve\fP) and the script you - run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI - and WSGI). - .sp -@@ -1310,9 +1201,9 @@ - command line: - .sp - .nf --.ft C -+.ft - $ hg \-\-config web.allow_push=* \-\-config web.push_ssl=False serve --.ft P -+.ft - .fi - .sp - Note that this will allow anybody to push anything to the server and -@@ -1391,14 +1282,14 @@ - with these certificates. The form must be as follows: - .sp - .nf --.ft C -+.ft - \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\- - \&... (certificate in base64 PEM encoding) ... - \-\-\-\-\-END CERTIFICATE\-\-\-\-\- - \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\- - \&... (certificate in base64 PEM encoding) ... - \-\-\-\-\-END CERTIFICATE\-\-\-\-\- --.ft P -+.ft - .fi - .sp - This feature is only supported when using Python 2.6 or later. If you wish -@@ -1406,7 +1297,7 @@ - version of the ssl library that is available from - \fBhttp://pypi.python.org\fP. - .sp --You can use OpenSSL\(aqs CA certificate file if your platform has one. -+You can use OpenSSL's CA certificate file if your platform has one. - On most Linux systems this will be \fB/etc/ssl/certs/ca\-certificates.crt\fP. - Otherwise you will have to generate this file manually. - .sp -@@ -1450,7 +1341,7 @@ - .TP - .B \fBdescription\fP - .sp --Textual description of the repository\(aqs purpose or contents. -+Textual description of the repository's purpose or contents. - Default is "unknown". - .TP - .B \fBencoding\fP -@@ -1490,7 +1381,7 @@ - .TP - .B \fBprefix\fP - .sp --Prefix path to serve from. Default is \(aq\(aq (server root). -+Prefix path to serve from. Default is '' (server root). - .TP - .B \fBpush_ssl\fP - .sp -@@ -1519,15 +1410,15 @@ - .UNINDENT - .SH AUTHOR - .sp --Bryan O\(aqSullivan <\%[email protected]\:>. -+Bryan O'Sullivan <[email protected]>. - .sp --Mercurial was written by Matt Mackall <\%[email protected]\:>. -+Mercurial was written by Matt Mackall <[email protected]>. - .SH SEE ALSO - .sp --\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\: -+\fBhg\fP(1), \fBhgignore\fP(5) - .SH COPYING - .sp --This manual page is copyright 2005 Bryan O\(aqSullivan. -+This manual page is copyright 2005 Bryan O'Sullivan. - Mercurial is copyright 2005\-2010 Matt Mackall. - Free use of this software is granted under the terms of the GNU General - Public License version 2 or any later version.
--- a/components/meta-packages/incorporations/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# - -include ../../../make-rules/shared-macros.mk - -# $(WS_TOP)/make-rules/ips.mk really isn't set up to allow you to bypass all -# the automatic (and lengthy) manifest manipulation that it does, which we -# really don't need to do for these static, uninteresting packages. So we just -# write a simple set of publication rules to get the packages into the repo. - -PKGSEND = /usr/bin/pkgsend -PKGLINT = /usr/bin/pkglint -PKGMOGRIFY = /usr/bin/pkgmogrify - -CANONICAL_MANIFESTS = $(wildcard *.p5m) -ARCH_MANIFESTS = $(wildcard *.p5m.$(MACH)) -GENERATED_ARCH_MANIFESTS = $(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m) -CANONICAL_MANIFESTS += $(GENERATED_ARCH_MANIFESTS) - -MANIFEST_BASE = $(BUILD_DIR)/manifest-$(MACH) -MOGRIFIED = $(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.mogrified) -PUBLISHED = $(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.published) - -download prep build install: - @echo "nothing to be done for $@" - -$(BUILD_DIR): - $(MKDIR) $@ - -$(MANIFEST_BASE)-%.mogrified: %.p5m $(BUILD_DIR) - $(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< > $@ - -$(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR) - $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest $< - $(CP) $< $@ - -$(BUILD_DIR)/.linted-$(MACH): $(MOGRIFIED) $(BUILD_DIR) - $(ENV) PYTHONPATH=$(WS_TOOLS)/python \ - $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ - -f $(WS_TOOLS)/pkglintrc $(MOGRIFIED) - $(TOUCH) $@ - -$(BUILD_DIR)/.published-$(MACH): $(BUILD_DIR)/.linted-$(MACH) $(PUBLISHED) - $(TOUCH) $@ - -publish: $(BUILD_DIR)/.published-$(MACH) - -%.p5m: %.p5m.$(MACH) - $(CP) $< $@ - -clobber clean: - $(RM) -r $(BUILD_DIR) $(GENERATED_ARCH_MANIFESTS)
--- a/components/meta-packages/incorporations/sfw-incorporation.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,793 +0,0 @@ -set name=pkg.fmri value=pkg:/consolidation/sfw/[email protected],5.11-0.151 -set name=pkg.depend.install-hold value=core-os.sfw -set name=org.opensolaris.consolidation value=sfw -set name=pkg.description value="This incorporation constrains packages from the sfw consolidation." -set name=pkg.summary value="sfw consolidation incorporation" -set name=description value="sfw consolidation incorporation" -depend fmri=archiver/[email protected] type=incorporate -depend fmri=archiver/[email protected] type=incorporate -depend fmri=audio/[email protected] type=incorporate -depend fmri=backup/[email protected] type=incorporate -depend fmri=backup/[email protected] type=incorporate -depend fmri=benchmark/[email protected] type=incorporate -depend fmri=benchmark/[email protected] type=incorporate -depend fmri=benchmark/[email protected] type=incorporate -depend fmri=benchmark/[email protected] type=incorporate -depend fmri=compress/[email protected] type=incorporate -depend fmri=compress/[email protected] type=incorporate -depend fmri=compress/[email protected] type=incorporate -depend fmri=compress/[email protected] type=incorporate -depend fmri=compress/[email protected] type=incorporate -depend fmri=crypto/[email protected] type=incorporate -depend fmri=crypto/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/mysql-50/connector/[email protected] type=incorporate -depend fmri=database/mysql-50/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/mysql-51/[email protected] type=incorporate -depend fmri=database/mysql-51/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/build/[email protected] type=incorporate -depend fmri=developer/debug/[email protected] type=incorporate -depend fmri=developer/documentation-tool/[email protected] type=incorporate -depend fmri=developer/documentation-tool/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/java/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/lexer/[email protected] type=incorporate -depend fmri=developer/macro/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/parser/[email protected] type=incorporate -depend fmri=developer/parser/[email protected] type=incorporate -depend fmri=developer/python/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend fmri=developer/versioning/[email protected] type=incorporate -depend fmri=developer/versioning/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/gnu-emacs/[email protected] type=incorporate -depend fmri=editor/gnu-emacs/[email protected] type=incorporate -depend fmri=editor/gnu-emacs/[email protected] type=incorporate -depend fmri=editor/gnu-emacs/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=editor/[email protected] type=incorporate -depend fmri=file/[email protected] type=incorporate -depend fmri=file/[email protected] type=incorporate -depend fmri=file/[email protected] type=incorporate -depend fmri=games/[email protected] type=incorporate -depend fmri=image/[email protected] type=incorporate -depend fmri=image/[email protected] type=incorporate -depend fmri=image/[email protected] type=incorporate -depend fmri=image/scanner/xsane/[email protected] type=incorporate -depend fmri=image/scanner/xsane/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/apr-13/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/apr-util-13/[email protected] type=incorporate -depend fmri=library/apr-util-13/[email protected] type=incorporate -depend fmri=library/apr-util-13/[email protected] type=incorporate -depend fmri=library/apr-util-13/[email protected] type=incorporate -depend fmri=library/c++/[email protected] type=incorporate -depend fmri=library/database/[email protected] type=incorporate -depend fmri=library/desktop/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/fastcgi/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/graphics/[email protected] type=incorporate -depend fmri=library/graphics/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/libtool/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/perl-5/[email protected] type=incorporate -depend fmri=library/perl-5/[email protected] type=incorporate -depend fmri=library/perl-5/[email protected] type=incorporate -depend fmri=library/perl-5/[email protected] type=incorporate -depend fmri=library/print/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/python-2/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/samba/[email protected] type=incorporate -depend fmri=library/security/[email protected] type=incorporate -depend fmri=library/security/openssl/[email protected] type=incorporate -depend fmri=library/security/pam/module/[email protected] type=incorporate -depend fmri=library/security/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=library/[email protected] type=incorporate -depend fmri=mail/[email protected] type=incorporate -depend fmri=mail/[email protected] type=incorporate -depend fmri=mail/[email protected] type=incorporate -depend fmri=media/[email protected] type=incorporate -depend fmri=media/[email protected] type=incorporate -depend fmri=media/[email protected] type=incorporate -depend fmri=network/chat/[email protected] type=incorporate -depend fmri=network/dns/[email protected] type=incorporate -depend fmri=network/ftp/[email protected] type=incorporate -depend fmri=network/ftp/[email protected] type=incorporate -depend fmri=network/nntp/[email protected] type=incorporate -depend fmri=network/[email protected] type=incorporate -depend fmri=network/[email protected] type=incorporate -depend fmri=network/[email protected] type=incorporate -depend fmri=network/[email protected] type=incorporate -depend fmri=package/[email protected] type=incorporate -depend fmri=print/[email protected] type=incorporate -depend fmri=print/cups/filter/[email protected] type=incorporate -depend fmri=print/cups/filter/[email protected] type=incorporate -depend fmri=print/cups/[email protected] type=incorporate -depend fmri=print/filter/[email protected] type=incorporate -depend fmri=print/filter/ghostscript/fonts/[email protected] type=incorporate -depend fmri=print/filter/ghostscript/fonts/[email protected] type=incorporate -depend fmri=print/filter/[email protected] type=incorporate -depend fmri=print/filter/[email protected] type=incorporate -depend fmri=print/lp/filter/[email protected] type=incorporate -depend fmri=print/lp/filter/[email protected] type=incorporate -depend fmri=print/lp/filter/[email protected] type=incorporate -depend fmri=print/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/erlang/[email protected] type=incorporate -depend fmri=runtime/java/[email protected] type=incorporate -depend fmri=runtime/java/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/ocaml/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/perl-510/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=runtime/tcl-8/[email protected] type=incorporate -depend fmri=runtime/tcl-8/[email protected] type=incorporate -depend fmri=runtime/[email protected] type=incorporate -depend fmri=security/[email protected] type=incorporate -depend fmri=service/[email protected] type=incorporate -depend fmri=service/network/dns/[email protected] type=incorporate -depend fmri=service/network/load-balancer/[email protected] type=incorporate -depend fmri=service/network/[email protected] type=incorporate -depend fmri=service/network/[email protected] type=incorporate -depend fmri=service/security/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=shell/[email protected] type=incorporate -depend fmri=system/file/[email protected] type=incorporate -depend fmri=system/library/[email protected] type=incorporate -depend fmri=system/library/[email protected] type=incorporate -depend fmri=system/library/[email protected] type=incorporate -depend fmri=system/library/[email protected] type=incorporate -depend fmri=system/library/security/[email protected] type=incorporate -depend fmri=system/library/usb/[email protected] type=incorporate -depend fmri=system/library/usb/[email protected] type=incorporate -depend fmri=system/library/usb/[email protected] type=incorporate -depend fmri=system/management/cim/[email protected] type=incorporate -depend fmri=system/management/[email protected] type=incorporate -depend fmri=system/management/[email protected] type=incorporate -depend fmri=system/management/[email protected] type=incorporate -depend fmri=system/management/snmp/[email protected] type=incorporate -depend fmri=system/management/snmp/net-snmp/[email protected] type=incorporate -depend fmri=system/management/snmp/net-snmp/[email protected] type=incorporate -depend fmri=system/management/wbem/[email protected] type=incorporate -depend fmri=system/management/wbem/[email protected] type=incorporate -depend fmri=system/management/wbem/[email protected] type=incorporate -depend fmri=system/management/web/[email protected] type=incorporate -depend fmri=system/management/[email protected] type=incorporate -depend fmri=system/network/routing/[email protected] type=incorporate -depend fmri=system/prerequisite/[email protected] type=incorporate -depend fmri=system/storage/[email protected] type=incorporate -depend fmri=terminal/[email protected] type=incorporate -depend fmri=terminal/[email protected] type=incorporate -depend fmri=terminal/[email protected] type=incorporate -depend fmri=terminal/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=text/[email protected] type=incorporate -depend fmri=web/[email protected] type=incorporate -depend fmri=web/analytics/[email protected] type=incorporate -depend fmri=web/analytics/[email protected] type=incorporate -depend fmri=web/browser/[email protected] type=incorporate -depend fmri=web/browser/[email protected] type=incorporate -depend fmri=web/[email protected] type=incorporate -depend fmri=web/fastcgi/[email protected] type=incorporate -depend fmri=web/java-servlet/[email protected] type=incorporate -depend fmri=web/java-servlet/tomcat/[email protected] type=incorporate -depend fmri=web/[email protected] type=incorporate -depend fmri=web/php-52/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/proxy/[email protected] type=incorporate -depend fmri=web/proxy/[email protected] type=incorporate -depend fmri=web/server/[email protected] type=incorporate -depend fmri=web/server/apache-13/[email protected] type=incorporate -depend fmri=web/server/[email protected] type=incorporate -depend fmri=web/server/apache-22/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/apache-22/module/[email protected] type=incorporate -depend fmri=web/server/[email protected] type=incorporate -depend fmri=web/server/[email protected] type=incorporate -depend fmri=web/[email protected] type=incorporate -depend fmri=diagnostic/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/postgres-82/connector/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/postgres-82/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/postgres-83/connector/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/postgres-83/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/postgres-84/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/postgres/library/c++/[email protected] type=incorporate -depend fmri=database/postgres/[email protected] type=incorporate -depend fmri=database/postgres/[email protected] type=incorporate -depend fmri=database/postgres/[email protected] type=incorporate -depend fmri=library/apr-util-13/[email protected] type=incorporate -depend fmri=library/perl-5/[email protected] type=incorporate -depend fmri=service/database/[email protected] type=incorporate -depend fmri=service/database/[email protected] type=incorporate -depend fmri=service/database/[email protected] type=incorporate -depend fmri=web/php-52/extension/[email protected] type=incorporate -depend fmri=web/[email protected] type=incorporate -depend fmri=developer/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=service/network/sip/ser/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=service/network/sip/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-util-13/[email protected] type=incorporate -depend fmri=database/mysql-5/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-util-13/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-util-13/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=database/mysql-4/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=database/mysql-5/connector/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-13/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=system/ipmi/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-util-13/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/library/apache/apr-util-13/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend fmri=database/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=developer/parser/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=library/java/[email protected] type=incorporate -depend [email protected] type=incorporate -depend fmri=web/server/apache-22/plugin/[email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate -depend [email protected] type=incorporate
--- a/components/python/dulwich/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL)". You may -# only use this file in accordance with the terms of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -include ../../../make-rules/shared-macros.mk - -#PATH=/usr/bin:/usr/gnu/bin:/usr/sbin - -COMPONENT_NAME= dulwich -COMPONENT_VERSION= 0.7.1 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:cfbeb7e83c4258f489ed2736a684190004c1733f -COMPONENT_ARCHIVE_URL= http://www.samba.org/~jelmer/dulwich/$(COMPONENT_ARCHIVE) - -include ../../../make-rules/prep.mk -include ../../../make-rules/setup.py.mk -include ../../../make-rules/ips.mk - -build: $(BUILD_32_and_64) - -install: $(INSTALL_32_and_64) - -test: $(NO_TESTS)
--- a/components/python/dulwich/dulwich.license Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 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. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - 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 -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 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 -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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 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 -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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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. - - <signature of Ty Coon>, 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 Lesser General -Public License instead of this License.
--- a/components/python/dulwich/dulwich.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL)". You may -# only use this file in accordance with the terms of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -set name=pkg.fmri value=pkg:/library/python-2/dulwich@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="Python Git library" -set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" -set name=info.upstream_url value=http://www.samba.org/~jelmer/dulwich/ -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) - -license dulwich.license license="GPLv2" - -dir path=usr -dir path=usr/bin -dir path=usr/lib -dir path=usr/lib/python2.6 -dir path=usr/lib/python2.6/vendor-packages -dir path=usr/lib/python2.6/vendor-packages/dulwich -dir \ - path=usr/lib/python2.6/vendor-packages/dulwich-$(COMPONENT_VERSION)-py2.6.egg-info -dir path=usr/lib/python2.6/vendor-packages/dulwich/64 -dir path=usr/lib/python2.6/vendor-packages/dulwich/tests -file path=usr/bin/dul-daemon -file path=usr/bin/dul-web -file path=usr/bin/dulwich -file \ - path=usr/lib/python2.6/vendor-packages/dulwich-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO -file \ - path=usr/lib/python2.6/vendor-packages/dulwich-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt -file \ - path=usr/lib/python2.6/vendor-packages/dulwich-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt -file \ - path=usr/lib/python2.6/vendor-packages/dulwich-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt -file path=usr/lib/python2.6/vendor-packages/dulwich/64/_diff_tree.so -file path=usr/lib/python2.6/vendor-packages/dulwich/64/_objects.so -file path=usr/lib/python2.6/vendor-packages/dulwich/64/_pack.so -file path=usr/lib/python2.6/vendor-packages/dulwich/__init__.py -file path=usr/lib/python2.6/vendor-packages/dulwich/__init__.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/_compat.py -file path=usr/lib/python2.6/vendor-packages/dulwich/_compat.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/_diff_tree.so -file path=usr/lib/python2.6/vendor-packages/dulwich/_objects.so -file path=usr/lib/python2.6/vendor-packages/dulwich/_pack.so -file path=usr/lib/python2.6/vendor-packages/dulwich/client.py -file path=usr/lib/python2.6/vendor-packages/dulwich/client.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/diff_tree.py -file path=usr/lib/python2.6/vendor-packages/dulwich/diff_tree.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/errors.py -file path=usr/lib/python2.6/vendor-packages/dulwich/errors.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/fastexport.py -file path=usr/lib/python2.6/vendor-packages/dulwich/fastexport.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/file.py -file path=usr/lib/python2.6/vendor-packages/dulwich/file.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/index.py -file path=usr/lib/python2.6/vendor-packages/dulwich/index.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/log_utils.py -file path=usr/lib/python2.6/vendor-packages/dulwich/log_utils.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/lru_cache.py -file path=usr/lib/python2.6/vendor-packages/dulwich/lru_cache.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/object_store.py -file path=usr/lib/python2.6/vendor-packages/dulwich/object_store.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/objects.py -file path=usr/lib/python2.6/vendor-packages/dulwich/objects.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/pack.py -file path=usr/lib/python2.6/vendor-packages/dulwich/pack.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/patch.py -file path=usr/lib/python2.6/vendor-packages/dulwich/patch.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/protocol.py -file path=usr/lib/python2.6/vendor-packages/dulwich/protocol.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/repo.py -file path=usr/lib/python2.6/vendor-packages/dulwich/repo.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/server.py -file path=usr/lib/python2.6/vendor-packages/dulwich/server.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/__init__.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/__init__.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_blackbox.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_blackbox.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_client.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_client.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_diff_tree.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_diff_tree.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_fastexport.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_fastexport.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_file.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_file.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_index.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_index.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_lru_cache.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_lru_cache.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_object_store.py -file \ - path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_object_store.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_objects.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_objects.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_pack.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_pack.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_patch.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_patch.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_protocol.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_protocol.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_repository.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_repository.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_server.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_server.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_web.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/test_web.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/utils.py -file path=usr/lib/python2.6/vendor-packages/dulwich/tests/utils.pyc -file path=usr/lib/python2.6/vendor-packages/dulwich/web.py -file path=usr/lib/python2.6/vendor-packages/dulwich/web.pyc
--- a/components/python/hg-git/Makefile Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL)". You may -# only use this file in accordance with the terms of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -include ../../../make-rules/shared-macros.mk - -GIT_COMMIT_ID = 356c7e8a21c59fd2eb18 - -COMPONENT_NAME= hg-git -COMPONENT_VERSION= 0.2.6.20110531 -COMPONENT_SRC= hg-git -COMPONENT_ARCHIVE= $(COMPONENT_SRC)-$(GIT_COMMIT_ID).tar.gz -COMPONENT_ARCHIVE_URL= git://github.com/schacon/hg-git.git - -download:: - $(COMPONENT_DIR)/generate-tarball.sh $(COMPONENT_ARCHIVE_URL) $(COMPONENT_SRC) $(GIT_COMMIT_ID) - -include ../../../make-rules/prep.mk -include ../../../make-rules/setup.py.mk -include ../../../make-rules/ips.mk - - -build: $(BUILD_32) - -install: $(INSTALL_32) - -test: $(NO_TESTS)
--- a/components/python/hg-git/generate-tarball.sh Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh - -GIT=/usr/bin/git - -if [ ! -f $2-$3.tar.gz ]; then - [ -d $2 ] && rm -rf $2 - $GIT clone $1 $2 - cd $2 - $GIT checkout $3 - cd .. - tar cf - $2 | gzip -9 >$2-$3.tar.gz -fi
--- a/components/python/hg-git/hg-git.license Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - 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 -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 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 -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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 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 -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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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. - - <signature of Ty Coon>, 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.
--- a/components/python/hg-git/hg-git.p5m Mon Aug 15 14:11:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL)". You may -# only use this file in accordance with the terms of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011, Andrzej Szeszo -# - -set name=pkg.fmri \ - value=pkg:/developer/versioning/mercurial/plugin/hg-git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="Hg-Git plugin for Mercurial" -set name=info.classification \ - value="org.opensolaris.category.2008:Development/Source Code Management" -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) -set name=info.upstream_url value=http://hg-git.github.com/ -dir path=usr -dir path=usr/lib -dir path=usr/lib/python2.6 -dir path=usr/lib/python2.6/vendor-packages -dir path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info -dir path=usr/lib/python2.6/vendor-packages/hggit -file \ - path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info/PKG-INFO -file \ - path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info/SOURCES.txt -file \ - path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info/dependency_links.txt -file \ - path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info/requires.txt -file \ - path=usr/lib/python2.6/vendor-packages/hg_git-0.2.6-py2.6.egg-info/top_level.txt -file path=usr/lib/python2.6/vendor-packages/hggit/__init__.py -file path=usr/lib/python2.6/vendor-packages/hggit/__init__.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/_ssh.py -file path=usr/lib/python2.6/vendor-packages/hggit/_ssh.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/git_handler.py -file path=usr/lib/python2.6/vendor-packages/hggit/git_handler.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/gitrepo.py -file path=usr/lib/python2.6/vendor-packages/hggit/gitrepo.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/hgrepo.py -file path=usr/lib/python2.6/vendor-packages/hggit/hgrepo.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/overlay.py -file path=usr/lib/python2.6/vendor-packages/hggit/overlay.pyc -file path=usr/lib/python2.6/vendor-packages/hggit/util.py -file path=usr/lib/python2.6/vendor-packages/hggit/util.pyc -license hg-git.license license=GPLv2