18050227 mercurial 2.8.2 s11-update
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 02 Apr 2014 14:52:38 -0700
branchs11-update
changeset 3045 0121e7323666
parent 3044 6e52dcd9229a
child 3046 1e256e706b72
18050227 mercurial 2.8.2
components/mercurial/Makefile
components/mercurial/mercurial-26.p5m
components/mercurial/mercurial-27.p5m
components/mercurial/mercurial-GENFRAG.p5m
components/mercurial/mercurial-PYVER.p5m
components/mercurial/mercurial.copyright.google
components/mercurial/mercurial.p5m
components/mercurial/patches/hgmanpage.patch
components/mercurial/patches/https_proxy.patch
components/mercurial/patches/manpages.patch
components/mercurial/patches/rst.patch
--- a/components/mercurial/Makefile	Thu Apr 03 09:32:57 2014 -0700
+++ b/components/mercurial/Makefile	Wed Apr 02 14:52:38 2014 -0700
@@ -18,19 +18,19 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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=	2.2.1
+COMPONENT_VERSION=	2.8.2
 COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ab4ffe751553f852813c21ad73907530ffbc5aa39b0cf962f61fe70f196cbb81
+    sha256:c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f
 COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
@@ -48,15 +48,49 @@
 # file consistently gets the same timestamp.
 $(SOURCE_DIR)/.https_proxy.patched: GPATCH_FLAGS += -Z
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# Assuming you have docutils installed, update the manpages patch for a new
+# mercurial version based on the patches applied to the source and to the
+# manpage generator.  This works either against source that's already been
+# patched with the older manpages.patch or against a fresh tarball.  Eventually
+# we'll have docutils in the CBE and we'll be able to regenerate the manpages
+# as part of the build, rather than patching them.
+patches/manpages.patch:
+	if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \
+		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			diff -u $(COMPONENT_SRC)/doc/$$f.~1~ $(COMPONENT_SRC)/doc/$$f; \
+		done > [email protected]; \
+	else \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			cp -p $(COMPONENT_SRC)/doc/$$f $(COMPONENT_SRC)/doc/$$f.orig; \
+		done; \
+		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			diff -u $(COMPONENT_SRC)/doc/$$f.orig $(COMPONENT_SRC)/doc/$$f; \
+		done > [email protected]; \
+	fi || true
+
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+# Use bash in sh mode for the tests; using /bin/sh on Solaris hasn't always
+# worked, and using /bin/bash doesn't always work, either.  Also skip the
+# check-code test, since that ends up trying to check all the code in the
+# userland gate.  And finally, test the bits from the proto area, rather than
+# rebuilding.  Given the way the test suite works, the hg executable must be
+# named "hg".
 test:	$(INSTALL_32)
+	(cd $(BUILD_DIR); rm -f sh; ln -s /bin/bash sh; \
+	 echo test-check-code-hg.t > blacklist)
+	(cd $(PROTOUSRBINDIR); ln -s hg-$(PYTHON_VERSION) hg)
 	(cd $(COMPONENT_SRC)/tests ; \
 	 PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) TERM=dumb \
-	 $(PYTHON) ./run-tests.py --shell /bin/bash)
+	 $(PYTHON) ./run-tests.py --shell $(BUILD_DIR)/sh \
+	 --with-hg $(PROTOUSRBINDIR)/hg --blacklist $(BUILD_DIR)/blacklist)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/mercurial/mercurial-26.p5m	Thu Apr 03 09:32:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,421 +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, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(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=com.oracle.info.description value="the Mercurial source control management system"
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2006/417
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2+'
-
-# force a dependency on the mercurial package
-depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=optional
-
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/hgext
-dir path=usr/lib/python2.6/vendor-packages/hgext/convert
-dir path=usr/lib/python2.6/vendor-packages/hgext/highlight
-dir path=usr/lib/python2.6/vendor-packages/hgext/largefiles
-dir path=usr/lib/python2.6/vendor-packages/hgext/zeroconf
-dir path=usr/lib/python2.6/vendor-packages/mercurial
-dir path=usr/lib/python2.6/vendor-packages/mercurial/help
-dir path=usr/lib/python2.6/vendor-packages/mercurial/hgweb
-dir path=usr/lib/python2.6/vendor-packages/mercurial/httpclient
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/da
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/da/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/de
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/de/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/el
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/el/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/it
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/it/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ru
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ru/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW
-dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan
-dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/static
-
-file path=usr/bin/hg-2.6
-file path=usr/lib/python2.6/vendor-packages/hgext/__init__.py
-file path=usr/lib/python2.6/vendor-packages/hgext/acl.py
-file path=usr/lib/python2.6/vendor-packages/hgext/bugzilla.py
-file path=usr/lib/python2.6/vendor-packages/hgext/children.py
-file path=usr/lib/python2.6/vendor-packages/hgext/churn.py
-file path=usr/lib/python2.6/vendor-packages/hgext/color.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/__init__.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/bzr.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/common.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/convcmd.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/cvs.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/cvsps.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/darcs.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/filemap.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/git.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/gnuarch.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/hg.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/monotone.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/p4.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/subversion.py
-file path=usr/lib/python2.6/vendor-packages/hgext/convert/transport.py
-file path=usr/lib/python2.6/vendor-packages/hgext/eol.py
-file path=usr/lib/python2.6/vendor-packages/hgext/extdiff.py
-file path=usr/lib/python2.6/vendor-packages/hgext/fetch.py
-file path=usr/lib/python2.6/vendor-packages/hgext/gpg.py
-file path=usr/lib/python2.6/vendor-packages/hgext/graphlog.py
-file path=usr/lib/python2.6/vendor-packages/hgext/hgcia.py
-file path=usr/lib/python2.6/vendor-packages/hgext/hgk.py
-file path=usr/lib/python2.6/vendor-packages/hgext/highlight/__init__.py
-file path=usr/lib/python2.6/vendor-packages/hgext/highlight/highlight.py
-file path=usr/lib/python2.6/vendor-packages/hgext/interhg.py
-file path=usr/lib/python2.6/vendor-packages/hgext/keyword.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/__init__.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/basestore.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/lfcommands.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/lfutil.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/localstore.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/overrides.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/proto.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/remotestore.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/reposetup.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/uisetup.py
-file path=usr/lib/python2.6/vendor-packages/hgext/largefiles/wirestore.py
-file path=usr/lib/python2.6/vendor-packages/hgext/mq.py
-file path=usr/lib/python2.6/vendor-packages/hgext/notify.py
-file path=usr/lib/python2.6/vendor-packages/hgext/pager.py
-file path=usr/lib/python2.6/vendor-packages/hgext/patchbomb.py
-file path=usr/lib/python2.6/vendor-packages/hgext/progress.py
-file path=usr/lib/python2.6/vendor-packages/hgext/purge.py
-file path=usr/lib/python2.6/vendor-packages/hgext/rebase.py
-file path=usr/lib/python2.6/vendor-packages/hgext/record.py
-file path=usr/lib/python2.6/vendor-packages/hgext/relink.py
-file path=usr/lib/python2.6/vendor-packages/hgext/schemes.py
-file path=usr/lib/python2.6/vendor-packages/hgext/share.py
-file path=usr/lib/python2.6/vendor-packages/hgext/transplant.py
-file path=usr/lib/python2.6/vendor-packages/hgext/win32mbcs.py
-file path=usr/lib/python2.6/vendor-packages/hgext/win32text.py
-file path=usr/lib/python2.6/vendor-packages/hgext/zeroconf/Zeroconf.py
-file path=usr/lib/python2.6/vendor-packages/hgext/zeroconf/__init__.py
-file path=usr/lib/python2.6/vendor-packages/mercurial-$(COMPONENT_VERSION)-py2.6.egg-info
-file path=usr/lib/python2.6/vendor-packages/mercurial/__init__.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/__version__.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/ancestor.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/archival.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/base85.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/bdiff.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/bookmarks.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/bundlerepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/byterange.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/changegroup.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/changelog.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/cmdutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/commands.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/commandserver.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/config.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/context.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/copies.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/dagparser.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/dagutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/demandimport.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/diffhelpers.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/dirstate.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/discovery.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/dispatch.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/encoding.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/error.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/extensions.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/fancyopts.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/filelog.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/filemerge.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/fileset.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/formatter.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/graphmod.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hbisect.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/help.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/config.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/dates.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/diffs.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/environment.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/extensions.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/filesets.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/glossary.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/hgignore.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/hgweb.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/merge-tools.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/multirevs.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/patterns.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/phases.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/revisions.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/revsets.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/subrepos.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/templates.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/help/urls.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/hg.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/__init__.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/common.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/hgweb_mod.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/hgwebdir_mod.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/protocol.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/request.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/server.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/webcommands.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/webutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/wsgicgi.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/hook.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/httpclient/__init__.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/httpclient/socketutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/httpconnection.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/httprepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/i18n.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/ignore.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/keepalive.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/ru/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.6/vendor-packages/mercurial/localrepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/lock.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/lsprof.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/lsprofcalltree.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/mail.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/manifest.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/match.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/mdiff.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/merge.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/minirst.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/mpatch.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/node.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/osutil.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/parser.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/parsers.so
-file path=usr/lib/python2.6/vendor-packages/mercurial/patch.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/phases.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/posix.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/pushkey.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/pvec.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/py3kcompat.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/repair.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/repo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/revset.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/scmutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/setdiscovery.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/similar.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/sshserver.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/sslutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/statichttprepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/store.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/strutil.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/subrepo.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/tags.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/templatefilters.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/templatekw.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/templater.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/bookmarkentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/bookmarks.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/changelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/changelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/tagentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/bookmarks.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/branches.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changeset.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/fileannotate.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filediff.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/footer.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/graph.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/help.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/index.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/manifest.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/notfound.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/search.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/summary.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.bisect
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.changelog
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.compact
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.default
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.xml
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/branches.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changeset.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/fileannotate.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filediff.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/footer.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/graph.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/help.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/index.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/manifest.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/notfound.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/search.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/summary.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/branches.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/changeset.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/diffstat.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/fileannotate.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filediff.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filerevision.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/footer.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/graph.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/help.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/helptopics.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/index.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/manifest.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/notfound.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/search.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/shortlog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/changeset.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/fileannotate.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/filediff.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/index.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/manifest.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/notfound.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/bookmarkentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/bookmarks.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/changelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/changelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/filelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/tagentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/branches.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changeset.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/error.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/fileannotate.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filediff.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filelog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filelogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/footer.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/graph.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/header.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/index.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/manifest.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/map
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/notfound.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/search.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/tags.tmpl
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/background.png
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/coal-file.png
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/coal-folder.png
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/excanvas.js
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/hgicon.png
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/hglogo.png
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/mercurial.js
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-coal.css
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-gitweb.css
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-monoblue.css
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-paper.css
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style.css
-file path=usr/lib/python2.6/vendor-packages/mercurial/templates/template-vars.txt
-file path=usr/lib/python2.6/vendor-packages/mercurial/transaction.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/treediscovery.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/ui.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/url.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/util.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/verify.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/win32.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/windows.py
-file path=usr/lib/python2.6/vendor-packages/mercurial/wireproto.py
-
-link path=usr/bin/hg target=hg-2.6 mediator=python mediator-version=2.6
--- a/components/mercurial/mercurial-27.p5m	Thu Apr 03 09:32:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,421 +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, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(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=com.oracle.info.description value="the Mercurial source control management system"
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2006/417
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2+'
-
-# force a dependency on the mercurial package
-depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/hgext
-dir path=usr/lib/python2.7/vendor-packages/hgext/convert
-dir path=usr/lib/python2.7/vendor-packages/hgext/highlight
-dir path=usr/lib/python2.7/vendor-packages/hgext/largefiles
-dir path=usr/lib/python2.7/vendor-packages/hgext/zeroconf
-dir path=usr/lib/python2.7/vendor-packages/mercurial
-dir path=usr/lib/python2.7/vendor-packages/mercurial/help
-dir path=usr/lib/python2.7/vendor-packages/mercurial/hgweb
-dir path=usr/lib/python2.7/vendor-packages/mercurial/httpclient
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/da
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/da/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/de
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/de/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/el
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/el/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/it
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/it/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ru
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ru/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW
-dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan
-dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/static
-
-file path=usr/bin/hg-2.7 pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.7/vendor-packages/hgext/__init__.py
-file path=usr/lib/python2.7/vendor-packages/hgext/acl.py
-file path=usr/lib/python2.7/vendor-packages/hgext/bugzilla.py
-file path=usr/lib/python2.7/vendor-packages/hgext/children.py
-file path=usr/lib/python2.7/vendor-packages/hgext/churn.py
-file path=usr/lib/python2.7/vendor-packages/hgext/color.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/__init__.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/bzr.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/common.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/convcmd.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/cvs.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/cvsps.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/darcs.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/filemap.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/git.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/gnuarch.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/hg.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/monotone.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/p4.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/subversion.py
-file path=usr/lib/python2.7/vendor-packages/hgext/convert/transport.py
-file path=usr/lib/python2.7/vendor-packages/hgext/eol.py
-file path=usr/lib/python2.7/vendor-packages/hgext/extdiff.py
-file path=usr/lib/python2.7/vendor-packages/hgext/fetch.py
-file path=usr/lib/python2.7/vendor-packages/hgext/gpg.py
-file path=usr/lib/python2.7/vendor-packages/hgext/graphlog.py
-file path=usr/lib/python2.7/vendor-packages/hgext/hgcia.py
-file path=usr/lib/python2.7/vendor-packages/hgext/hgk.py
-file path=usr/lib/python2.7/vendor-packages/hgext/highlight/__init__.py
-file path=usr/lib/python2.7/vendor-packages/hgext/highlight/highlight.py
-file path=usr/lib/python2.7/vendor-packages/hgext/interhg.py
-file path=usr/lib/python2.7/vendor-packages/hgext/keyword.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/__init__.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/basestore.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/lfcommands.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/lfutil.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/localstore.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/overrides.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/proto.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/remotestore.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/reposetup.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/uisetup.py
-file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/wirestore.py
-file path=usr/lib/python2.7/vendor-packages/hgext/mq.py
-file path=usr/lib/python2.7/vendor-packages/hgext/notify.py
-file path=usr/lib/python2.7/vendor-packages/hgext/pager.py
-file path=usr/lib/python2.7/vendor-packages/hgext/patchbomb.py
-file path=usr/lib/python2.7/vendor-packages/hgext/progress.py
-file path=usr/lib/python2.7/vendor-packages/hgext/purge.py
-file path=usr/lib/python2.7/vendor-packages/hgext/rebase.py
-file path=usr/lib/python2.7/vendor-packages/hgext/record.py
-file path=usr/lib/python2.7/vendor-packages/hgext/relink.py
-file path=usr/lib/python2.7/vendor-packages/hgext/schemes.py
-file path=usr/lib/python2.7/vendor-packages/hgext/share.py
-file path=usr/lib/python2.7/vendor-packages/hgext/transplant.py
-file path=usr/lib/python2.7/vendor-packages/hgext/win32mbcs.py
-file path=usr/lib/python2.7/vendor-packages/hgext/win32text.py
-file path=usr/lib/python2.7/vendor-packages/hgext/zeroconf/Zeroconf.py
-file path=usr/lib/python2.7/vendor-packages/hgext/zeroconf/__init__.py
-file path=usr/lib/python2.7/vendor-packages/mercurial-$(COMPONENT_VERSION)-py2.7.egg-info
-file path=usr/lib/python2.7/vendor-packages/mercurial/__init__.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/__version__.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/ancestor.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/archival.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/base85.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/bdiff.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/bookmarks.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/bundlerepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/byterange.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/changegroup.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/changelog.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/cmdutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/commands.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/commandserver.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/config.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/context.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/copies.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/dagparser.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/dagutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/demandimport.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/diffhelpers.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/dirstate.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/discovery.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/dispatch.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/encoding.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/error.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/extensions.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/fancyopts.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/filelog.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/filemerge.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/fileset.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/formatter.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/graphmod.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hbisect.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/help.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/config.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/dates.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/diffs.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/environment.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/extensions.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/filesets.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/glossary.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/hgignore.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/hgweb.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/merge-tools.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/multirevs.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/patterns.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/phases.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/revisions.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/revsets.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/subrepos.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/templates.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/help/urls.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/hg.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/__init__.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/common.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/hgweb_mod.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/hgwebdir_mod.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/protocol.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/request.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/server.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/webcommands.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/webutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/wsgicgi.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/hook.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/httpclient/__init__.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/httpclient/socketutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/httpconnection.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/httprepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/i18n.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/ignore.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/keepalive.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/ru/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
-file path=usr/lib/python2.7/vendor-packages/mercurial/localrepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/lock.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/lsprof.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/lsprofcalltree.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/mail.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/manifest.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/match.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/mdiff.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/merge.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/minirst.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/mpatch.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/node.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/osutil.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/parser.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/parsers.so
-file path=usr/lib/python2.7/vendor-packages/mercurial/patch.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/phases.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/posix.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/pushkey.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/pvec.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/py3kcompat.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/repair.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/repo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/revlog.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/revset.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/scmutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/setdiscovery.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/similar.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/simplemerge.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/sshrepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/sshserver.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/sslutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/statichttprepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/store.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/strutil.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/subrepo.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/tags.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/templatefilters.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/templatekw.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/templater.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/bookmarkentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/bookmarks.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/changelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/changelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/tagentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/bookmarks.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/branches.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changeset.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/fileannotate.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filediff.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/footer.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/graph.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/help.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/index.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/manifest.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/notfound.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/search.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/summary.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.bisect
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.changelog
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.compact
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.default
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.xml
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/branches.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changeset.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/fileannotate.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filediff.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/footer.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/graph.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/help.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/index.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/manifest.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/notfound.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/search.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/summary.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/branches.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/changeset.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/diffstat.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/fileannotate.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filediff.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filerevision.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/footer.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/graph.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/help.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/helptopics.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/index.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/manifest.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/notfound.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/search.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/shortlog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/changeset.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/fileannotate.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/filediff.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/index.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/manifest.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/notfound.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/bookmarkentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/bookmarks.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/changelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/changelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/filelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/tagentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/branches.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changeset.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/error.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/fileannotate.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filediff.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filelog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filelogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/footer.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/graph.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/header.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/index.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/manifest.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/map
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/notfound.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/search.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/tags.tmpl
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/background.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-file.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-folder.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/excanvas.js
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/hgicon.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/hglogo.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/mercurial.js
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-coal.css
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-gitweb.css
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-monoblue.css
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-paper.css
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style.css
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/template-vars.txt
-file path=usr/lib/python2.7/vendor-packages/mercurial/transaction.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/treediscovery.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/ui.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/url.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/util.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/verify.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/win32.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/windows.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/wireproto.py
-
-link path=usr/bin/hg target=hg-2.7 mediator=python mediator-version=2.7
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Wed Apr 02 14:52:38 2014 -0700
@@ -0,0 +1,88 @@
+#
+# 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, 2014, 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>
+
+license mercurial.copyright license='GPLv2+'
+
+dir path=usr
+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/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+dir path=usr/share/man/man5
+
+file path=usr/demo/mercurial/bash_completion
+file path=usr/demo/mercurial/casesmash.py
+file path=usr/demo/mercurial/check-code.py mode=555
+file path=usr/demo/mercurial/convert-repo mode=555
+file path=usr/demo/mercurial/debugcmdserver.py 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/lock-checker.py
+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/simplemerge mode=555
+file path=usr/demo/mercurial/synthrepo.py
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial-PYVER.p5m	Wed Apr 02 14:52:38 2014 -0700
@@ -0,0 +1,454 @@
+#
+# 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, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/developer/versioning/mercurial-$(PYV)@$(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=com.oracle.info.description value="the Mercurial source control management system"
+set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/417
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license mercurial.copyright license='GPLv2+'
+license mercurial.copyright.google license='BSD 3-Clause'
+
+# force a dependency on the mercurial package
+depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=optional
+
+dir path=usr/lib/python$(PYVER)
+dir path=usr/lib/python$(PYVER)/vendor-packages
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static
+
+file path=usr/bin/hg-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/acl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/bugzilla.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/color.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/bzr.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/convcmd.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/cvs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/cvsps.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/darcs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/filemap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/git.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/gnuarch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/hg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/monotone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/p4.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/subversion.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/transport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/eol.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/extdiff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/factotum.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fetch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/gpg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/graphlog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgcia.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/highlight.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/histedit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/interhg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/keyword.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/basestore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/lfcommands.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/lfutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/localstore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/overrides.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/proto.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/remotestore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/reposetup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/uisetup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/wirestore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/mq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/notify.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/pager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/patchbomb.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/progress.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/purge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/rebase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/record.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/relink.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/schemes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/share.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/shelve.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/strip.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/transplant.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/win32mbcs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/win32text.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/Zeroconf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__version__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ancestor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/archival.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/base85.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bdiff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bookmarks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/branchmap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bundlerepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/byterange.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changegroup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changelog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cmdutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commands.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commandserver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/context.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/copies.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagparser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dicthelpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/discovery.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dispatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/encoding.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/error.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/extensions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/fancyopts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/filelog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/filemerge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/fileset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/formatter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/graphmod.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hbisect.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/common.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/config.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/dates.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/diffs.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/environment.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/extensions.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/filesets.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/glossary.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg.1.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.5.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgrc.5.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgweb.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/merge-tools.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/multirevs.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/patterns.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/phases.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revisions.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revsets.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/subrepos.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/templates.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/urls.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/hgweb_mod.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/hgwebdir_mod.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/protocol.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/request.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/webcommands.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/webutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/wsgicgi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hook.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/_readers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/socketutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpconnection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httppeer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/i18n.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ignore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/keepalive.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/localrepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lock.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lsprof.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lsprofcalltree.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mail.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/manifest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/match.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mdiff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/merge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minirst.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mpatch.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/node.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/obsolete.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/osutil.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/parsers.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/patch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/peer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/phases.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/posix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pushkey.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pvec.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/py3kcompat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repair.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repoview.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revlog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmposix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmwindows.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/setdiscovery.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/similar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshpeer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshserver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sslutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statichttprepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/store.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/strutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/subrepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tags.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatefilters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatekw.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templater.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/bookmarkentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/bookmarks.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/branchentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/changelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/tagentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/bookmarks.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/changelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/changeset.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/fileannotate.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/filecomparison.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/filediff.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/footer.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/help.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/index.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/manifest.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/notfound.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/search.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/summary.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.bisect
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.changelog
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.compact
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.default
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.phases
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.xml
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/changelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/changeset.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/fileannotate.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/filecomparison.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/filediff.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/footer.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/help.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/index.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/manifest.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/notfound.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/search.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/summary.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/changeset.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/diffstat.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/fileannotate.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filecomparison.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filediff.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filerevision.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/footer.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/help.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/helptopics.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/index.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/manifest.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/notfound.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/search.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/shortlog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/changeset.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/fileannotate.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/filediff.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/graphedge.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/graphnode.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/index.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/logentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/manifest.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/notfound.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/search.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/bookmarkentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/bookmarks.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/branchentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/changelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/filelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/tagentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/branches.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/changelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/changeset.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/error.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/fileannotate.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/filediff.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/filelog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/filelogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/footer.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/header.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/index.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/manifest.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/map
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/notfound.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/search.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/tags.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/background.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-file.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-folder.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/excanvas.js
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/feed-icon-14x14.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/hgicon.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/hglogo.png
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/mercurial.js
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-coal.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-gitweb.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-monoblue.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-paper.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/transaction.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/treediscovery.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ui.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/unionrepo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/url.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/verify.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/win32.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/windows.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireproto.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py
+
+link path=usr/bin/hg target=hg-$(PYVER) mediator=python mediator-version=$(PYVER)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial.copyright.google	Wed Apr 02 14:52:38 2014 -0700
@@ -0,0 +1,30 @@
+Copyright 2011, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/components/mercurial/mercurial.p5m	Thu Apr 03 09:32:57 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +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, 2013, 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/[email protected]$(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=com.oracle.info.description value="the Mercurial source control management system"
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2006/417
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2+'
-
-depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
-
-
-dir path=usr
-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/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man5
-
-file path=usr/demo/mercurial/bash_completion
-file path=usr/demo/mercurial/casesmash.py
-file path=usr/demo/mercurial/check-code.py mode=555
-file path=usr/demo/mercurial/convert-repo mode=555
-file path=usr/demo/mercurial/debugcmdserver.py 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/hgmanpage.patch	Wed Apr 02 14:52:38 2014 -0700
@@ -0,0 +1,103 @@
+rst2man does a poor job of creating man pages that can be read on Solaris.
+Some of the changes in this patch make the Solaris *roff tools do the right
+thing:
+
+  - Getting rid of the rst2man header before the SYNOPSIS
+
+  - Changing "\(aq" to "'", and making sure that single quotes don't start
+    a line (at least in a couple of places where it's not safe)
+
+  - Changing ".ft C" and ".ft P" to simply ".ft"
+
+  - Removing "\%" and "\:"
+
+Groff also seems to have as much trouble with the .INDENT/.UNINDENT macros
+as Solaris *roff, de-indenting paragraphs that shouldn't be, so we use
+.RS/.RE instead.  It's not as fancy, but seems to do the job.
+
+Applying this patch has no effect in the normal userland build (it can't
+run automatically until docutils is delivered), but it enables a "gmake
+patches/manpage.patch" to regenerate the manpages with the updated text
+(found in rst.patch) with the patched hgmanpage.py, and updates the
+manpage.patch file.
+
+--- mercurial-2.7/doc/hgmanpage.py	Thu Aug  1 20:37:39 2013
++++ mercurial-2.7/doc/hgmanpage.py	Mon Aug 19 14:40:04 2013
[email protected]@ -197,6 +197,7 @@
+         self._in_docinfo = None
+         self._active_table = None
+         self._in_literal = False
++        self._in_literal_inline = False
+         self.header_written = 0
+         self._line_block = 0
+         self.authors = []
[email protected]@ -212,15 +213,15 @@
+         # ``B`` bold, ``I`` italic, ``R`` roman should be available.
+         # Hopefully ``C`` courier too.
+         self.defs = {
+-                'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'),
++                'indent' : ('.RS %d\n', '.RE\n'),
+                 'definition_list_item' : ('.TP', ''),
+                 'field_name' : ('.TP\n.B ', '\n'),
+                 'literal' : ('\\fB', '\\fP'),
+-                'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'),
++                'literal_block' : ('.sp\n.nf\n.ft\n', '\n.ft\n.fi\n'),
+ 
+                 'option_list_item' : ('.TP\n', ''),
+ 
+-                'reference' : (r'\%', r'\:'),
++                'reference' : (r'', r''),
+                 'emphasis': ('\\fI', '\\fP'),
+                 'strong' : ('\\fB', '\\fP'),
+                 'term' : ('\n.B ', '\n'),
[email protected]@ -267,6 +268,7 @@
+                     self.body[i - 2][:4] == '.TP\n'):
+                     self.body[i] = '.\n'
+                 elif (self.body[i - 1] == '\n' and
++                    self.body[i - 2] and
+                     self.body[i - 2][0] != '.' and
+                     (self.body[i - 3][:7] == '.TP\n.B '
+                         or self.body[i - 3][:4] == '\n.B ')
[email protected]@ -284,7 +286,6 @@
+         text = text.replace('\\','\\e')
+         replace_pairs = [
+             (u'-', ur'\-'),
+-            (u'\'', ur'\(aq'),
+             (u'ยด', ur'\''),
+             (u'`', ur'\(ga'),
+             ]
[email protected]@ -297,6 +298,15 @@
+             if text[0] == '.':
+                 text = '\\&' + text
+             text = text.replace('\n.', '\n\\&.')
++        # We need to do the same thing for the inline literals, too
++        if self._in_literal_inline and text[0] == '.':
++            if self.body[-2].endswith('\n') and \
++              self.body[-1] == self.defs['literal'][0]:
++                  self.body.append('\\&')
++        # Single quotes starting a line are harmful, too.
++        if text[0] == "'":
++                text = '\\&' + text
++        text = text.replace("\n'", "\n\\&'")
+         self.body.append(text)
+ 
+     def depart_Text(self, node):
[email protected]@ -381,7 +391,6 @@
+         if self.header_written:
+             return
+         self.body.append(self.header())
+-        self.body.append(MACRO_DEF)
+         self.header_written = 1
+ 
+     def visit_address(self, node):
[email protected]@ -795,8 +804,10 @@
+ 
+     def visit_literal(self, node):
+         self.body.append(self.defs['literal'][0])
++        self._in_literal_inline = True
+ 
+     def depart_literal(self, node):
++        self._in_literal_inline = False
+         self.body.append(self.defs['literal'][1])
+ 
+     def visit_literal_block(self, node):
--- a/components/mercurial/patches/https_proxy.patch	Thu Apr 03 09:32:57 2014 -0700
+++ b/components/mercurial/patches/https_proxy.patch	Wed Apr 02 14:52:38 2014 -0700
@@ -1,7 +1,7 @@
 # 7029500 Mercurial doesn't work through https in snv_161
 
---- mercurial-1.8.2/mercurial/keepalive.py	Thu May  3 21:06:28 2012
-+++ mercurial-1.8.2/mercurial/keepalive.py	Thu May  3 21:06:28 2012
+--- mercurial-2.8.2/mercurial/keepalive.py	Wed Jan  2 03:46:39 2014
++++ mercurial-2.8.2/mercurial/keepalive.py	Wed Jan  2 03:46:39 2014
 @@ -247,6 +251,8 @@
              else:
                  # no (working) free connections were found.  Create a new one.
--- a/components/mercurial/patches/manpages.patch	Thu Apr 03 09:32:57 2014 -0700
+++ b/components/mercurial/patches/manpages.patch	Wed Apr 02 14:52:38 2014 -0700
@@ -1,31 +1,6 @@
-rst2man does a poor job of creating man pages that can be read on Solaris.
-Some of the changes in this patch make the Solaris *roff tools do the right
-thing:
-
-  - Getting rid of the rst2man header before the SYNOPSIS
-
-  - Changing "\(aq" to "'", and making sure that single quotes don't start
-    a line (at least in a couple of places where it's not safe)
-
-  - Changing ".ft C" and ".ft P" to simply ".ft"
-
-  - Removing "\%" and "\:"
-
-Groff also makes hash of an .IP terminated by .RE (the .RE sends the
-following paragraphs all the way to the left margin, rather than simply
-terminating the indented paragraph).  It needs a preceding .RS to do the
-right thing, and .RS 0 seems to give the best effect.  Probably most
-.INDENT/.UNINDENT pairs should be converted to .RS/.RE, too.
-
-We also get rid of references to other operating systems, since there
-aren't many, and they may confuse the reader.
-
---- mercurial-2.2.1/doc/hg.1	Thu May  3 14:06:34 2012
-+++ mercurial-2.2.1/doc/hg.1	Sat May 12 17:39:08 2012
[email protected]@ -1,35 +1,9 @@
-+'\" t
- .\" Man page generated from reStructeredText.
- .
+--- mercurial-2.8.2/doc/hg.1	Wed Jan  1 19:46:47 2014
++++ mercurial-2.8.2/doc/hg.1	Tue Jan  7 15:28:46 2014
[email protected]@ -3,33 +3,6 @@
  .TH HG 1 "" "" "Mercurial Manual"
  .SH NAME
  hg \- Mercurial source code management system
@@ -59,7 +34,13 @@
  .SH SYNOPSIS
  .sp
  \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...
[email protected]@ -43,7 +17,7 @@
[email protected]@ -38,12 +11,12 @@
+ The \fBhg\fP command provides a command line interface to the Mercurial
+ system.
+ .SH COMMAND ELEMENTS
+-.INDENT 0.0
++.RS 0
+ .TP
  .B files...
  .
  indicates one or more filename or relative path filenames; see
@@ -68,7 +49,19 @@
  .TP
  .B path
  .
[email protected]@ -85,7 +59,7 @@
[email protected]@ -59,9 +32,9 @@
+ .
+ either the pathname of a local repository or the URI of a remote
+ repository.
+-.UNINDENT
++.RE
+ .SH OPTIONS
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-R,  \-\-repository
+ .
[email protected]@ -85,7 +58,7 @@
  .TP
  .B \-\-config
  .
@@ -77,7 +70,13 @@
  .TP
  .B \-\-debug
  .
[email protected]@ -127,9 +101,9 @@
[email protected]@ -126,14 +99,14 @@
+ .B \-\-hidden
+ .
+ consider hidden changesets
+-.UNINDENT
++.RE
+ .SH COMMANDS
  .SS add
  .sp
  .nf
@@ -89,7 +88,7 @@
  .fi
  .sp
  Schedule files to be version controlled and added to the
[email protected]@ -136,15 +110,15 @@
[email protected]@ -140,15 +113,15 @@
  repository.
  .sp
  The files will be added to the repository at the next commit. To
@@ -108,7 +107,7 @@
  $ ls
  foo.c
  $ hg status
[email protected]@ -153,7 +127,7 @@
[email protected]@ -157,13 +130,13 @@
  adding foo.c
  $ hg status
  A foo.c
@@ -117,7 +116,19 @@
  .fi
  .sp
  Returns 0 if all files are successfully added.
[email protected]@ -180,9 +154,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-I,  \-\-include
+ .
[email protected]@ -180,13 +153,13 @@
+ .B \-n,  \-\-dry\-run
+ .
+ do not perform actions, just print output
+-.UNINDENT
++.RE
  .SS addremove
  .sp
  .nf
@@ -129,16 +140,39 @@
  .fi
  .sp
  Add all new files and remove all missing files from the
[email protected]@ -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
[email protected]@ -193,7 +166,7 @@
+ repository.
+ .sp
+ New files are ignored if they match any of the patterns in
+-\fB.hgignore\fP. As with add, these changes take effect at the next
++\fB\&.hgignore\fP. As with add, these changes take effect at the next
+ commit.
+ .sp
+ Use the \-s/\-\-similarity option to detect renamed files. This
[email protected]@ -201,7 +174,7 @@
+ be identical) as its parameter. With a parameter greater than 0,
+ this compares every removed file with every added file and records
+ those similar enough as renames. 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
+ used to check which files were identified as moved or renamed. If
+ not specified, \-s/\-\-similarity defaults to 100 and only renames of
+ identical files are detected.
[email protected]@ -209,7 +182,7 @@
  Returns 0 if all files are successfully added.
[email protected]@ -224,9 +198,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-similarity
+ .
[email protected]@ -226,13 +199,13 @@
+ .B \-n,  \-\-dry\-run
+ .
+ do not perform actions, just print output
+-.UNINDENT
++.RE
  .SS annotate
  .sp
  .nf
@@ -150,7 +184,16 @@
  .fi
  .sp
  List changes in files, showing the revision id responsible for
[email protected]@ -255,7 +229,7 @@
[email protected]@ -249,7 +222,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -261,7 +234,7 @@
  .TP
  .B \-\-no\-follow
  .
@@ -159,7 +202,12 @@
  .TP
  .B \-a,  \-\-text
  .
[email protected]@ -310,9 +284,9 @@
[email protected]@ -312,13 +285,13 @@
+ exclude names matching the given patterns
+ .sp
+ aliases: blame
+-.UNINDENT
++.RE
  .SS archive
  .sp
  .nf
@@ -171,7 +219,14 @@
  .fi
  .sp
  By default, the revision used is the parent of the working
[email protected]@ -328,9 +302,9 @@
[email protected]@ -328,15 +301,15 @@
+ extension (or override using \-t/\-\-type).
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  create a zip file containing the 1.0 release:
  .sp
  .nf
@@ -183,7 +238,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -337,9 +311,9 @@
[email protected]@ -343,14 +316,14 @@
  create a tarball excluding .hg files:
  .sp
  .nf
@@ -193,10 +248,21 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -372,7 +346,7 @@
- .UNINDENT
+-.UNINDENT
++.RE
+ .sp
+ Valid types are:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBfiles\fP
+ .sp
[email protected]@ -375,10 +348,10 @@
+ .B \fBzip\fP
+ .sp
+ zip archive, compressed using deflate
+-.UNINDENT
++.RE
  .sp
  The exact name of the destination archive or directory is given
 -using a format string; see \%\fBhg help export\fP\: for details.
@@ -204,7 +270,21 @@
  .sp
  Each member added to an archive file has a directory prefix
  prepended. Use \-p/\-\-prefix to specify a format string for the
[email protected]@ -415,9 +389,9 @@
[email protected]@ -388,7 +361,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-no\-decode
+ .
[email protected]@ -417,13 +390,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS backout
  .sp
  .nf
@@ -216,15 +296,7 @@
  .fi
  .sp
  Prepare a new changeset with the effect of REV undone in the
[email protected]@ -426,6 +400,7 @@
- If REV is the parent of the working directory, then this new changeset
- is committed automatically. Otherwise, hg needs to merge the
- changes and the merged result is left uncommitted.
-+.RS 0
- .IP Note
- .
- backout cannot be used to fix either an unwanted or
[email protected]@ -438,11 +413,11 @@
[email protected]@ -444,16 +417,16 @@
  working directory and a new child of REV that simply undoes REV.
  .sp
  Before version 1.7, the behavior without \-\-merge was equivalent
@@ -238,7 +310,18 @@
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -492,9 +467,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-merge
+ .
[email protected]@ -494,13 +467,13 @@
+ .B \-u,  \-\-user
+ .
+ record the specified user as committer
+-.UNINDENT
++.RE
  .SS bisect
  .sp
  .nf
@@ -250,8 +333,15 @@
  .fi
  .sp
  This command helps to find changesets which introduce problems. To
[email protected]@ -522,10 +497,10 @@
- start a bisection with known bad revision 12, and good revision 34:
[email protected]@ -524,16 +497,16 @@
+ is bad.
+ .sp
+ Some examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ start a bisection with known bad revision 34, and good revision 12:
  .sp
  .nf
 -.ft C
@@ -263,7 +353,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -533,10 +508,10 @@
[email protected]@ -541,10 +514,10 @@
  bad:
  .sp
  .nf
@@ -276,7 +366,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -544,10 +519,10 @@
[email protected]@ -552,10 +525,10 @@
  that revision is not usable because of another issue):
  .sp
  .nf
@@ -289,7 +379,20 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -554,22 +529,22 @@
[email protected]@ -562,9 +535,9 @@
+ skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
+ .sp
+ .nf
+-.ft C
+-hg bisect \-\-skip "!( file(\(aqpath:foo\(aq) & file(\(aqpath:bar\(aq) )"
+-.ft P
++.ft
++hg bisect \-\-skip "!( file('path:foo') & file('path:bar') )"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -571,22 +544,22 @@
  forget the current bisection:
  .sp
  .nf
@@ -311,14 +414,13 @@
  hg bisect \-\-reset
  hg bisect \-\-bad 34
  hg bisect \-\-good 12
--hg bisect \-\-command \(aqmake && make tests\(aq
--.ft P
-+hg bisect \-\-command 'make && make tests'
-+.ft
- .fi
- .IP \(bu 2
- .
[email protected]@ -577,9 +552,9 @@
+ hg bisect \-\-command "make && make tests"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -594,9 +567,9 @@
  bisection:
  .sp
  .nf
@@ -330,7 +432,19 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -586,9 +561,9 @@
[email protected]@ -604,9 +577,9 @@
+ if running with \-U/\-\-noupdate):
+ .sp
+ .nf
+-.ft C
++.ft
+ hg log \-r "bisect(current)"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -613,9 +586,9 @@
  see all changesets that took part in the current bisection:
  .sp
  .nf
@@ -342,8 +456,8 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -595,13 +570,13 @@
- with the graphlog extension, you can even get a nice graph:
[email protected]@ -622,18 +595,18 @@
+ you can even get a nice graph:
  .sp
  .nf
 -.ft C
@@ -352,20 +466,32 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
+-.UNINDENT
++.RE
  .sp
 -See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
 +See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -639,23 +614,23 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-reset
+ .
[email protected]@ -662,31 +635,31 @@
+ .B \-U,  \-\-noupdate
+ .
+ do not update to target
+-.UNINDENT
++.RE
  .SS bookmarks
  .sp
  .nf
 -.ft C
 +.ft
- hg bookmarks [\-f] [\-d] [\-i] [\-m NAME] [\-r REV] [NAME]
+ hg bookmarks [OPTIONS]... [NAME]...
 -.ft P
 +.ft
  .fi
@@ -391,7 +517,26 @@
  repositories to support bookmarks. For versions prior to 1.8, this means
  the bookmarks extension must be enabled.
  .sp
[email protected]@ -690,14 +665,15 @@
+-If you set a bookmark called \([email protected]\(aq, new clones of the repository will
++If you set a bookmark called '@', new clones of the repository will
+ have that revision checked out (and the bookmark made active) by
+ default.
+ .sp
[email protected]@ -696,7 +669,7 @@
+ current active bookmark will be marked inactive.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -719,18 +692,18 @@
+ mark a bookmark inactive
+ .sp
+ aliases: bookmark
+-.UNINDENT
++.RE
  .SS branch
  .sp
  .nf
@@ -401,7 +546,6 @@
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
 -Branch names are permanent and global. Use \%\fBhg bookmark\fP\: to create a
@@ -411,7 +555,7 @@
  information about named branches and bookmarks.
  .RE
  .sp
[email protected]@ -704,18 +680,18 @@
[email protected]@ -737,23 +710,23 @@
  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
@@ -434,7 +578,18 @@
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -733,19 +709,19 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -762,28 +735,28 @@
+ .B \-C,  \-\-clean
+ .
+ reset branch name to parent branch name
+-.UNINDENT
++.RE
  .SS branches
  .sp
  .nf
@@ -459,7 +614,18 @@
  .sp
  Returns 0.
  .sp
[email protected]@ -763,9 +739,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-active
+ .
[email protected]@ -792,13 +765,13 @@
+ .B \-c,  \-\-closed
+ .
+ show normal and closed branches
+-.UNINDENT
++.RE
  .SS bundle
  .sp
  .nf
@@ -471,7 +637,21 @@
  .fi
  .sp
  Generate a compressed changegroup file collecting changesets not
[email protected]@ -832,9 +808,9 @@
[email protected]@ -824,7 +797,7 @@
+ Returns 0 on success, 1 if no changes found.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -861,13 +834,13 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS cat
  .sp
  .nf
@@ -483,7 +663,16 @@
  .fi
  .sp
  Print the specified files as they were at the given revision. If
[email protected]@ -852,7 +828,7 @@
[email protected]@ -876,7 +849,7 @@
+ Output may be to a file, in which case the name of the file is
+ given using a format string. The formatting rules are the same as
+ for the export command, with the following additions:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fB%s\fP
+ .sp
[email protected]@ -884,17 +857,17 @@
  .TP
  .B \fB%d\fP
  .sp
@@ -492,7 +681,24 @@
  .TP
  .B \fB%p\fP
  .sp
[email protected]@ -887,9 +863,9 @@
+ root\-relative path name of file being printed
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-o,  \-\-output
+ .
[email protected]@ -915,13 +888,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS clone
  .sp
  .nf
@@ -504,16 +710,20 @@
  .fi
  .sp
  Create a copy of an existing repository in a new directory.
[email protected]@ -897,7 +873,7 @@
[email protected]@ -929,22 +902,22 @@
  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
+-\fB.hg/hgrc\fP file, as the default to be used for future pulls.
 +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.
++\fB\&.hg/hgrc\fP file, as the default to be used for future pulls.
  .sp
  Only local paths and \fBssh://\fP URLs are supported as
[email protected]@ -907,7 +883,7 @@
+ destinations. For \fBssh://\fP destinations, no working directory or
+-\fB.hg/hgrc\fP will be created on the remote side.
++\fB\&.hg/hgrc\fP will be created on the remote side.
+ .sp
  To pull only a subset of changesets, specify one or more revisions
  identifiers with \-r/\-\-rev or branches with \-b/\-\-branch. The
  resulting clone will contain only the specified changesets and
@@ -522,7 +732,13 @@
  \-\-pull, even for local source repositories. Note that specifying a
  tag will include the tagged changeset but not the changeset
  containing the tag.
[email protected]@ -926,9 +902,9 @@
+ .sp
+-If the source repository has a bookmark called \([email protected]\(aq set, that
++If the source repository has a bookmark called '@' set, that
+ revision will be checked out in the new repository by default.
+ .sp
+ To check out a particular version, use \-u/\-\-update, or
[email protected]@ -961,9 +934,9 @@
  directory using full hardlinks with
  .sp
  .nf
@@ -534,7 +750,16 @@
  .fi
  .sp
  This is the fastest way to clone, but it is not always safe. The
[email protected]@ -947,7 +923,7 @@
[email protected]@ -975,7 +948,7 @@
+ .sp
+ Mercurial will update the working directory to the first applicable
+ revision from this list:
+-.INDENT 0.0
++.RS 0
+ .IP a. 3
+ .
+ null if \-U or the source repository has no changesets
[email protected]@ -982,7 +955,7 @@
  .IP b. 3
  .
  if \-u . and the source repository is local, the first parent of
@@ -543,7 +768,27 @@
  .IP c. 3
  .
  the changeset specified with \-u (if a branch name, this means the
[email protected]@ -976,9 +952,9 @@
[email protected]@ -998,7 +971,7 @@
+ the tipmost head specified with the url#branch source syntax
+ .IP g. 3
+ .
+-the revision marked with the \([email protected]\(aq bookmark, if present
++the revision marked with the '@' bookmark, if present
+ .IP h. 3
+ .
+ the tipmost head of the default branch
[email protected]@ -1005,18 +978,18 @@
+ .IP i. 3
+ .
+ tip
+-.UNINDENT
++.RE
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  clone a remote repository to a new directory named hg/:
  .sp
  .nf
@@ -555,7 +800,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -985,9 +961,9 @@
[email protected]@ -1023,9 +996,9 @@
  create a lightweight local clone:
  .sp
  .nf
@@ -567,7 +812,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -994,9 +970,9 @@
[email protected]@ -1032,9 +1005,9 @@
  clone from an absolute path on an ssh server (note double\-slash):
  .sp
  .nf
@@ -579,7 +824,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1004,9 +980,9 @@
[email protected]@ -1042,9 +1015,9 @@
  specified version:
  .sp
  .nf
@@ -591,7 +836,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1013,9 +989,9 @@
[email protected]@ -1051,9 +1024,9 @@
  create a repository without changesets after a particular revision:
  .sp
  .nf
@@ -603,7 +848,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1022,13 +998,13 @@
[email protected]@ -1060,18 +1033,18 @@
  clone (and track) a particular named branch:
  .sp
  .nf
@@ -613,14 +858,26 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
+-.UNINDENT
++.RE
  .sp
 -See \%\fBhg help urls\fP\: for details on specifying URLs.
 +See \fBhg help urls\fP for details on specifying URLs.
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -1074,16 +1050,16 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-U,  \-\-noupdate
+ .
[email protected]@ -1108,20 +1081,20 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS commit
  .sp
  .nf
@@ -641,7 +898,12 @@
  will be committed.
  .sp
  If you are committing the result of a merge, do not provide any
[email protected]@ -1096,19 +1072,19 @@
[email protected]@ -1130,28 +1103,28 @@
+ If no commit message is specified, Mercurial starts your
+ configured editor where you can enter a message. In case your
+ commit fails, you will find a backup of your message in
+-\fB.hg/last\-message.txt\fP.
++\fB\&.hg/last\-message.txt\fP.
  .sp
  The \-\-amend flag can be used to amend the parent of the
  working directory with a new commit that contains the changes
@@ -649,7 +911,7 @@
 +in the parent in addition to those currently reported by \fBhg status\fP,
  if there are any. The old commit is stored in a backup bundle in
 -\fB.hg/strip\-backup\fP (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:
-+\fB.hg/strip\-backup\fP (see \fBhg help bundle\fP and \fBhg help unbundle\fP
++\fB\&.hg/strip\-backup\fP (see \fBhg help bundle\fP and \fBhg help unbundle\fP
  on how to restore it).
  .sp
  Message, user and date are taken from the amended commit unless
@@ -666,7 +928,18 @@
  .sp
  Returns 0 on success, 1 if nothing changed.
  .sp
[email protected]@ -1160,9 +1136,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-addremove
+ .
[email protected]@ -1198,13 +1171,13 @@
+ recurse into subrepositories
+ .sp
+ aliases: ci
+-.UNINDENT
++.RE
  .SS copy
  .sp
  .nf
@@ -678,7 +951,7 @@
  .fi
  .sp
  Mark dest as having copies of source files. If dest is a
[email protected]@ -1174,7 +1150,7 @@
[email protected]@ -1216,12 +1189,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect with the next commit. To undo a copy
@@ -687,7 +960,18 @@
  .sp
  Returns 0 on success, 1 if errors are encountered.
  .sp
[email protected]@ -1206,18 +1182,19 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-after
+ .
[email protected]@ -1244,13 +1217,13 @@
+ do not perform actions, just print output
+ .sp
+ aliases: cp
+-.UNINDENT
++.RE
  .SS diff
  .sp
  .nf
@@ -699,9 +983,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files.
- .sp
- Differences between files are shown using the unified diff format.
-+.RS 0
[email protected]@ -1259,7 +1232,7 @@
  .IP Note
  .
  diff may generate unexpected results for merges, as it will
@@ -710,7 +992,7 @@
  parent changeset if no revisions are specified.
  .RE
  .sp
[email protected]@ -1235,7 +1212,7 @@
[email protected]@ -1277,18 +1250,18 @@
  anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -718,8 +1000,10 @@
 +format. For more information, read \fBhg help diffs\fP.
  .sp
  Examples:
- .INDENT 0.0
[email protected]@ -1244,9 +1221,9 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  compare a file in the current working directory to its parent:
  .sp
  .nf
@@ -731,7 +1015,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1253,9 +1230,9 @@
[email protected]@ -1295,9 +1268,9 @@
  compare two historical versions of a directory, with rename info:
  .sp
  .nf
@@ -743,7 +1027,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1262,9 +1239,9 @@
[email protected]@ -1304,9 +1277,9 @@
  get change stats relative to the last change on some date:
  .sp
  .nf
@@ -756,7 +1040,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1271,9 +1248,9 @@
[email protected]@ -1313,9 +1286,9 @@
  diff all newly\-added files that contain a keyword:
  .sp
  .nf
@@ -768,7 +1052,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1280,11 +1257,11 @@
[email protected]@ -1322,18 +1295,18 @@
  compare a revision and its parents:
  .sp
  .nf
@@ -780,29 +1064,53 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -1356,9 +1333,9 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -1394,13 +1367,13 @@
+ .B \-S,  \-\-subrepos
+ .
+ recurse into subrepositories
+-.UNINDENT
++.RE
  .SS export
  .sp
  .nf
 -.ft C
 +.ft
- hg export [OPTION]... [\-o OUTFILESPEC] REV...
+ hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]...
 -.ft P
 +.ft
  .fi
  .sp
  Print the changeset header and diffs for one or more revisions.
[email protected]@ -1366,6 +1343,7 @@
- The information shown in the changeset header is: author, date,
- branch name (if non\-default), changeset hash, parent(s) and commit
- comment.
-+.RS 0
- .IP Note
- .
- export may generate unexpected diff output for merge
[email protected]@ -1419,7 +1397,7 @@
[email protected]@ -1418,7 +1391,7 @@
+ .sp
+ Output may be to a file, in which case the name of the file is
+ given using a format string. The formatting rules are as follows:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fB%%\fP
+ .sp
[email protected]@ -1455,7 +1428,7 @@
+ .B \fB%r\fP
+ .sp
+ zero\-padded changeset revision number
+-.UNINDENT
++.RE
+ .sp
+ Without the \-a/\-\-text option, export will avoid generating diffs
+ of files it detects as binary. With \-a, export will generate a
[email protected]@ -1462,13 +1435,13 @@
  diff anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -811,7 +1119,14 @@
  .sp
  With the \-\-switch\-parent option, the diff will be against the
  second parent. It can be useful to review a merge.
[email protected]@ -1432,9 +1410,9 @@
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ use export and import to transplant a bugfix to the current
[email protected]@ -1475,9 +1448,9 @@
  branch:
  .sp
  .nf
@@ -823,7 +1138,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1442,9 +1420,9 @@
[email protected]@ -1485,9 +1458,9 @@
  rename information:
  .sp
  .nf
@@ -835,7 +1150,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1452,9 +1430,9 @@
[email protected]@ -1495,16 +1468,16 @@
  descriptive names:
  .sp
  .nf
@@ -845,9 +1160,23 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -1490,9 +1468,9 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-o,  \-\-output
+ .
[email protected]@ -1529,13 +1502,13 @@
+ .B \-\-nodates
+ .
+ omit dates from diff headers
+-.UNINDENT
++.RE
  .SS forget
  .sp
  .nf
@@ -859,7 +1188,7 @@
  .fi
  .sp
  Mark the specified files so they will no longer be tracked
[email protected]@ -1502,7 +1480,7 @@
[email protected]@ -1545,18 +1518,18 @@
  entire project history, and it does not delete them from the
  working directory.
  .sp
@@ -867,8 +1196,10 @@
 +To undo a forget before the next commit, see \fBhg add\fP.
  .sp
  Examples:
- .INDENT 0.0
[email protected]@ -1511,9 +1489,9 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  forget newly\-added binary files:
  .sp
  .nf
@@ -880,7 +1211,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1520,9 +1498,9 @@
[email protected]@ -1563,16 +1536,16 @@
  forget files that would be excluded by .hgignore:
  .sp
  .nf
@@ -890,15 +1221,29 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -1542,15 +1520,15 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-I,  \-\-include
+ .
[email protected]@ -1581,19 +1554,19 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS graft
  .sp
  .nf
 -.ft C
 +.ft
- hg graft [OPTION]... REVISION...
+ hg graft [OPTION]... [\-r] REV...
 -.ft P
 +.ft
  .fi
@@ -908,20 +1253,31 @@
  changes from other branches without merging branches in the
 -history graph. This is sometimes known as \(aqbackporting\(aq or
 -\(aqcherry\-picking\(aq. By default, graft will copy user, date, and
-+history graph. This is sometimes known as 'backporting' or 'cherry\-picking'.
-+By default, graft will copy user, date, and
++history graph. This is sometimes known as 'backporting' or
++\&'cherry\-picking'. By default, graft will copy user, date, and
  description from the source changesets.
  .sp
  Changesets that are ancestors of the current revision, that have
[email protected]@ -1560,6 +1538,7 @@
- interrupted so that the current merge can be manually resolved.
- Once all conflicts are addressed, the graft process can be
- continued with the \-c/\-\-continue option.
-+.RS 0
- .IP Note
- .
- The \-c/\-\-continue option does not reapply earlier options.
[email protected]@ -1572,10 +1551,10 @@
[email protected]@ -1603,9 +1576,9 @@
+ of the form:
+ .sp
+ .nf
+-.ft C
++.ft
+ (grafted from CHANGESETHASH)
+-.ft P
++.ft
+ .fi
+ .sp
+ If a graft merge results in conflicts, the graft process is
[email protected]@ -1618,16 +1591,16 @@
+ .RE
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  copy a single change to the stable branch and edit its description:
  .sp
  .nf
@@ -934,7 +1290,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1582,9 +1561,9 @@
[email protected]@ -1634,9 +1607,9 @@
  graft a range of changesets with one exception, updating dates:
  .sp
  .nf
@@ -946,7 +1302,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1591,9 +1570,9 @@
[email protected]@ -1643,9 +1616,9 @@
  continue a graft after resolving conflicts:
  .sp
  .nf
@@ -958,19 +1314,33 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1600,9 +1579,9 @@
[email protected]@ -1652,16 +1625,16 @@
  show the source of a grafted changeset:
  .sp
  .nf
 -.ft C
 +.ft
- hg log \-\-debug \-r tip
--.ft P
-+.ft
- .fi
- .UNINDENT
- .sp
[email protected]@ -1646,9 +1625,9 @@
+ hg log \-\-debug \-r .
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on successful completion.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -1702,13 +1675,13 @@
+ .B \-n,  \-\-dry\-run
+ .
+ do not perform actions, just print output
+-.UNINDENT
++.RE
  .SS grep
  .sp
  .nf
@@ -982,25 +1352,39 @@
  .fi
  .sp
  Search revisions of files for a regular expression.
[email protected]@ -1720,9 +1699,9 @@
[email protected]@ -1727,7 +1700,7 @@
+ Returns 0 if a match is found, 1 otherwise.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-0,  \-\-print0
+ .
[email protected]@ -1776,13 +1749,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .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.
[email protected]@ -1734,11 +1713,11 @@
- .sp
- If one or more REVs are given, only branch heads on the branches
- associated with the specified changesets are shown. This means
--that you can use \%\fBhg heads foo\fP\: to see the heads on a branch
-+that you can use \fBhg heads foo\fP to see the heads on a branch
- named \fBfoo\fP.
+ hg heads [\-ct] [\-r STARTREV] [REV]...
+-.ft P
++.ft
+ .fi
+ .sp
+ With no arguments, show all open branch heads in the repository.
[email protected]@ -1792,11 +1765,11 @@
+ .sp
+ If one or more REVs are given, only open branch heads on the
+ branches associated with the specified changesets are shown. This
+-means that you can use \%\fBhg heads .\fP\: to see the heads on the
++means that you can use \fBhg heads .\fP to see the heads on the
+ currently checked\-out branch.
  .sp
  If \-c/\-\-closed is specified, also show branch heads marked closed
 -(see \%\fBhg commit \-\-close\-branch\fP\:).
@@ -1008,7 +1392,21 @@
  .sp
  If STARTREV is specified, only those heads that are descendants of
  STARTREV will be displayed.
[email protected]@ -1778,9 +1757,9 @@
[email protected]@ -1807,7 +1780,7 @@
+ Returns 0 if matching heads are found, 1 if not.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -1832,13 +1805,13 @@
+ .B \-\-template
+ .
+ display with template
+-.UNINDENT
++.RE
  .SS help
  .sp
  .nf
@@ -1020,7 +1418,21 @@
  .fi
  .sp
  With no arguments, print a list of commands with short help messages.
[email protected]@ -1804,9 +1783,9 @@
[email protected]@ -1849,7 +1822,7 @@
+ Returns 0 if successful.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-extension
+ .
[email protected]@ -1862,13 +1835,13 @@
+ .B \-k,  \-\-keyword
+ .
+ show topics matching keyword
+-.UNINDENT
++.RE
  .SS identify
  .sp
  .nf
@@ -1032,7 +1444,14 @@
  .fi
  .sp
  Print a summary identifying the repository state at REV using one or
[email protected]@ -1827,9 +1806,9 @@
[email protected]@ -1883,15 +1856,15 @@
+ cause lookup to operate on that repository/bundle.
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  generate a build identifier for the working directory:
  .sp
  .nf
@@ -1044,7 +1463,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1836,9 +1815,9 @@
[email protected]@ -1898,9 +1871,9 @@
  find the revision corresponding to a tag:
  .sp
  .nf
@@ -1056,7 +1475,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1845,9 +1824,9 @@
[email protected]@ -1907,16 +1880,16 @@
  check the most recent revision of a remote repository:
  .sp
  .nf
@@ -1066,9 +1485,23 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -1897,9 +1876,9 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 if successful.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -1955,13 +1928,13 @@
+ do not verify server certificate (ignoring web.cacerts config)
+ .sp
+ aliases: id
+-.UNINDENT
++.RE
  .SS import
  .sp
  .nf
@@ -1080,7 +1513,7 @@
  .fi
  .sp
  Import a list of patches and commit them individually (unless
[email protected]@ -1915,7 +1894,7 @@
[email protected]@ -1977,7 +1950,7 @@
  text/plain body parts before first diff are added to commit
  message.
  .sp
@@ -1089,7 +1522,7 @@
  description from patch override values from message headers and
  body. Values given on command line with \-m/\-\-message and \-u/\-\-user
  override these.
[email protected]@ -1932,11 +1911,11 @@
[email protected]@ -1994,22 +1967,22 @@
  revision.
  .sp
  With \-s/\-\-similarity, hg will attempt to discover renames and
@@ -1102,8 +1535,10 @@
 +See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
  .sp
  Examples:
- .INDENT 0.0
[email protected]@ -1945,9 +1924,9 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  import a traditional patch from a website and detect renames:
  .sp
  .nf
@@ -1115,7 +1550,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1954,9 +1933,9 @@
[email protected]@ -2016,9 +1989,9 @@
  import a changeset from an hgweb server:
  .sp
  .nf
@@ -1127,7 +1562,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1963,9 +1942,9 @@
[email protected]@ -2025,9 +1998,9 @@
  import all the patches in an Unix\-style mbox:
  .sp
  .nf
@@ -1139,7 +1574,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1973,9 +1952,9 @@
[email protected]@ -2035,16 +2008,16 @@
  possible):
  .sp
  .nf
@@ -1149,9 +1584,18 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -2002,7 +1981,7 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-p,  \-\-strip
+ .
[email protected]@ -2064,7 +2037,7 @@
  .TP
  .B \-\-no\-commit
  .
@@ -1160,7 +1604,12 @@
  .TP
  .B \-\-bypass
  .
[email protected]@ -2041,9 +2020,9 @@
[email protected]@ -2099,13 +2072,13 @@
+ guess renamed files by similarity (0<=s<=100)
+ .sp
+ aliases: patch
+-.UNINDENT
++.RE
  .SS incoming
  .sp
  .nf
@@ -1172,7 +1621,21 @@
  .fi
  .sp
  Show new changesets found in the specified path/URL or the default
[email protected]@ -2133,9 +2112,9 @@
[email protected]@ -2120,7 +2093,7 @@
+ Returns 0 if there are incoming changes, 1 otherwise.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -2195,13 +2168,13 @@
+ recurse into subrepositories
+ .sp
+ aliases: in
+-.UNINDENT
++.RE
  .SS init
  .sp
  .nf
@@ -1184,7 +1647,7 @@
  .fi
  .sp
  Initialize a new repository in the given directory. If the given
[email protected]@ -2144,7 +2123,7 @@
[email protected]@ -2210,12 +2183,12 @@
  If no directory is given, the current directory is used.
  .sp
  It is possible to specify an \fBssh://\fP URL as the destination.
@@ -1193,7 +1656,18 @@
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -2166,9 +2145,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-ssh
+ .
[email protected]@ -2228,13 +2201,13 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS locate
  .sp
  .nf
@@ -1205,7 +1679,21 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory whose
[email protected]@ -2214,9 +2193,9 @@
[email protected]@ -2255,7 +2228,7 @@
+ Returns 0 if a match is found, 1 otherwise.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -2276,13 +2249,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS log
  .sp
  .nf
@@ -1217,23 +1705,14 @@
  .fi
  .sp
  Print the revision history of the specified files or the entire
[email protected]@ -2235,6 +2214,7 @@
- tags, non\-trivial parents, user, date and time, and a summary for
- each commit. When the \-v/\-\-verbose switch is used, the list of
- changed files and full commit message are shown.
-+.RS 0
- .IP Note
- .
- log \-p/\-\-patch may generate unexpected diff output for merge
[email protected]@ -2242,6 +2222,7 @@
- its first parent. Also, only files different from BOTH parents
- will appear in files:.
[email protected]@ -2317,15 +2290,15 @@
  .RE
-+.RS 0
- .IP Note
- .
- for performance reasons, log FILE may omit duplicate changes
[email protected]@ -2257,9 +2238,9 @@
+ .sp
+ Some examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  changesets with full descriptions and file lists:
  .sp
  .nf
@@ -1245,7 +1724,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2266,9 +2247,9 @@
[email protected]@ -2332,9 +2305,9 @@
  changesets ancestral to the working directory:
  .sp
  .nf
@@ -1257,7 +1736,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2275,9 +2256,9 @@
[email protected]@ -2341,9 +2314,9 @@
  last 10 commits on the current branch:
  .sp
  .nf
@@ -1269,7 +1748,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2284,9 +2265,9 @@
[email protected]@ -2350,9 +2323,9 @@
  changesets showing all modifications of a file, including removals:
  .sp
  .nf
@@ -1281,7 +1760,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2293,9 +2274,9 @@
[email protected]@ -2359,9 +2332,9 @@
  all changesets that touch a directory, with diffs, excluding merges:
  .sp
  .nf
@@ -1293,7 +1772,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2302,9 +2283,9 @@
[email protected]@ -2368,9 +2341,9 @@
  all revision numbers that match a keyword:
  .sp
  .nf
@@ -1305,7 +1784,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2311,9 +2292,9 @@
[email protected]@ -2377,9 +2350,9 @@
  check if a given changeset is included is a tagged release:
  .sp
  .nf
@@ -1317,7 +1796,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2320,9 +2301,9 @@
[email protected]@ -2386,9 +2359,9 @@
  find all changesets by some user in a date range:
  .sp
  .nf
@@ -1329,7 +1808,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2329,18 +2310,18 @@
[email protected]@ -2395,24 +2368,24 @@
  summary of all changesets after the last tag:
  .sp
  .nf
@@ -1339,7 +1818,8 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
+-.UNINDENT
++.RE
  .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.
@@ -1353,7 +1833,19 @@
  specifying custom templates.
  .sp
  Returns 0 on success.
[email protected]@ -2441,9 +2422,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-follow
+ .
[email protected]@ -2503,13 +2476,13 @@
+ exclude names matching the given patterns
+ .sp
+ aliases: history
+-.UNINDENT
++.RE
  .SS manifest
  .sp
  .nf
@@ -1365,7 +1857,21 @@
  .fi
  .sp
  Print a list of version controlled files for the given revision.
[email protected]@ -2472,9 +2453,9 @@
[email protected]@ -2525,7 +2498,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -2534,13 +2507,13 @@
+ .B \-\-all
+ .
+ list files from all revisions
+-.UNINDENT
++.RE
  .SS merge
  .sp
  .nf
@@ -1377,7 +1883,7 @@
  .fi
  .sp
  The current working directory is updated with all changes made in
[email protected]@ -2487,16 +2468,16 @@
[email protected]@ -2553,16 +2526,16 @@
  .sp
  \fB\-\-tool\fP can be used to specify the merge tool used for file
  merges. It overrides the HGMERGE environment variable and your
@@ -1398,7 +1904,21 @@
  will check out a clean copy of the original merge parent, losing
  all changes.
  .sp
[email protected]@ -2524,9 +2505,9 @@
[email protected]@ -2569,7 +2542,7 @@
+ Returns 0 on success, 1 if there are unresolved files.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -2586,13 +2559,13 @@
+ .B \-t,  \-\-tool
+ .
+ specify merge tool
+-.UNINDENT
++.RE
  .SS outgoing
  .sp
  .nf
@@ -1410,7 +1930,21 @@
  .fi
  .sp
  Show changesets not found in the specified destination repository
[email protected]@ -2609,12 +2590,12 @@
[email protected]@ -2604,7 +2577,7 @@
+ Returns 0 if there are outgoing changes, 1 otherwise.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -2675,16 +2648,16 @@
+ recurse into subrepositories
+ .sp
+ aliases: out
+-.UNINDENT
++.RE
  .SS parents
  .sp
  .nf
@@ -1426,7 +1960,21 @@
  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
[email protected]@ -2640,9 +2621,9 @@
[email protected]@ -2693,7 +2666,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -2706,13 +2679,13 @@
+ .B \-\-template
+ .
+ display with template
+-.UNINDENT
++.RE
  .SS paths
  .sp
  .nf
@@ -1438,7 +1986,7 @@
  .fi
  .sp
  Show definition of symbolic path name NAME. If no name is given,
[email protected]@ -2663,18 +2644,18 @@
[email protected]@ -2733,18 +2706,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.
@@ -1462,7 +2010,7 @@
  .fi
  .sp
  With no argument, show the phase name of specified revisions.
[email protected]@ -2682,13 +2663,13 @@
[email protected]@ -2752,13 +2725,13 @@
  With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
  phase value of the specified revisions.
  .sp
@@ -1479,7 +2027,21 @@
  .fi
  .sp
  Return 0 on success, 1 if no phases were changed or some could not
[email protected]@ -2720,9 +2701,9 @@
[email protected]@ -2765,7 +2738,7 @@
+ be changed.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-p,  \-\-public
+ .
[email protected]@ -2786,13 +2759,13 @@
+ .B \-r,  \-\-rev
+ .
+ target revision
+-.UNINDENT
++.RE
  .SS pull
  .sp
  .nf
@@ -1491,7 +2053,7 @@
  .fi
  .sp
  Pull changes from a remote repository to a local one.
[email protected]@ -2732,13 +2713,13 @@
[email protected]@ -2802,18 +2775,18 @@
  \-R is specified). By default, this does not update the copy of the
  project in the working directory.
  .sp
@@ -1510,7 +2072,18 @@
  .sp
  Returns 0 on success, 1 if an update had unresolved files.
  .sp
[email protected]@ -2780,9 +2761,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-u,  \-\-update
+ .
[email protected]@ -2846,13 +2819,13 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS push
  .sp
  .nf
@@ -1522,16 +2095,28 @@
  .fi
  .sp
  Push changesets from the local repository to the specified
[email protected]@ -2806,7 +2787,7 @@
- If \-r/\-\-rev is used, the specified revision and all its ancestors
- will be pushed to the remote repository.
[email protected]@ -2883,13 +2856,13 @@
+ ancestors, and the bookmark 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.
[email protected]@ -2849,9 +2830,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -2922,13 +2895,13 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS recover
  .sp
  .nf
@@ -1543,7 +2128,7 @@
  .fi
  .sp
  Recover from an interrupted commit or pull.
[email protected]@ -2864,16 +2845,16 @@
[email protected]@ -2941,16 +2914,16 @@
  .SS remove
  .sp
  .nf
@@ -1564,7 +2149,7 @@
  .sp
  \-A/\-\-after can be used to remove only files that have already
  been deleted, \-f/\-\-force can be used to force deletion, and \-Af
[email protected]@ -2883,7 +2864,7 @@
[email protected]@ -2960,7 +2933,7 @@
  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 [!]
@@ -1573,7 +2158,21 @@
  (from branch) and Delete (from disk):
  .TS
  center;
[email protected]@ -2975,9 +2956,9 @@
[email protected]@ -3034,7 +3007,7 @@
+ Returns 0 on success, 1 if any warnings encountered.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-after
+ .
[email protected]@ -3053,13 +3026,13 @@
+ exclude names matching the given patterns
+ .sp
+ aliases: rm
+-.UNINDENT
++.RE
  .SS rename
  .sp
  .nf
@@ -1585,7 +2184,7 @@
  .fi
  .sp
  Mark dest as copies of sources; mark sources for deletion. If dest
[email protected]@ -2989,7 +2970,7 @@
[email protected]@ -3071,12 +3044,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect at the next commit. To undo a rename
@@ -1594,7 +2193,18 @@
  .sp
  Returns 0 on success, 1 if errors are encountered.
  .sp
[email protected]@ -3021,9 +3002,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-after
+ .
[email protected]@ -3099,13 +3072,13 @@
+ do not perform actions, just print output
+ .sp
+ aliases: move mv
+-.UNINDENT
++.RE
  .SS resolve
  .sp
  .nf
@@ -1606,7 +2216,7 @@
  .fi
  .sp
  Merges with unresolved conflicts are often the result of
[email protected]@ -3030,15 +3011,15 @@
[email protected]@ -3112,15 +3085,15 @@
  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
@@ -1618,7 +2228,8 @@
 +merge\-tools\fP for information on configuring merge tools.
  .sp
  The resolve command can be used in the following ways:
- .INDENT 0.0
+-.INDENT 0.0
++.RS 0
  .IP \(bu 2
  .
 -\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified
@@ -1626,7 +2237,7 @@
  files, discarding any previous merge attempts. Re\-merging is not
  performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
  to select all unresolved files. \fB\-\-tool\fP can be used to specify
[email protected]@ -3047,21 +3028,21 @@
[email protected]@ -3129,27 +3102,27 @@
  contents are saved with a \fB.orig\fP suffix.
  .IP \(bu 2
  .
@@ -1644,7 +2255,8 @@
 -\%\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
+-.UNINDENT
++.RE
  .sp
  Note that Mercurial will not let you commit files with unresolved
 -merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
@@ -1652,7 +2264,19 @@
  commit after a conflicting merge.
  .sp
  Returns 0 on success, 1 if any files fail a resolve attempt.
[email protected]@ -3104,14 +3085,15 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-all
+ .
[email protected]@ -3182,19 +3155,19 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS revert
  .sp
  .nf
@@ -1662,17 +2286,17 @@
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
 -To check out earlier revisions, you should use \%\fBhg update REV\fP\:.
--To cancel a merge (and lose your changes), use \%\fBhg update \-\-clean .\fP\:.
 +To check out earlier revisions, you should use \fBhg update REV\fP.
-+To cancel a merge (and lose your changes), use \fBhg update \-\-clean .\fP.
+ To cancel an uncommitted merge (and lose your changes),
+-use \%\fBhg update \-\-clean .\fP\:.
++use \fBhg update \-\-clean .\fP.
  .RE
  .sp
  With no revision specified, revert the specified files or directories
[email protected]@ -3125,13 +3107,13 @@
[email protected]@ -3208,18 +3181,18 @@
  directories to their states as of a specific revision. Because
  revert does not change the working directory parents, this will
  cause these files to appear modified. This can be helpful to "back
@@ -1688,7 +2312,18 @@
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -3169,9 +3151,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-all
+ .
[email protected]@ -3248,16 +3221,16 @@
+ .B \-n,  \-\-dry\-run
+ .
+ do not perform actions, just print output
+-.UNINDENT
++.RE
  .SS rollback
  .sp
  .nf
@@ -1699,9 +2334,26 @@
 +.ft
  .fi
  .sp
+-Please use \%\fBhg commit \-\-amend\fP\: instead of rollback to correct
++Please use \fBhg commit \-\-amend\fP instead of rollback to correct
+ mistakes in the last commit.
+ .sp
  This command should be used with care. There is only one level of
[email protected]@ -3203,7 +3185,7 @@
- .UNINDENT
[email protected]@ -3272,7 +3245,7 @@
+ .sp
+ For example, the following commands are transactional, and their
+ effects can be rolled back:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ commit
[email protected]@ -3288,10 +3261,10 @@
+ .IP \(bu 2
+ .
+ unbundle
+-.UNINDENT
++.RE
  .sp
  To avoid permanent data loss, rollback will refuse to rollback a
 -commit transaction if it isn\(aqt checked out. Use \-\-force to
@@ -1709,7 +2361,21 @@
  override this protection.
  .sp
  This command is not intended for use on public repositories. Once
[email protected]@ -3229,9 +3211,9 @@
[email protected]@ -3304,7 +3277,7 @@
+ Returns 0 on success, 1 if no rollback data is available.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-n,  \-\-dry\-run
+ .
[email protected]@ -3313,13 +3286,13 @@
+ .B \-f,  \-\-force
+ .
+ ignore safety measures
+-.UNINDENT
++.RE
  .SS root
  .sp
  .nf
@@ -1721,7 +2387,7 @@
  .fi
  .sp
  Print the root directory of the current repository.
[email protected]@ -3240,9 +3222,9 @@
[email protected]@ -3328,9 +3301,9 @@
  .SS serve
  .sp
  .nf
@@ -1733,7 +2399,21 @@
  .fi
  .sp
  Start a local HTTP repository browser and pull server. You can use
[email protected]@ -3340,9 +3322,9 @@
[email protected]@ -3355,7 +3328,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-accesslog
+ .
[email protected]@ -3424,13 +3397,13 @@
+ .B \-\-certificate
+ .
+ SSL certificate file
+-.UNINDENT
++.RE
  .SS showconfig
  .sp
  .nf
@@ -1745,7 +2425,21 @@
  .fi
  .sp
  With no arguments, print names and values of all config items.
[email protected]@ -3370,9 +3352,9 @@
[email protected]@ -3447,7 +3420,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-u,  \-\-untrusted
+ .
[email protected]@ -3454,13 +3427,13 @@
+ show untrusted configuration options
+ .sp
+ aliases: debugconfig
+-.UNINDENT
++.RE
  .SS status
  .sp
  .nf
@@ -1757,15 +2451,7 @@
  .fi
  .sp
  Show status of files in the repository. If names are given, only
[email protected]@ -3384,6 +3366,7 @@
- .sp
- Option \-q/\-\-quiet hides untracked (unknown and ignored) files
- unless explicitly requested with \-u/\-\-unknown or \-i/\-\-ignored.
-+.RS 0
- .IP Note
- .
- status may appear to disagree with diff if permissions have
[email protected]@ -3400,7 +3383,7 @@
[email protected]@ -3488,7 +3461,7 @@
  The codes used to show the status of files are:
  .sp
  .nf
@@ -1774,7 +2460,7 @@
  M = modified
  A = added
  R = removed
[email protected]@ -3409,7 +3392,7 @@
[email protected]@ -3497,11 +3470,11 @@
  ? = not tracked
  I = ignored
    = origin of the previous file listed as A (added)
@@ -1783,7 +2469,12 @@
  .fi
  .sp
  Examples:
[email protected]@ -3420,9 +3403,9 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ show changes in the working directory relative to a
[email protected]@ -3508,9 +3481,9 @@
  changeset:
  .sp
  .nf
@@ -1795,7 +2486,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3429,9 +3412,9 @@
[email protected]@ -3517,9 +3490,9 @@
  show all changes including copies in an existing changeset:
  .sp
  .nf
@@ -1807,7 +2498,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3438,9 +3421,9 @@
[email protected]@ -3526,16 +3499,16 @@
  get a NUL separated list of added files, suitable for xargs:
  .sp
  .nf
@@ -1817,9 +2508,23 @@
 -.ft P
 +.ft
  .fi
- .UNINDENT
- .sp
[email protected]@ -3518,9 +3501,9 @@
+-.UNINDENT
++.RE
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-all
+ .
[email protected]@ -3602,13 +3575,13 @@
+ recurse into subrepositories
+ .sp
+ aliases: st
+-.UNINDENT
++.RE
  .SS summary
  .sp
  .nf
@@ -1831,7 +2536,21 @@
  .fi
  .sp
  This generates a brief summary of the working directory state,
[email protected]@ -3543,9 +3526,9 @@
[email protected]@ -3620,7 +3593,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-remote
+ .
[email protected]@ -3627,13 +3600,13 @@
+ check for push and pull
+ .sp
+ aliases: sum
+-.UNINDENT
++.RE
  .SS tag
  .sp
  .nf
@@ -1843,7 +2562,7 @@
  .fi
  .sp
  Name a particular revision using <name>.
[email protected]@ -3566,11 +3549,11 @@
[email protected]@ -3654,11 +3627,11 @@
  repositories).
  .sp
  Tag commits are usually made at the head of a branch. If the parent
@@ -1857,7 +2576,21 @@
  .sp
  Since tag names have priority over branch names during revision
  lookup, using an existing branch name as a tag name is discouraged.
[email protected]@ -3615,9 +3598,9 @@
[email protected]@ -3666,7 +3639,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-force
+ .
[email protected]@ -3699,13 +3672,13 @@
+ .B \-u,  \-\-user
+ .
+ record the specified user as committer
+-.UNINDENT
++.RE
  .SS tags
  .sp
  .nf
@@ -1869,7 +2602,7 @@
  .fi
  .sp
  This lists both regular and local tags. When the \-v/\-\-verbose
[email protected]@ -3627,9 +3610,9 @@
[email protected]@ -3715,9 +3688,9 @@
  .SS tip
  .sp
  .nf
@@ -1881,7 +2614,27 @@
  .fi
  .sp
  The tip revision (usually just called the tip) is the changeset
[email protected]@ -3665,9 +3648,9 @@
[email protected]@ -3729,12 +3702,12 @@
+ that repository becomes the current tip. The "tip" tag is special
+ and cannot be renamed or assigned to a different changeset.
+ .sp
+-This command is deprecated, please use \%\fBhg heads\fP\: instead.
++This command is deprecated, please use \fBhg heads\fP instead.
+ .sp
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-p,  \-\-patch
+ .
[email protected]@ -3751,13 +3724,13 @@
+ .B \-\-template
+ .
+ display with template
+-.UNINDENT
++.RE
  .SS unbundle
  .sp
  .nf
@@ -1893,7 +2646,18 @@
  .fi
  .sp
  Apply one or more compressed changegroup files generated by the
[email protected]@ -3685,24 +3668,24 @@
[email protected]@ -3766,30 +3739,30 @@
+ Returns 0 on success, 1 if an update has unresolved files.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-u,  \-\-update
+ .
+ update to new branch head if changesets were unbundled
+-.UNINDENT
++.RE
  .SS update
  .sp
  .nf
@@ -1912,21 +2676,24 @@
 +current named branch and move the current bookmark (see \fBhg help
 +bookmarks\fP).
  .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
+-Update sets the working directory\(aqs parent revision to the specified
+-changeset (see \%\fBhg help parents\fP\:).
++Update sets the working directory's parent revision to the specified
++changeset (see \fBhg help parents\fP).
+ .sp
+ If the changeset is not a descendant or ancestor of the working
+-directory\(aqs parent, the update is aborted. With the \-c/\-\-check
++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
  changeset.
- .sp
--Update sets the working directory\(aqs parent revison to the specified
--changeset (see \%\fBhg help parents\fP\:).
-+Update sets the working directory's parent revison to the specified
-+changeset (see \fBhg help parents\fP).
[email protected]@ -3796,12 +3769,12 @@
  .sp
  The following rules apply when the working directory contains
  uncommitted changes:
[email protected]@ -3711,7 +3694,7 @@
+-.INDENT 0.0
++.RS 0
+ .IP 1. 3
  .
  If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if
  the requested changeset is an ancestor or descendant of
@@ -1935,8 +2702,16 @@
  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
[email protected]@ -3728,12 +3711,12 @@
- .UNINDENT
[email protected]@ -3815,23 +3788,23 @@
+ .
+ With the \-C/\-\-clean option, uncommitted changes are discarded and
+ the working directory is updated to the requested changeset.
+-.UNINDENT
++.RE
+ .sp
+ To cancel an uncommitted merge (and lose your changes), use
+-\%\fBhg update \-\-clean .\fP\:.
++\fBhg update \-\-clean .\fP.
  .sp
  Use null as the changeset to remove the working directory (like
 -\%\fBhg clone \-U\fP\:).
@@ -1951,7 +2726,18 @@
  .sp
  Returns 0 on success, 1 if there are unresolved files.
  .sp
[email protected]@ -3761,14 +3744,14 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-C,  \-\-clean
+ .
[email protected]@ -3850,23 +3823,23 @@
+ revision
+ .sp
+ aliases: up checkout co
+-.UNINDENT
++.RE
  .SS verify
  .sp
  .nf
@@ -1969,7 +2755,13 @@
  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.
[email protected]@ -3777,9 +3760,9 @@
+ .sp
+-Please see \%http://mercurial.selenic.com/wiki/RepositoryCorruption\:
++Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
+ for more information about recovery from corruption of the
+ repository.
+ .sp
[email protected]@ -3874,9 +3847,9 @@
  .SS version
  .sp
  .nf
@@ -1981,17 +2773,62 @@
  .fi
  .sp
  output version and copyright information
[email protected]@ -3838,7 +3821,7 @@
- \fB12/6/6\fP (Dec 6 2006)
- .UNINDENT
[email protected]@ -3883,7 +3856,7 @@
+ .SH DATE FORMATS
+ .sp
+ Some commands allow the user to specify a date, e.g.:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ backout, commit, import, tag: Specify the commit date.
[email protected]@ -3890,10 +3863,10 @@
+ .IP \(bu 2
+ .
+ log, revert, update: Select revision(s) by date.
+-.UNINDENT
++.RE
+ .sp
+ Many date formats are valid. Here are some examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
[email protected]@ -3942,14 +3915,14 @@
+ .IP \(bu 2
+ .
+ \fBnow\fP \- right now
+-.UNINDENT
++.RE
  .sp
 -Lastly, there is Mercurial\(aqs internal format:
+-.INDENT 0.0
 +Lastly, there is Mercurial's internal format:
- .INDENT 0.0
- .IP \(bu 2
- .
[email protected]@ -3867,7 +3850,7 @@
- .UNINDENT
++.RS 0
+ .IP \(bu 2
+ .
+ \fB1165411109 0\fP (Wed Dec 6 13:18:29 2006 UTC)
+-.UNINDENT
++.RE
+ .sp
+ This is the internal representation format for dates. The first number
+ is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
[email protected]@ -3957,7 +3930,7 @@
+ (negative if the timezone is east of UTC).
+ .sp
+ The log command also accepts date ranges:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ \fB<DATE\fP \- at or before a given date/time
[email protected]@ -3970,16 +3943,16 @@
+ .IP \(bu 2
+ .
+ \fB\-DAYS\fP \- within a given number of days of today
+-.UNINDENT
++.RE
  .SH DIFF FORMATS
  .sp
 -Mercurial\(aqs default format for showing changes between two versions of
@@ -1999,7 +2836,23 @@
  a file is compatible with the unified format of GNU diff, which can be
  used by GNU patch and many other standard tools.
  .sp
[email protected]@ -3894,15 +3877,15 @@
+ While this standard format is often enough, it does not encode the
+ following information:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ executable status and other permission bits
[email protected]@ -3992,7 +3965,7 @@
+ .IP \(bu 2
+ .
+ creation or deletion of empty files
+-.UNINDENT
++.RE
+ .sp
+ Mercurial also supports the extended diff format from the git VCS
+ which addresses these limitations. The git diff format is not produced
[email protected]@ -4000,26 +3973,26 @@
  format.
  .sp
  This means that when generating diffs from a Mercurial repository
@@ -2018,7 +2871,8 @@
  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 ENVIRONMENT VARIABLES
[email protected]@ -3910,10 +3893,10 @@
+-.INDENT 0.0
++.RS 0
  .TP
  .B HG
  .
@@ -2028,11 +2882,11 @@
 -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
++\&'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
  Windows) is searched.
  .TP
  .B HGEDITOR
[email protected]@ -3931,9 +3914,9 @@
[email protected]@ -4037,9 +4010,9 @@
  .TP
  .B HGENCODINGMODE
  .
@@ -2044,7 +2898,7 @@
  settings include "replace", which replaces unknown characters, and
  "ignore", which drops them. This setting can be overridden with
  the \-\-encodingmode command\-line option.
[email protected]@ -3940,7 +3923,7 @@
[email protected]@ -4046,7 +4019,7 @@
  .TP
  .B HGENCODINGAMBIGUOUS
  .
@@ -2053,8 +2907,12 @@
  "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
[email protected]@ -3965,7 +3948,7 @@
- .INDENT 7.0
[email protected]@ -4068,19 +4041,19 @@
+ the .hg/hgrc from the current repository is read.
+ .sp
+ For each element in HGRCPATH:
+-.INDENT 7.0
++.RS 7
  .IP \(bu 2
  .
 -if it\(aqs a directory, all files ending with .rc are added
@@ -2062,7 +2920,9 @@
  .IP \(bu 2
  .
  otherwise, the file itself will be added
[email protected]@ -3974,7 +3957,7 @@
+-.UNINDENT
++.RE
+ .TP
  .B HGPLAIN
  .
  When set, this disables any configuration settings that might
@@ -2071,7 +2931,25 @@
  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.
[email protected]@ -4034,7 +4017,7 @@
[email protected]@ -4101,7 +4074,7 @@
+ .
+ This is the string used as the author of a commit. If not set,
+ available values will be considered in this order:
+-.INDENT 7.0
++.RS 7
+ .IP \(bu 2
+ .
+ HGUSER (deprecated)
[email protected]@ -4117,7 +4090,7 @@
+ .IP \(bu 2
+ .
+ LOGNAME (with \[email protected]\fP appended)
+-.UNINDENT
++.RE
+ .sp
+ (deprecated, use configuration file)
+ .TP
[email protected]@ -4140,13 +4113,13 @@
  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
@@ -2080,7 +2958,14 @@
  .TP
  .B PYTHONPATH
  .
[email protected]@ -4061,19 +4044,19 @@
+ This is used by Python to find imported modules and may need to be
+ set appropriately if this Mercurial is not installed system\-wide.
+-.UNINDENT
++.RE
+ .SH USING ADDITIONAL FEATURES
+ .sp
+ Mercurial has the ability to add new features through the use of
[email protected]@ -4159,22 +4132,22 @@
  like this:
  .sp
  .nf
@@ -2103,8 +2988,12 @@
 +.ft
  .fi
  .sp
- To explicitly disable an extension enabled in a configuration file of
[email protected]@ -4080,13 +4063,13 @@
+-See \%\fBhg help config\fP\: for more information on configuration files.
++See \fBhg help config\fP for more information on configuration files.
+ .sp
+ Extensions are not loaded by default for a variety of reasons:
+ they can increase startup overhead; they may be meant for advanced
[email protected]@ -4188,19 +4161,19 @@
  broader scope, prepend its path with !:
  .sp
  .nf
@@ -2120,7 +3009,16 @@
  .fi
  .sp
  disabled extensions:
[email protected]@ -4156,7 +4139,7 @@
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .TP
+ .B acl
+ .
[email protected]@ -4272,7 +4245,7 @@
  .TP
  .B inotify
  .
@@ -2129,16 +3027,29 @@
  .TP
  .B interhg
  .
[email protected]@ -4238,7 +4221,7 @@
[email protected]@ -4353,9 +4326,9 @@
+ .B zeroconf
+ .
+ discover and advertise repositories on the local network
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .SH SPECIFYING FILE SETS
+ .sp
+ Mercurial supports a functional language for selecting a set of
[email protected]@ -4362,7 +4335,7 @@
  files.
  .sp
  Like other file patterns, this pattern type is indicated by a prefix,
 -\(aqset:\(aq. The language supports a number of predicates which are joined
-+'set:'. The language supports a number of predicates which are joined
++\&'set:'. The language supports a number of predicates which are joined
  by infix operators. Parenthesis can be used for grouping.
  .sp
  Identifiers such as filenames or patterns must be quoted with single
[email protected]@ -4249,7 +4232,7 @@
[email protected]@ -4373,18 +4346,18 @@
  .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
@@ -2146,8 +3057,64 @@
 +interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
  .sp
  There is a single prefix operator:
- .INDENT 0.0
[email protected]@ -4377,9 +4360,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBnot x\fP
+ .sp
+ Files not in x. Short form is \fB! x\fP.
+-.UNINDENT
++.RE
+ .sp
+ These are the supported infix operators:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBx and y\fP
+ .sp
[email protected]@ -4398,10 +4371,10 @@
+ .B \fBx \- y\fP
+ .sp
+ Files in x but not in y.
+-.UNINDENT
++.RE
+ .sp
+ The following predicates are supported:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBadded()\fP
+ .sp
[email protected]@ -4467,7 +4440,7 @@
+ .B \fBsize(expression)\fP
+ .sp
+ File size matches the given expression. Examples:
+-.INDENT 7.0
++.RS 7
+ .IP \(bu 2
+ .
+ 1k (files from 1024 to 2047 bytes)
[email protected]@ -4480,7 +4453,7 @@
+ .IP \(bu 2
+ .
+ 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
+-.UNINDENT
++.RE
+ .TP
+ .B \fBsubrepo([pattern])\fP
+ .sp
[email protected]@ -4498,18 +4471,18 @@
+ .B \fBunresolved()\fP
+ .sp
+ File that is marked unresolved according to the resolve state.
+-.UNINDENT
++.RE
+ .sp
+ Some sample queries:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  Show status of files that appear to be binary in the working directory:
  .sp
  .nf
@@ -2159,7 +3126,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4386,9 +4369,9 @@
[email protected]@ -4516,9 +4489,9 @@
  Forget files that are in .hgignore but are already tracked:
  .sp
  .nf
@@ -2171,7 +3138,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4395,9 +4378,9 @@
[email protected]@ -4525,9 +4498,9 @@
  Find text files that contain a string:
  .sp
  .nf
@@ -2183,7 +3150,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4404,9 +4387,9 @@
[email protected]@ -4534,9 +4507,9 @@
  Find C files in a non\-standard encoding:
  .sp
  .nf
@@ -2196,7 +3163,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4413,9 +4396,9 @@
[email protected]@ -4543,9 +4516,9 @@
  Revert copies of large binary files:
  .sp
  .nf
@@ -2209,7 +3176,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4422,13 +4405,13 @@
[email protected]@ -4552,15 +4525,15 @@
  Remove files listed in foo.lst that contain the letter a or b:
  .sp
  .nf
@@ -2220,14 +3187,18 @@
 +hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
 +.ft
  .fi
- .UNINDENT
+-.UNINDENT
++.RE
  .sp
 -See also \%\fBhg help patterns\fP\:.
 +See also \fBhg help patterns\fP.
  .SH GLOSSARY
- .INDENT 0.0
- .TP
[email protected]@ -4438,7 +4421,7 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B Ancestor
+ .
[email protected]@ -4568,7 +4541,7 @@
  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
@@ -2236,7 +3207,7 @@
  .TP
  .B Bookmark
  .
[email protected]@ -4445,7 +4428,7 @@
[email protected]@ -4575,7 +4548,7 @@
  Bookmarks are pointers to certain commits that move when
  committing. They are similar to tags in that it is possible to use
  bookmark names in all places where Mercurial expects a changeset
@@ -2245,19 +3216,19 @@
  when you make a commit.
  .sp
  Bookmarks can be renamed, copied and deleted. Bookmarks are local,
[email protected]@ -4457,9 +4440,9 @@
[email protected]@ -4587,9 +4560,9 @@
  .
  (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
++\&'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
[email protected]@ -4474,7 +4457,7 @@
[email protected]@ -4604,7 +4577,7 @@
  (Verb) The action of creating a child changeset which results in
  its parent having more than one child.
  .sp
@@ -2266,7 +3237,7 @@
  .TP
  .B Branch, anonymous
  .
[email protected]@ -4493,19 +4476,19 @@
[email protected]@ -4623,19 +4596,19 @@
  .TP
  .B Branch head
  .
@@ -2291,7 +3262,7 @@
  .TP
  .B Branch, named
  .
[email protected]@ -4512,8 +4495,8 @@
[email protected]@ -4642,8 +4615,8 @@
  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
@@ -2302,7 +3273,7 @@
  branches.
  .sp
  Named branches can be thought of as a kind of namespace, dividing
[email protected]@ -4526,7 +4509,7 @@
[email protected]@ -4656,7 +4629,7 @@
  .TP
  .B Branch tip
  .
@@ -2311,7 +3282,7 @@
  .TP
  .B Branch, topological
  .
[email protected]@ -4576,24 +4559,24 @@
[email protected]@ -4706,24 +4679,24 @@
  revision. This use should probably be avoided where possible, as
  changeset is much more appropriate than checkout in this context.
  .sp
@@ -2342,7 +3313,7 @@
  .TP
  .B Clone
  .
[email protected]@ -4602,13 +4585,13 @@
[email protected]@ -4732,13 +4705,13 @@
  .sp
  Example: "Is your clone up to date?".
  .sp
@@ -2359,14 +3330,14 @@
  .TP
  .B Commit
  .
[email protected]@ -4633,13 +4616,13 @@
[email protected]@ -4763,13 +4736,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.
+-can be visualized by graphical tools such as \%\fBhg log \-\-graph\fP\:. In
++can be visualized by graphical tools such as \fBhg log \-\-graph\fP. In
+ Mercurial, the DAG is limited by the requirement for children to
+ have at most two parents.
  .TP
  .B Default branch
  .
@@ -2375,7 +3346,7 @@
  .TP
  .B Descendant
  .
[email protected]@ -4647,7 +4630,7 @@
[email protected]@ -4777,7 +4750,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
@@ -2384,16 +3355,16 @@
  .TP
  .B Diff
  .
[email protected]@ -4672,7 +4655,7 @@
[email protected]@ -4802,7 +4775,7 @@
  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
++\&'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
[email protected]@ -4680,17 +4663,17 @@
[email protected]@ -4810,17 +4783,17 @@
  .
  Changesets in the draft phase have not been shared with publishing
  repositories and may thus be safely changed by history\-modifying
@@ -2402,8 +3373,8 @@
  .TP
  .B Graph
  .
--See DAG and \%\fBhg help graphlog\fP\:.
-+See DAG and \fBhg help graphlog\fP.
+-See DAG and \%\fBhg log \-\-graph\fP\:.
++See DAG and \fBhg log \-\-graph\fP.
  .TP
  .B Head
  .
@@ -2412,11 +3383,11 @@
 -\(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.
++\&'Head, repository' for specific definitions.
  .sp
  Heads are where development generally takes place and are the
  usual targets for update and merge operations.
[email protected]@ -4702,9 +4685,9 @@
[email protected]@ -4832,9 +4805,9 @@
  .B Head, closed branch
  .
  A changeset that marks a head as no longer interesting. The closed
@@ -2428,7 +3399,7 @@
  .sp
  Closed heads can be re\-opened by committing new changeset as the
  child of the changeset that marks a head as closed.
[email protected]@ -4733,11 +4716,11 @@
[email protected]@ -4863,11 +4836,11 @@
  .TP
  .B Immutable history
  .
@@ -2442,7 +3413,7 @@
  .TP
  .B Manifest
  .
[email protected]@ -4754,7 +4737,7 @@
[email protected]@ -4884,7 +4857,7 @@
  .TP
  .B Named branch
  .
@@ -2451,7 +3422,7 @@
  .TP
  .B Null changeset
  .
[email protected]@ -4761,30 +4744,30 @@
[email protected]@ -4891,30 +4864,30 @@
  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
@@ -2490,7 +3461,7 @@
  .sp
  (Verb) The process of using a patch file to transform one
  changeset into another.
[email protected]@ -4794,13 +4777,13 @@
[email protected]@ -4924,13 +4897,13 @@
  .B Phase
  .
  A per\-changeset state tracking how the changeset has been or
@@ -2507,7 +3478,7 @@
  .TP
  .B Pull
  .
[email protected]@ -4808,7 +4791,7 @@
[email protected]@ -4938,7 +4911,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
@@ -2516,7 +3487,7 @@
  .TP
  .B Push
  .
[email protected]@ -4816,7 +4799,7 @@
[email protected]@ -4946,7 +4919,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
@@ -2525,7 +3496,7 @@
  .TP
  .B Repository
  .
[email protected]@ -4829,13 +4812,13 @@
[email protected]@ -4959,13 +4932,13 @@
  .TP
  .B Repository head
  .
@@ -2542,16 +3513,16 @@
  .TP
  .B Revision number
  .
[email protected]@ -4844,7 +4827,7 @@
[email protected]@ -4974,7 +4947,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'.
++\&'Changeset id'.
  .TP
  .B Revlog
  .
[email protected]@ -4855,7 +4838,7 @@
[email protected]@ -4985,7 +4958,7 @@
  .TP
  .B Rewriting history
  .
@@ -2560,7 +3531,7 @@
  .TP
  .B Root
  .
[email protected]@ -4865,13 +4848,13 @@
[email protected]@ -4995,13 +4968,13 @@
  .B Secret
  .
  Changesets in the secret phase may not be shared via push, pull,
@@ -2576,7 +3547,7 @@
  will thus automatically be shared with other using push and pull.
  .TP
  .B Tip
[email protected]@ -4883,7 +4866,7 @@
[email protected]@ -5013,7 +4986,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
@@ -2585,7 +3556,7 @@
  numbers may be different in different repository clones, the
  branch tip may be different in different cloned repositories.
  .TP
[email protected]@ -4891,21 +4874,21 @@
[email protected]@ -5021,22 +4994,22 @@
  .
  (Noun) Another synonym of changeset.
  .sp
@@ -2607,11 +3578,13 @@
  .B Working directory parent
  .
 -See \(aqParent, working directory\(aq.
+-.UNINDENT
 +See 'Parent, working directory'.
- .UNINDENT
++.RE
  .SH SYNTAX FOR MERCURIAL IGNORE FILES
- .SH SYNOPSIS
[email protected]@ -4933,12 +4916,12 @@
+ .SS Synopsis
+ .sp
[email protected]@ -5063,16 +5036,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -2624,10 +3597,15 @@
  commands support the \fB\-I\fP and \fB\-X\fP options; see
 -\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
 +\fBhg help <command>\fP and \fBhg help patterns\fP for details.
- .SH SYNTAX
- .sp
- An ignore file is a plain text file consisting of a list of patterns,
[email protected]@ -4952,9 +4935,9 @@
+ .sp
+ Files that are already tracked are not affected by .hgignore, even
+ if they appear in .hgignore. An untracked file X can be explicitly
+-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
++added with \fBhg add X\fP, even if X would be excluded by a pattern
+ in .hgignore.
+ .SS Syntax
+ .sp
[email protected]@ -5087,13 +5060,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -2639,20 +3617,30 @@
  .fi
  .sp
  where \fBNAME\fP is one of the following:
[email protected]@ -4976,10 +4959,11 @@
- the form \fB*.c\fP will match a file ending in \fB.c\fP in any directory,
- and a regexp pattern of the form \fB\e.c$\fP will do the same. To root a
- regexp pattern, start it with \fB^\fP.
-+.RS 0
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBregexp\fP
+ .sp
[email protected]@ -5102,7 +5075,7 @@
+ .B \fBglob\fP
+ .sp
+ Shell\-style glob.
+-.UNINDENT
++.RE
+ .sp
+ The chosen syntax stays in effect when parsing all patterns that
+ follow, until another syntax is selected.
[email protected]@ -5114,7 +5087,7 @@
  .IP Note
  .
  Patterns specified in other than \fB.hgignore\fP are always rooted.
 -Please see \%\fBhg help patterns\fP\: for details.
 +Please see \fBhg help patterns\fP for details.
  .RE
- .SH EXAMPLE
- .sp
[email protected]@ -4986,7 +4970,7 @@
+ .SS Example
+ .sp
[email protected]@ -5121,7 +5094,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -2661,7 +3649,7 @@
  # use glob syntax.
  syntax: glob
  
[email protected]@ -4997,11 +4981,11 @@
[email protected]@ -5132,21 +5105,21 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -2672,68 +3660,77 @@
  .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.
[email protected]@ -5025,7 +5009,7 @@
- .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
[email protected]@ -5032,7 +5016,7 @@
- paths to virtual ones. For instance:
+ repository, or a tree of repositories. In the second case, repository
+ paths and global options can be defined using a dedicated
+-configuration file common to \%\fBhg serve\fP\:, \fBhgweb.wsgi\fP,
++configuration file common to \fBhg serve\fP, \fBhgweb.wsgi\fP,
+ \fBhgweb.cgi\fP and \fBhgweb.fcgi\fP.
+ .sp
+ This file uses the same syntax as other Mercurial configuration files
+ but recognizes only the following sections:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
+ web
[email protected]@ -5156,11 +5129,11 @@
+ .IP \(bu 2
+ .
+ collections
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .sp
+-The \fBweb\fP options are thoroughly described in \%\fBhg help config\fP\:.
++The \fBweb\fP options are thoroughly described in \fBhg help config\fP.
+ .sp
+ The \fBpaths\fP section maps URL paths to paths of repositories in the
+ filesystem. hgweb will not expose the filesystem directly \- only
[email protected]@ -5175,7 +5148,7 @@
+ path ends with \fB*\fP or \fB**\fP the filesystem will be searched
+ recursively for repositories below that point.
+ With \fB*\fP it will not recurse into the repositories it finds (except for
+-\fB.hg/patches\fP).
++\fB\&.hg/patches\fP).
+ With \fB**\fP it will also search inside repository working directories
+ and possibly find subrepositories.
+ .sp
[email protected]@ -5182,15 +5155,15 @@
+ In this example:
  .sp
  .nf
 -.ft C
 +.ft
  [paths]
- projects/a = /foo/bar
- projects/b = /baz/quux
[email protected]@ -5039,7 +5023,7 @@
- web/root = /real/root/*
- / = /real/root2/*
- virtual/root2 = /real/root2/**
--.ft P
-+.ft
- .fi
- .INDENT 0.0
- .IP \(bu 2
[email protected]@ -5048,14 +5032,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
[email protected]@ -5067,10 +5051,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
[email protected]@ -5085,8 +5069,8 @@
+ /projects/a = /srv/tmprepos/a
+ /projects/b = c:/repos/b
+ / = /srv/repos/*
+ /user/bob = /home/bob/repos/**
+-.ft P
++.ft
+ .fi
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ The first two entries make two repositories in different directories
[email protected]@ -5204,7 +5177,7 @@
+ .
+ The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
+ and \fBhttp://server/user/bob/quux/testsubrepo/\fP
+-.UNINDENT
++.RE
+ .sp
+ The \fBcollections\fP section is deprecated and has been superseded by
+ \fBpaths\fP.
[email protected]@ -5217,8 +5190,8 @@
  ancestor of the two file versions, so they can determine the changes
  made on both branches.
  .sp
@@ -2744,11 +3741,39 @@
  .sp
  Usually, the merge tool tries to automatically reconcile the files by
  combining all non\-overlapping changes that occurred separately in
[email protected]@ -5191,10 +5175,11 @@
[email protected]@ -5243,7 +5216,7 @@
+ .sp
+ There are some internal merge tools which can be used. The internal
+ merge tools are:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBinternal:dump\fP
+ .sp
[email protected]@ -5278,7 +5251,7 @@
+ .sp
+ Asks the user which of the local or the other version to keep as
+ the merged version.
+-.UNINDENT
++.RE
+ .sp
+ Internal tools are always available and do not require a GUI but will by default
+ not handle symlinks or binary files.
[email protected]@ -5285,7 +5258,7 @@
+ .SS Choosing a merge tool
+ .sp
+ Mercurial uses these rules when deciding which merge tool to use:
+-.INDENT 0.0
++.RS 0
+ .IP 1. 3
+ .
+ If a tool has been specified with the \-\-tool option to merge or resolve, it
[email protected]@ -5322,11 +5295,11 @@
+ .IP 8. 3
  .
  The merge of the file fails and must be resolved before commit.
- .UNINDENT
-+.RS 0
+-.UNINDENT
++.RE
  .IP Note
  .
  After selecting a merge program, Mercurial will by default attempt
@@ -2757,11 +3782,7 @@
  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
[email protected]@ -5227,10 +5212,11 @@
- patterns.
- .sp
- Alternate pattern notations must be specified explicitly.
-+.RS 0
[email protected]@ -5362,7 +5335,7 @@
  .IP Note
  .
  Patterns specified in \fB.hgignore\fP are not rooted.
@@ -2770,7 +3791,7 @@
  .RE
  .sp
  To use a plain path name without any pattern matching, start it with
[email protected]@ -5255,17 +5241,17 @@
[email protected]@ -5387,17 +5360,17 @@
  Plain examples:
  .sp
  .nf
@@ -2791,7 +3812,7 @@
  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
[email protected]@ -5273,27 +5259,27 @@
[email protected]@ -5405,27 +5378,27 @@
  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.
@@ -2823,9 +3844,35 @@
 -See also \%\fBhg help filesets\fP\:.
 +See also \fBhg help filesets\fP.
  .SH WORKING WITH PHASES
- .SH WHAT ARE PHASES?
- .sp
[email protected]@ -5330,14 +5316,14 @@
+ .SS What are phases?
+ .sp
[email protected]@ -5434,9 +5407,9 @@
+ (for instance, with the mq or rebase extensions).
+ .sp
+ Each changeset in a repository is in one of the following phases:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
+ public : changeset is visible on a public server
[email protected]@ -5446,9 +5419,9 @@
+ .IP \(bu 2
+ .
+ secret : changeset should not be pushed, pulled, or cloned
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .sp
+ These phases are ordered (public < draft < secret) and no changeset
+ can be in a lower phase than its ancestors. For instance, if a
[email protected]@ -5462,14 +5435,14 @@
  .sp
  Once changesets become public, extensions like mq and rebase will
  refuse to operate on them to prevent creating duplicate changesets.
@@ -2833,7 +3880,7 @@
 -if needed. See \%\fBhg help \-v phase\fP\: for examples.
 +Phases can also be manually manipulated with the \fBhg phase\fP command
 +if needed. See \fBhg help \-v phase\fP for examples.
- .SH PHASES AND SERVERS
+ .SS Phases and servers
  .sp
  Normally, all servers are \fBpublishing\fP by default. This means:
  .sp
@@ -2843,18 +3890,16 @@
  \- all draft changesets that are pulled or cloned appear in phase
  public on the client
  
[email protected]@ -5345,8 +5331,9 @@
[email protected]@ -5477,7 +5450,7 @@
  client and server
  
  \- secret changesets are neither pushed, pulled, or cloned
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
- Pulling a draft changeset from a publishing server does not mark it
[email protected]@ -5358,13 +5345,14 @@
[email protected]@ -5490,13 +5463,13 @@
  repository to disable publishing in its configuration file:
  .sp
  .nf
@@ -2866,13 +3911,23 @@
 +.ft
  .fi
  .sp
--See \%\fBhg help config\fP\: for more information on config files.
-+See \fBhg help config\fP for more information on config files.
-+.RS 0
+-See \%\fBhg help config\fP\: for more information on configuration files.
++See \fBhg help config\fP for more information on configuration files.
  .IP Note
  .
  Servers running older versions of Mercurial are treated as
[email protected]@ -5379,9 +5367,9 @@
[email protected]@ -5503,17 +5476,17 @@
+ publishing.
+ .RE
+ .SS Examples
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
  list changesets in draft or secret phase:
  .sp
  .nf
@@ -2884,7 +3939,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5388,9 +5376,9 @@
[email protected]@ -5520,9 +5493,9 @@
  change all secret changesets to draft:
  .sp
  .nf
@@ -2896,7 +3951,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5397,9 +5385,9 @@
[email protected]@ -5529,9 +5502,9 @@
  forcibly move the current changeset and descendants from public to draft:
  .sp
  .nf
@@ -2908,7 +3963,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5406,9 +5394,9 @@
[email protected]@ -5538,9 +5511,9 @@
  show a list of changeset revision and phase:
  .sp
  .nf
@@ -2920,27 +3975,29 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5415,15 +5403,15 @@
[email protected]@ -5547,15 +5520,15 @@
  resynchronize draft changesets relative to a remote repository:
  .sp
  .nf
 -.ft C
--hg phase \-fd \(aqoutgoing(URL)\(aq
--.ft P
-+.ft
-+hg phase \-fd 'outgoing(URL)'
-+.ft
- .fi
- .UNINDENT
- .UNINDENT
- .UNINDENT
++.ft
+ hg phase \-fd "outgoing(URL)"
+-.ft P
++.ft
+ .fi
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
  .sp
 -See \%\fBhg help phase\fP\: for more information on manually manipulating phases.
 +See \fBhg help phase\fP for more information on manually manipulating phases.
  .SH SPECIFYING SINGLE REVISIONS
  .sp
  Mercurial supports several ways to specify individual revisions.
[email protected]@ -5469,7 +5457,7 @@
[email protected]@ -5601,18 +5574,18 @@
  .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
@@ -2948,8 +4005,63 @@
 +interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
  .sp
  There is a single prefix operator:
- .INDENT 0.0
[email protected]@ -5595,12 +5583,12 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBnot x\fP
+ .sp
+ Changesets not in x. Short form is \fB! x\fP.
+-.UNINDENT
++.RE
+ .sp
+ These are the supported infix operators:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBx::y\fP
+ .sp
[email protected]@ -5651,18 +5624,18 @@
+ .B \fBx~n\fP
+ .sp
+ The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
+-.UNINDENT
++.RE
+ .sp
+ There is a single postfix operator:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBx^\fP
+ .sp
+ Equivalent to \fBx^1\fP, the first parent of each changeset in x.
+-.UNINDENT
++.RE
+ .sp
+ The following predicates are supported:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBadds(pattern)\fP
+ .sp
[email protected]@ -5691,7 +5664,7 @@
+ .B \fBbisect(string)\fP
+ .sp
+ Changesets marked in the specified bisect status:
+-.INDENT 7.0
++.RS 7
+ .IP \(bu 2
+ .
+ \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
[email protected]@ -5713,7 +5686,7 @@
+ .IP \(bu 2
+ .
+ \fBcurrent\fP            : the cset currently being bisected
+-.UNINDENT
++.RE
+ .TP
+ .B \fBbookmark([name])\fP
+ .sp
[email protected]@ -5758,7 +5731,7 @@
  .TP
  .B \fBcontains(pattern)\fP
  .sp
@@ -2957,6 +4069,9 @@
 +Revision contains a file matching pattern. See \fBhg help patterns\fP
  for information about file patterns.
  .TP
+ .B \fBconverted([id])\fP
[email protected]@ -5768,7 +5741,7 @@
+ .TP
  .B \fBdate(interval)\fP
  .sp
 -Changesets within the interval, see \%\fBhg help dates\fP\:.
@@ -2964,7 +4079,16 @@
  .TP
  .B \fBdesc(string)\fP
  .sp
[email protected]@ -5628,13 +5616,13 @@
[email protected]@ -5817,7 +5790,7 @@
+ Changesets connected to the specified filelog.
+ .sp
+ For performance reasons, \fBfilelog()\fP does not show every changeset
+-that affects the requested file(s). See \%\fBhg help log\fP\: for details. For
++that affects the requested file(s). See \fBhg help log\fP for details. For
+ a slower, more accurate result, use \fBfile()\fP.
+ .TP
+ .B \fBfirst(set, [n])\fP
[email protected]@ -5826,13 +5799,13 @@
  .TP
  .B \fBfollow([file])\fP
  .sp
@@ -2980,16 +4104,16 @@
  to ensure special escape characters are handled correctly. Unlike
  \fBkeyword(string)\fP, the match is case\-sensitive.
  .TP
[email protected]@ -5720,7 +5708,7 @@
[email protected]@ -5937,7 +5910,7 @@
  .TP
  .B \fBpresent(set)\fP
  .sp
 -An empty set, if any revision in set isn\(aqt found; otherwise,
 +An empty set, if any revision in set isn't found; otherwise,
  all revisions in set.
- .TP
- .B \fBpublic()\fP
[email protected]@ -5730,7 +5718,7 @@
+ .sp
+ If any of specified revisions is not present in the local repository,
[email protected]@ -5951,7 +5924,7 @@
  .B \fBremote([id [,path]])\fP
  .sp
  Local revision that corresponds to the given identifier in a
@@ -2998,7 +4122,32 @@
  synonym for the current local branch.
  .TP
  .B \fBremoves(pattern)\fP
[email protected]@ -5790,9 +5778,9 @@
[email protected]@ -5980,7 +5953,7 @@
+ as \fB\-key\fP to sort in descending order.
+ .sp
+ The keys can be:
+-.INDENT 7.0
++.RS 7
+ .IP \(bu 2
+ .
+ \fBrev\fP for the revision number,
[email protected]@ -5996,7 +5969,7 @@
+ .IP \(bu 2
+ .
+ \fBdate\fP for the commit date
+-.UNINDENT
++.RE
+ .TP
+ .B \fBtag([name])\fP
+ .sp
[email protected]@ -6013,15 +5986,15 @@
+ If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
+ a regular expression. To match a user that actually contains \fIre:\fP, use
+ the prefix \fIliteral:\fP.
+-.UNINDENT
++.RE
+ .sp
+ New predicates (known as "aliases") can be defined, using any combination of
  existing predicates or other aliases. An alias definition looks like:
  .sp
  .nf
@@ -3010,7 +4159,7 @@
  .fi
  .sp
  in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
[email protected]@ -5802,21 +5790,21 @@
[email protected]@ -6031,21 +6004,21 @@
  For example,
  .sp
  .nf
@@ -3036,7 +4185,7 @@
  \-f    \->  ::.
  \-d x  \->  date(x)
  \-k x  \->  keyword(x)
[email protected]@ -5825,7 +5813,7 @@
[email protected]@ -6054,19 +6027,19 @@
  \-b x  \->  branch(x)
  \-P x  \->  !::x
  \-l x  \->  limit(expr, x)
@@ -3045,7 +4194,10 @@
  .fi
  .sp
  Some sample queries:
[email protected]@ -5835,9 +5823,9 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
  Changesets on the default branch:
  .sp
  .nf
@@ -3057,7 +4209,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5844,9 +5832,9 @@
[email protected]@ -6073,9 +6046,9 @@
  Changesets on the default branch since tag 1.5 (excluding merges):
  .sp
  .nf
@@ -3069,7 +4221,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5853,9 +5841,9 @@
[email protected]@ -6082,9 +6055,9 @@
  Open branch heads:
  .sp
  .nf
@@ -3081,7 +4233,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5863,9 +5851,9 @@
[email protected]@ -6092,9 +6065,9 @@
  \fBhgext/*\fP:
  .sp
  .nf
@@ -3094,7 +4246,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5872,9 +5860,9 @@
[email protected]@ -6101,9 +6074,9 @@
  Changesets committed in May 2008, sorted by user:
  .sp
  .nf
@@ -3107,36 +4259,81 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5882,9 +5870,9 @@
[email protected]@ -6111,11 +6084,11 @@
  release:
  .sp
  .nf
 -.ft C
 +.ft
- hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
--.ft P
-+.ft
- .fi
- .UNINDENT
+ hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
  .SH SUBREPOSITORIES
[email protected]@ -5911,7 +5899,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
[email protected]@ -5940,6 +5928,7 @@
- subrepositories to the state they were committed in a parent
- repository changeset. Mercurial automatically record the nested
- repositories states when committing in the parent repository.
-+.RS 0
- .IP Note
+ .sp
+ Subrepositories let you nest external repositories or projects into a
[email protected]@ -6126,7 +6099,7 @@
+ subrepositories.
+ .sp
+ Subrepositories are made of three components:
+-.INDENT 0.0
++.RS 0
+ .IP 1. 3
+ .
+ Nested repository checkouts. They can appear anywhere in the
[email protected]@ -6139,18 +6112,18 @@
+ subrepositories are referenced like:
+ .sp
+ .nf
+-.ft C
++.ft
+ path/to/nested = https://example.com/nested/repo/path
+-.ft P
++.ft
+ .fi
+ .sp
+ Git and Subversion subrepos are also supported:
+ .sp
+ .nf
+-.ft C
++.ft
+ path/to/nested = [git]git://example.com/nested/repo/path
+ path/to/nested = [svn]https://example.com/nested/trunk/path
+-.ft P
++.ft
+ .fi
+ .sp
+ where \fBpath/to/nested\fP is the checkout location relatively to the
[email protected]@ -6173,7 +6146,7 @@
  .
  The \fB.hgsubstate\fP file should not be edited manually.
[email protected]@ -5991,7 +5980,7 @@
+ .RE
+-.UNINDENT
++.RE
+ .SS Adding a Subrepository
+ .sp
+ If \fB.hgsub\fP does not exist, create it and add it to the parent
[email protected]@ -6181,7 +6154,7 @@
+ to live in the parent repository. Edit \fB.hgsub\fP and add the
+ subrepository entry as described above. At this point, the
+ subrepository is tracked and the next commit will record its state in
+-\fB.hgsubstate\fP and bind it to the committed changeset.
++\fB\&.hgsubstate\fP and bind it to the committed changeset.
+ .SS Synchronizing a Subrepository
+ .sp
+ Subrepos do not automatically track the latest changeset of their
[email protected]@ -6198,7 +6171,7 @@
+ To remove a subrepository from the parent repository, delete its
+ reference from \fB.hgsub\fP, then remove its files.
+ .SS Interaction with Mercurial Commands
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B add
+ .
[email protected]@ -6220,7 +6193,7 @@
  have been modified, Mercurial will abort.  Mercurial can be made
  to instead commit all modified subrepositories by specifying
  \-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
@@ -3145,7 +4342,7 @@
  longer any modified subrepositories, it records their state and
  finally commits it in the parent repository.
  .TP
[email protected]@ -6022,7 +6011,7 @@
[email protected]@ -6251,7 +6224,7 @@
  .B pull
  .
  pull is not recursive since it is not clear what to pull prior
@@ -3154,7 +4351,16 @@
  subrepositories changes referenced by the parent repository pulled
  changesets is expensive at best, impossible in the Subversion
  case.
[email protected]@ -6073,9 +6062,9 @@
[email protected]@ -6278,7 +6251,7 @@
+ changeset is not available in the current subrepository, Mercurial
+ will pull it in first before updating.  This means that updating
+ can require network access when using subrepositories.
+-.UNINDENT
++.RE
+ .SS Remapping Subrepositories Sources
+ .sp
+ A subrepository source location may change during a project life,
[email protected]@ -6302,9 +6275,9 @@
  Usage:
  .sp
  .nf
@@ -3166,7 +4372,7 @@
  .fi
  .sp
  A template is a piece of text, with markup to invoke variable
[email protected]@ -6082,10 +6071,10 @@
[email protected]@ -6311,16 +6284,16 @@
  expansion:
  .sp
  .nf
@@ -3179,7 +4385,49 @@
  .fi
  .sp
  Strings in curly braces are called keywords. The availability of
[email protected]@ -6195,15 +6184,15 @@
+ keywords depends on the exact context of the templater. These
+ keywords are usually available for templating a log\-like command:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B author
+ .
[email protected]@ -6406,24 +6379,24 @@
+ .TP
+ .B p1node
+ .
+-String. The identification hash of the changeset\(aqs first parent,
++String. The identification hash of the changeset's first parent,
+ as a 40 digit hexadecimal string. If the changeset has no parents, all
+ digits are 0.
+ .TP
+ .B p1rev
+ .
+-Integer. The repository\-local revision number of the changeset\(aqs
++Integer. The repository\-local revision number of the changeset's
+ first parent, or \-1 if the changeset has no parents.
+ .TP
+ .B p2node
+ .
+-String. The identification hash of the changeset\(aqs second
++String. The identification hash of the changeset's second
+ parent, as a 40 digit hexadecimal string. If the changeset has no second
+ parent, all digits are 0.
+ .TP
+ .B p2rev
+ .
+-Integer. The repository\-local revision number of the changeset\(aqs
++Integer. The repository\-local revision number of the changeset's
+ second parent, or \-1 if the changeset has no second parent.
+ .TP
+ .B parents
[email protected]@ -6447,24 +6420,24 @@
+ .B tags
+ .
+ List of strings. Any tags associated with the changeset.
+-.UNINDENT
++.RE
+ .sp
  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
@@ -3198,7 +4446,12 @@
  .fi
  .sp
  List of filters:
[email protected]@ -6291,7 +6280,7 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B addbreaks
+ .
[email protected]@ -6548,7 +6521,7 @@
  .TP
  .B nonempty
  .
@@ -3207,7 +4460,150 @@
  .TP
  .B obfuscate
  .
[email protected]@ -6363,24 +6352,24 @@
[email protected]@ -6614,13 +6587,13 @@
+ .
+ Any text. Returns a short representation of a user name or email
+ address.
+-.UNINDENT
++.RE
+ .sp
+ Note that a filter is nothing more than a function call, i.e.
+ \fBexpr|filter\fP is equivalent to \fBfilter(expr)\fP.
+ .sp
+ In addition to filters, there are some basic built\-in functions:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ date(date[, fmt])
[email protected]@ -6651,25 +6624,25 @@
+ .IP \(bu 2
+ .
+ sub(pat, repl, expr)
+-.UNINDENT
++.RE
+ .sp
+ Also, for any expression that returns a list, there is a list operator:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ expr % "{template}"
+-.UNINDENT
++.RE
+ .sp
+ Some sample command line templates:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Format lists, e.g. files:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "files:\en{files % \(aq  {file}\en\(aq}"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "files:\en{files % '  {file}\en'}"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6676,9 +6649,9 @@
+ Join the list of files with a ", ":
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "files: {join(files, \(aq, \(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "files: {join(files, ', ')}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6685,9 +6658,9 @@
+ Format date:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{date(date, \(aq%Y\(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{date(date, '%Y')}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6694,9 +6667,9 @@
+ Output the description set to a fill\-width of 30:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{fill(desc, '30')}"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6703,10 +6676,10 @@
+ Use a conditional to test for the default branch:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{ifeq(branch, \(aqdefault\(aq, \(aqon the main branch\(aq,
+-\(aqon branch {branch}\(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{ifeq(branch, 'default', 'on the main branch',
++\&'on branch {branch}')}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6713,9 +6686,9 @@
+ Append a newline if not empty:
+ .sp
+ .nf
+-.ft C
+-$ hg tip \-\-template "{if(author, \(aq{author}\en\(aq)}"
+-.ft P
++.ft
++$ hg tip \-\-template "{if(author, '{author}\en')}"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6722,9 +6695,9 @@
+ Label the output for use with the color extension:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{label(\(aqchangeset.{phase}\(aq, node|short)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{label('changeset.{phase}', node|short)}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -6731,34 +6704,34 @@
+ Invert the firstline filter, i.e. everything but the first line:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{sub(r\(aq^.*\en?\en?\(aq, \(aq\(aq, desc)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{sub(r'^.*\en?\en?', '', desc)}\en"
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .SH URL PATHS
+ .sp
  Valid URLs are of the form:
  .sp
  .nf
@@ -3223,10 +4619,10 @@
  .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 \fBhg
-+incoming \-\-bundle\fP). See also \fBhg help paths\fP.
+-repositories or to bundle files (as created by \%\fBhg bundle\fP\: or
+-\%\fBhg incoming \-\-bundle\fP\:). See also \%\fBhg help paths\fP\:.
++repositories or to bundle files (as created by \fBhg bundle\fP or
++\fBhg incoming \-\-bundle\fP). 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
@@ -3239,7 +4635,16 @@
  possible if the feature is explicitly enabled on the remote Mercurial
  server.
  .sp
[email protected]@ -6395,26 +6384,26 @@
[email protected]@ -6766,7 +6739,7 @@
+ web.cacerts.
+ .sp
+ Some notes about using SSH with Mercurial:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ SSH requires an accessible shell account on the destination machine
[email protected]@ -6773,63 +6746,63 @@
  and a copy of hg in the remote path or specified with as remotecmd.
  .IP \(bu 2
  .
@@ -3272,7 +4677,11 @@
  .fi
  .sp
  Alternatively specify "ssh \-C" as your ssh command in your
[email protected]@ -6425,16 +6414,16 @@
+ configuration file or with the \-\-ssh command line option.
+-.UNINDENT
++.RE
+ .sp
+ These URLs can all be stored in your configuration file with path
  aliases under the [paths] section like so:
  .sp
  .nf
@@ -3292,26 +4701,79 @@
  .sp
  Two path aliases are special because they are used as defaults when
  you do not provide the URL to a command:
[email protected]@ -6443,14 +6432,14 @@
+-.INDENT 0.0
++.RS 0
+ .TP
  .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
++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.
+-.UNINDENT
 +The push command will look for a path named 'default\-push', and
 +prefer it over 'default' if both are defined.
- .UNINDENT
++.RE
  .SH EXTENSIONS
  .sp
[email protected]@ -6532,7 +6521,7 @@
+ This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
[email protected]@ -6853,7 +6826,7 @@
+ distinguish them.
+ .sp
+ The order in which access checks are performed is:
+-.INDENT 0.0
++.RS 0
+ .IP 1. 3
+ .
+ Deny  list for branches (section \fBacl.deny.branches\fP)
[email protected]@ -6866,7 +6839,7 @@
+ .IP 4. 3
+ .
+ Allow list for paths    (section \fBacl.allow\fP)
+-.UNINDENT
++.RE
+ .sp
+ The allow and deny sections take key\-value pairs.
+ .SS Branch\-based Access Control
[email protected]@ -6874,7 +6847,7 @@
+ Use the \fBacl.deny.branches\fP and \fBacl.allow.branches\fP sections to
+ have branch\-based access control. Keys in these sections can be
+ either:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ a branch name, or
[email protected]@ -6881,10 +6854,10 @@
+ .IP \(bu 2
+ .
+ an asterisk, to match any branch;
+-.UNINDENT
++.RE
+ .sp
+ The corresponding values can be either:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ a comma\-separated list containing users and groups, or
[email protected]@ -6891,7 +6864,7 @@
+ .IP \(bu 2
+ .
+ an asterisk, to match anyone;
+-.UNINDENT
++.RE
+ .sp
+ You can add the "!" prefix to a user or group name to invert the sense
+ of the match.
[email protected]@ -6913,7 +6886,7 @@
  .SS Example Configuration
  .sp
  .nf
@@ -3320,16 +4782,175 @@
  [hooks]
  
  # Use this if you want to check access restrictions at commit time
[email protected]@ -6608,7 +6597,7 @@
[email protected]@ -6989,12 +6962,12 @@
  src/main/resources/** = *
  
  \&.hgtags = release_engineer
 -.ft P
 +.ft
  .fi
+ .SS Examples using the "!" prefix
+ .sp
+-Suppose there\(aqs a branch that only a given user (or group) should be able to
+-push to, and you don\(aqt want to restrict access to any other branch that may
++Suppose there's a branch that only a given user (or group) should be able to
++push to, and you don't want to restrict access to any other branch that may
+ be created.
+ .sp
+ The "!" prefix allows you to prevent anyone except a given user or group to
[email protected]@ -7006,18 +6979,18 @@
+ 3) Deny access to a file to anyone but user "gollum"
+ .sp
+ .nf
+-.ft C
++.ft
+ [acl.allow.branches]
+ # Empty
+ 
+ [acl.deny.branches]
+ 
+-# 1) only \(aqgollum\(aq can commit to branch \(aqring\(aq;
+-# \(aqgollum\(aq and anyone else can still commit to any other branch.
++# 1) only 'gollum' can commit to branch 'ring';
++# 'gollum' and anyone else can still commit to any other branch.
+ ring = !gollum
+ 
+-# 2) only members of the group \(aqhobbit\(aq can commit to branch \(aqlake\(aq;
+-# \(aqhobbit\(aq members and anyone else can still commit to any other branch.
++# 2) only members of the group 'hobbit' can commit to branch 'lake';
++# 'hobbit' members and anyone else can still commit to any other branch.
+ lake = [email protected]
+ 
+ # You can also deny access based on file paths:
[email protected]@ -7026,10 +6999,10 @@
+ # Empty
+ 
+ [acl.deny]
+-# 3) only \(aqgollum\(aq can change the file below;
+-# \(aqgollum\(aq and anyone else can still change any other file.
++# 3) only 'gollum' can change the file below;
++# 'gollum' and anyone else can still change any other file.
+ /misty/mountains/cave/ring = !gollum
+-.ft P
++.ft
+ .fi
+ .SS blackbox
+ .sp
[email protected]@ -7040,7 +7013,7 @@
+ Examples:
+ .sp
+ .nf
+-.ft C
++.ft
+ [blackbox]
+ track = *
+ 
[email protected]@ -7055,26 +7028,26 @@
+ maxsize = 1.5 MB
+ # rotate up to N log files when the current one gets too big
+ maxfiles = 3
+-.ft P
++.ft
+ .fi
+ .SS Commands
+ .SS blackbox
+ .sp
+ .nf
+-.ft C
++.ft
+ hg blackbox [OPTION]...
+-.ft P
++.ft
+ .fi
+ .sp
+ view the recent repository events
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-l,  \-\-limit
+ .
+ the number of events to show (default: 10)
+-.UNINDENT
++.RE
  .SS bugzilla
  .sp
[email protected]@ -6781,9 +6770,9 @@
+ hooks for integrating with the Bugzilla bug tracker
[email protected]@ -7087,7 +7060,7 @@
+ hours spent working on the bug. Bugs can also be marked fixed.
+ .sp
+ Three basic modes of access to Bugzilla are provided:
+-.INDENT 0.0
++.RS 0
+ .IP 1. 3
+ .
+ Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
[email protected]@ -7099,7 +7072,7 @@
+ .
+ Writing directly to the Bugzilla database. Only Bugzilla installations
+ using MySQL are supported. Requires Python MySQLdb.
+-.UNINDENT
++.RE
+ .sp
+ Writing directly to the database is susceptible to schema changes, and
+ relies on a Bugzilla contrib script to send out bug change
[email protected]@ -7127,12 +7100,12 @@
+ works on all supported Bugzilla versions.
+ .sp
+ Configuration items common to all access modes:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B bugzilla.version
+ .
+ The access type to use. Values recognized are:
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B \fBxmlrpc\fP
+ .sp
[email protected]@ -7155,7 +7128,7 @@
+ .sp
+ MySQL access, Bugzilla 2.16 and up to but not
+ including 2.18.
+-.UNINDENT
++.RE
+ .TP
+ .B bugzilla.regexp
+ .
[email protected]@ -7200,7 +7173,7 @@
+ Template to use when formatting comments. Overrides style if
+ specified. In addition to the usual Mercurial keywords, the
+ extension specifies:
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B \fB{bug}\fP
+ .sp
[email protected]@ -7217,7 +7190,7 @@
+ .B \fB{hgweb}\fP
+ .sp
+ Base URL for browsing Mercurial repositories.
+-.UNINDENT
++.RE
+ .sp
+ Default \fBchangeset {node|short} in repo {root} refers to bug
+ {bug}.\endetails:\en\et{desc|tabindent}\fP
[email protected]@ -7234,10 +7207,10 @@
+ .
+ Base URL for browsing Mercurial repositories. Referenced from
+ templates as \fB{hgweb}\fP.
+-.UNINDENT
++.RE
+ .sp
+ Configuration items common to XMLRPC+email and MySQL access modes:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B bugzilla.usermap
+ .
[email protected]@ -7246,13 +7219,13 @@
  line:
  .sp
  .nf
@@ -3341,7 +4962,54 @@
  .fi
  .sp
  See also the \fB[usermap]\fP section.
[email protected]@ -6869,7 +6858,7 @@
+-.UNINDENT
++.RE
+ .sp
+ The \fB[usermap]\fP section is used to specify mappings of Mercurial
+ committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
[email protected]@ -7259,7 +7232,7 @@
+ Contains entries of the form \fBcommitter = Bugzilla user\fP.
+ .sp
+ XMLRPC access mode configuration:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B bugzilla.bzurl
+ .
[email protected]@ -7274,22 +7247,22 @@
+ .B bugzilla.password
+ .
+ The password for Bugzilla login.
+-.UNINDENT
++.RE
+ .sp
+ XMLRPC+email access mode uses the XMLRPC access mode configuration items,
+ and also:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B bugzilla.bzemail
+ .
+ The Bugzilla email address.
+-.UNINDENT
++.RE
+ .sp
+ In addition, the Mercurial email settings must be configured. See the
+ documentation in hgrc(5), sections \fB[email]\fP and \fB[smtp]\fP.
+ .sp
+ MySQL access mode configuration:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B bugzilla.host
+ .
[email protected]@ -7329,12 +7302,12 @@
+ id) and \fBuser\fP (committer bugzilla email). Default depends on
+ version; from 2.18 it is "cd %(bzdir)s && perl \-T
+ contrib/sendbugmail.pl %(id)s %(user)s".
+-.UNINDENT
++.RE
+ .sp
  Activating the extension:
  .sp
  .nf
@@ -3350,7 +5018,7 @@
  [extensions]
  bugzilla =
  
[email protected]@ -6876,7 +6865,7 @@
[email protected]@ -7341,7 +7314,7 @@
  [hooks]
  # run bugzilla hook on every change pulled or pushed in here
  incoming.bugzilla = python:hgext.bugzilla.hook
@@ -3359,7 +5027,7 @@
  .fi
  .sp
  Example configurations:
[email protected]@ -6888,7 +6877,7 @@
[email protected]@ -7353,7 +7326,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -3368,7 +5036,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -6901,7 +6890,7 @@
[email protected]@ -7366,7 +7339,7 @@
  
  [web]
  baseurl=http://my\-project.org/hg
@@ -3377,7 +5045,7 @@
  .fi
  .sp
  XMLRPC+email example configuration. This uses the Bugzilla at
[email protected]@ -6913,7 +6902,7 @@
[email protected]@ -7378,7 +7351,7 @@
  \[email protected]\-project.org\fP.
  .sp
  .nf
@@ -3386,7 +5054,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -6930,7 +6919,7 @@
[email protected]@ -7395,7 +7368,7 @@
  
  [usermap]
  [email protected][email protected]
@@ -3395,7 +5063,7 @@
  .fi
  .sp
  MySQL example configuration. This has a local Bugzilla 3.2 installation
[email protected]@ -6941,7 +6930,7 @@
[email protected]@ -7406,7 +7379,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -3404,7 +5072,7 @@
  [bugzilla]
  host=localhost
  password=XYZZY
[email protected]@ -6958,18 +6947,18 @@
[email protected]@ -7423,35 +7396,35 @@
  
  [usermap]
  [email protected][email protected]
@@ -3426,7 +5094,13 @@
  .fi
  .SS children
  .sp
[email protected]@ -6978,12 +6967,12 @@
+ command to display child changesets (DEPRECATED)
+ .sp
+-This extension is deprecated. You should use \%\fBhg log \-r
+-"children(REV)"\fP\: instead.
++This extension is deprecated. You should use \fBhg log \-r
++"children(REV)"\fP instead.
+ .SS Commands
  .SS children
  .sp
  .nf
@@ -3442,7 +5116,25 @@
  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
[email protected]@ -7011,9 +7000,9 @@
[email protected]@ -7458,7 +7431,7 @@
+ argument to \-\-rev if given) is printed.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -7471,7 +7444,7 @@
+ .B \-\-template
+ .
+ display with template
+-.UNINDENT
++.RE
+ .SS churn
+ .sp
+ command to display statistics about repository history
[email protected]@ -7479,9 +7452,9 @@
  .SS churn
  .sp
  .nf
@@ -3454,33 +5146,25 @@
  .fi
  .sp
  This command will display a histogram representing the number
[email protected]@ -7029,19 +7018,19 @@
[email protected]@ -7497,7 +7470,7 @@
  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}'
+ 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
[email protected]@ -7509,7 +7482,7 @@
  
  # display count of lines changed in every year
--hg churn \-f \(aq%Y\(aq \-s
--.ft P
-+hg churn \-f '%Y' \-s
+ hg churn \-f "%Y" \-s
+-.ft P
 +.ft
  .fi
  .sp
  It is possible to map alternate email addresses to a main address
[email protected]@ -7048,9 +7037,9 @@
[email protected]@ -7516,9 +7489,9 @@
  by providing a file using the following format:
  .sp
  .nf
@@ -3492,7 +5176,25 @@
  .fi
  .sp
  Such a file may be specified with the \-\-aliases option, otherwise
[email protected]@ -7118,7 +7107,7 @@
[email protected]@ -7526,7 +7499,7 @@
+ Aliases will be split from the rightmost "=".
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -7567,7 +7540,7 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
+ .SS color
+ .sp
+ colorize output from some commands
[email protected]@ -7587,7 +7560,7 @@
  Default effects may be overridden from your configuration file:
  .sp
  .nf
@@ -3501,7 +5203,7 @@
  [color]
  status.modified = blue bold underline red_background
  status.added = green bold
[email protected]@ -7127,7 +7116,7 @@
[email protected]@ -7596,7 +7569,7 @@
  status.unknown = magenta bold underline
  status.ignored = black bold
  
@@ -3510,10 +5212,10 @@
  status.clean = none
  status.copied = none
  
[email protected]@ -7157,13 +7146,13 @@
[email protected]@ -7635,13 +7608,13 @@
+ shelve.name = blue bold
  
- tags.normal = green
- tags.local = black bold
+ histedit.remaining = red bold
 -.ft P
 +.ft
  .fi
@@ -3522,14 +5224,14 @@
 -\(aqinverse\(aq, \(aqinvisible\(aq, \(aqitalic\(aq, \(aqstandout\(aq, and \(aqunderline\(aq; in
 -ECMA\-48 mode, the options are \(aqbold\(aq, \(aqinverse\(aq, \(aqitalic\(aq, and
 -\(aqunderline\(aq.  How each is rendered depends on the terminal emulator.
-+The available effects in terminfo mode are 'blink', 'bold', 'dim', 'inverse', 'invisible', 'italic', 'standout',
-+and 'underline'; in
++The available effects in terminfo mode are 'blink', 'bold', 'dim',
++\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
 +ECMA\-48 mode, the options are 'bold', 'inverse', 'italic', and
-+'underline'.  How each is rendered depends on the terminal emulator.
++\&'underline'.  How each is rendered depends on the terminal emulator.
  Some may not be available for a given terminal type, and will be
  silently ignored.
  .sp
[email protected]@ -7170,7 +7159,7 @@
[email protected]@ -7648,7 +7621,7 @@
  Note that on some systems, terminfo mode may cause problems when using
  color with the pager extension and less \-R. less with the \-R option
  will only display ECMA\-48 color codes, and terminfo mode may sometimes
@@ -3538,7 +5240,7 @@
  either using ansi mode (or auto mode), or by using less \-r (which will
  pass through all terminal control codes, not just color control
  codes).
[email protected]@ -7180,18 +7169,18 @@
[email protected]@ -7658,18 +7631,18 @@
  for your terminal type, assuming terminfo mode.  For instance:
  .sp
  .nf
@@ -3556,14 +5258,14 @@
 -\(aqorange\(aq to colors in 256\-color xterm\(aqs default color cube.  These
 +to set 'brightblue' to color slot 12 (useful for 16 color terminals
 +that have brighter colors defined in the upper eight) and, 'pink' and
-+'orange' to colors in 256\-color xterm's default color cube.  These
++\&'orange' to colors in 256\-color xterm's default color cube.  These
  defined colors may then be used as any of the pre\-defined eight,
 -including appending \(aq_background\(aq to set the background to that color.
 +including appending '_background' to set the background to that color.
  .sp
  By default, the color extension will use ANSI mode (or win32 mode on
  Windows) if it detects a terminal. To override auto mode (to enable
[email protected]@ -7198,13 +7187,13 @@
[email protected]@ -7676,13 +7649,13 @@
  terminfo mode, for example), set the following configuration option:
  .sp
  .nf
@@ -3580,7 +5282,7 @@
  disable color.
  .SS convert
  .sp
[email protected]@ -7213,9 +7202,9 @@
[email protected]@ -7691,13 +7664,13 @@
  .SS convert
  .sp
  .nf
@@ -3592,7 +5294,34 @@
  .fi
  .sp
  Accepted source formats [identifiers]:
[email protected]@ -7265,7 +7254,7 @@
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Mercurial [hg]
[email protected]@ -7725,10 +7698,10 @@
+ .IP \(bu 2
+ .
+ Perforce [p4]
+-.UNINDENT
++.RE
+ .sp
+ Accepted destination formats [identifiers]:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Mercurial [hg]
[email protected]@ -7735,7 +7708,7 @@
+ .IP \(bu 2
+ .
+ Subversion [svn] (history on branches is not preserved)
+-.UNINDENT
++.RE
+ .sp
+ If no revision is given, all revisions will be converted.
+ Otherwise, convert will only import up to the named revision
[email protected]@ -7743,12 +7716,12 @@
  .sp
  If no destination directory name is specified, it defaults to the
  basename of the source with \fB\-hg\fP appended. If the destination
@@ -3601,9 +5330,18 @@
  .sp
  By default, all sources except Mercurial will use \-\-branchsort.
  Mercurial uses \-\-sourcesort to preserve original revision numbers
[email protected]@ -7291,19 +7280,19 @@
- supported by Mercurial sources.
- .UNINDENT
+ order. Sort modes have the following effects:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-branchsort
+ .
[email protected]@ -7773,21 +7746,21 @@
+ try to move closed revisions as close as possible
+ to parent branches, only supported by Mercurial
+ sources.
+-.UNINDENT
++.RE
  .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
@@ -3626,7 +5364,7 @@
  and can be run repeatedly to copy new commits.
  .sp
  The authormap is a simple text file that maps each source commit
[email protected]@ -7312,9 +7301,9 @@
[email protected]@ -7796,9 +7769,9 @@
  author mapping and the line format is:
  .sp
  .nf
@@ -3638,7 +5376,7 @@
  .fi
  .sp
  Empty lines and lines starting with a \fB#\fP are ignored.
[email protected]@ -7324,13 +7313,13 @@
[email protected]@ -7808,13 +7781,13 @@
  directives:
  .sp
  .nf
@@ -3654,7 +5392,7 @@
  .fi
  .sp
  Comment lines start with \fB#\fP. A specified path matches if it
[email protected]@ -7354,9 +7343,9 @@
[email protected]@ -7838,9 +7811,9 @@
  comma\-separated values:
  .sp
  .nf
@@ -3666,7 +5404,7 @@
  .fi
  .sp
  The key is the revision ID in the source
[email protected]@ -7376,9 +7365,9 @@
[email protected]@ -7860,9 +7833,9 @@
  lines of the form:
  .sp
  .nf
@@ -3678,7 +5416,126 @@
  .fi
  .sp
  where "original_branch_name" is the name of the branch in the
[email protected]@ -7625,9 +7614,9 @@
[email protected]@ -7874,7 +7847,7 @@
+ .sp
+ The Mercurial source recognizes the following configuration
+ options, which you can set on the command line with \fB\-\-config\fP:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.hg.ignoreerrors
+ .
[email protected]@ -7891,7 +7864,7 @@
+ .B convert.hg.revs
+ .
+ revset specifying the source revisions to convert.
+-.UNINDENT
++.RE
+ .SS CVS Source
+ .sp
+ CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
[email protected]@ -7905,7 +7878,7 @@
+ sandbox is ignored.
+ .sp
+ The following options can be used with \fB\-\-config\fP:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.cvsps.cache
+ .
[email protected]@ -7956,7 +7929,7 @@
+ the changesets are calculated from the CVS log. The
+ function is passed a list with the changeset entries, and can
+ modify the changesets in\-place, or add or delete them.
+-.UNINDENT
++.RE
+ .sp
+ An additional "debugcvsps" Mercurial command allows the builtin
+ changeset merging code to be run without doing a conversion. Its
[email protected]@ -7976,7 +7949,7 @@
+ detection.
+ .sp
+ The following options can be set with \fB\-\-config\fP:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.svn.branches
+ .
[email protected]@ -7998,18 +7971,18 @@
+ use local time (as determined by the TZ
+ environment variable) for changeset date/times. The default
+ is False (use UTC).
+-.UNINDENT
++.RE
+ .sp
+ Source history can be retrieved starting at a specific revision,
+ instead of being integrally converted. Only single branch
+ conversions are supported.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.svn.startrev
+ .
+ specify start Subversion revision number.
+ The default is 0.
+-.UNINDENT
++.RE
+ .SS Perforce Source
+ .sp
+ The Perforce (P4) importer can be given a p4 depot path or a
[email protected]@ -8021,17 +7994,17 @@
+ .sp
+ It is possible to limit the amount of source history to be
+ converted by specifying an initial Perforce revision:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.p4.startrev
+ .
+ specify initial Perforce revision (a
+ Perforce changelist number).
+-.UNINDENT
++.RE
+ .SS Mercurial Destination
+ .sp
+ The following options are supported:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.hg.clonebranches
+ .
[email protected]@ -8047,10 +8020,10 @@
+ .
+ preserve branch names. The default is
+ True.
+-.UNINDENT
++.RE
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-authors
+ .
[email protected]@ -8099,7 +8072,7 @@
+ .B \-\-closesort
+ .
+ try to reorder closed revisions
+-.UNINDENT
++.RE
+ .SS eol
+ .sp
+ automatically manage newlines in repository files
[email protected]@ -8111,7 +8084,7 @@
+ .sp
+ The extension reads its configuration from a versioned \fB.hgeol\fP
+ configuration file found in the root of the working copy. The
+-\fB.hgeol\fP file use the same syntax as all other Mercurial
++\fB\&.hgeol\fP file use the same syntax as all other Mercurial
+ configuration files. It uses two sections, \fB[patterns]\fP and
+ \fB[repository]\fP.
+ .sp
[email protected]@ -8124,9 +8097,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,
@@ -3690,7 +5547,7 @@
  default behaviour; it is only needed if you need to override a later,
  more general pattern.
  .sp
[email protected]@ -7644,7 +7633,7 @@
[email protected]@ -8143,7 +8116,7 @@
  Example versioned \fB.hgeol\fP file:
  .sp
  .nf
@@ -3699,18 +5556,22 @@
  [patterns]
  **.py = native
  **.vcproj = CRLF
[email protected]@ -7654,8 +7643,9 @@
[email protected]@ -8153,7 +8126,7 @@
  
  [repository]
  native = LF
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
- The rules will first apply when files are touched in the working
[email protected]@ -7671,7 +7661,7 @@
[email protected]@ -8165,12 +8138,12 @@
+ normal Mercurial configuration files and the \fB.hgeol\fP file, with the
+ latter overriding the former. You can use that section to control the
+ overall behavior. There are three settings:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
  .
  \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
@@ -3719,7 +5580,16 @@
  generate an archive where files have line endings for Windows.
  .IP \(bu 2
  .
[email protected]@ -7701,7 +7691,7 @@
[email protected]@ -8184,7 +8157,7 @@
+ \fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
+ ensure that converted files end with a EOL character (either \fB\en\fP
+ or \fB\er\en\fP as per the configured patterns).
+-.UNINDENT
++.RE
+ .sp
+ The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
+ like the deprecated win32text extension does. This means that you can
[email protected]@ -8200,7 +8173,7 @@
  \fBeol.checkallhook\fP hook. These hooks are best used as
  \fBpretxnchangegroup\fP hooks.
  .sp
@@ -3728,7 +5598,7 @@
  used.
  .SS extdiff
  .sp
[email protected]@ -7714,12 +7704,12 @@
[email protected]@ -8213,12 +8186,12 @@
  files to compare.
  .sp
  The extdiff extension also allows you to configure new diff commands, so
@@ -3744,7 +5614,7 @@
  cdiff = gdiff \-Nprc5
  ## or the old way:
  #cmd.cdiff = gdiff
[email protected]@ -7736,20 +7726,20 @@
[email protected]@ -8235,20 +8208,20 @@
  # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
  # your .vimrc
  vimdiff = gvim \-f "+next" \e
@@ -3769,7 +5639,7 @@
  .fi
  .sp
  The extdiff extension will look in your [diff\-tools] and [merge\-tools]
[email protected]@ -7756,17 +7746,17 @@
[email protected]@ -8255,17 +8228,17 @@
  sections for diff tool arguments, when none are specified in [extdiff].
  .sp
  .nf
@@ -3791,7 +5661,7 @@
  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
[email protected]@ -7773,9 +7763,9 @@
[email protected]@ -8272,9 +8245,9 @@
  .SS extdiff
  .sp
  .nf
@@ -3803,7 +5673,25 @@
  .fi
  .sp
  Show differences between revisions for the specified files, using
[email protected]@ -7833,9 +7823,9 @@
[email protected]@ -8293,7 +8266,7 @@
+ to its parent.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-p,  \-\-program
+ .
[email protected]@ -8318,7 +8291,7 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
+ .SS factotum
+ .sp
+ http authentication with factotum
[email protected]@ -8332,9 +8305,9 @@
  By default, keys are specified as:
  .sp
  .nf
@@ -3815,7 +5703,7 @@
  .fi
  .sp
  If the factotum extension is unable to read the required key, one will be
[email protected]@ -7845,12 +7835,12 @@
[email protected]@ -8344,12 +8317,12 @@
  default, these entries are:
  .sp
  .nf
@@ -3830,7 +5718,7 @@
  .fi
  .sp
  The executable entry defines the full path to the factotum binary. The
[email protected]@ -7863,9 +7853,9 @@
[email protected]@ -8362,9 +8335,9 @@
  .SS fetch
  .sp
  .nf
@@ -3842,7 +5730,7 @@
  .fi
  .sp
  This finds all changes from the repository at the specified path
[email protected]@ -7880,7 +7870,7 @@
[email protected]@ -8379,12 +8352,12 @@
  the newly pulled changes. Local changes are then merged into the
  pulled changes. To switch the merge order, use \-\-switch\-parent.
  .sp
@@ -3851,25 +5739,40 @@
  .sp
  Returns 0 on success.
  .sp
[email protected]@ -7938,9 +7928,9 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -8429,7 +8402,7 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
+ .SS gpg
+ .sp
+ commands to sign and verify changesets
[email protected]@ -8437,9 +8410,9 @@
  .SS sigcheck
  .sp
  .nf
 -.ft C
 +.ft
- hg sigcheck REVISION
+ hg sigcheck REV
 -.ft P
 +.ft
  .fi
  .sp
  verify all the signatures there may be for a particular revision
[email protected]@ -7947,15 +7937,15 @@
[email protected]@ -8446,18 +8419,18 @@
  .SS sign
  .sp
  .nf
 -.ft C
 +.ft
- hg sign [OPTION]... [REVISION]...
+ hg sign [OPTION]... [REV]...
 -.ft P
 +.ft
  .fi
@@ -3881,8 +5784,17 @@
 +See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -7991,9 +7981,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-l,  \-\-local
+ .
[email protected]@ -8486,13 +8459,13 @@
+ .B \-u,  \-\-user
+ .
+ record the specified user as committer
+-.UNINDENT
++.RE
  .SS sigs
  .sp
  .nf
@@ -3894,7 +5806,7 @@
  .fi
  .sp
  list signed changesets
[email protected]@ -8008,9 +7998,9 @@
[email protected]@ -8507,9 +8480,9 @@
  .SS glog
  .sp
  .nf
@@ -3906,7 +5818,25 @@
  .fi
  .sp
  Print a revision history alongside a revision graph drawn with
[email protected]@ -8118,7 +8108,7 @@
[email protected]@ -8519,7 +8492,7 @@
+ directory.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-f,  \-\-follow
+ .
[email protected]@ -8608,7 +8581,7 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
+ .SS hgcia
+ .sp
+ hooks for integrating with the CIA.vc notification service
[email protected]@ -8617,7 +8590,7 @@
  configure it, set the following options in your hgrc:
  .sp
  .nf
@@ -3915,7 +5845,7 @@
  [cia]
  # your registered CIA user name
  user = foo
[email protected]@ -8150,7 +8140,7 @@
[email protected]@ -8649,7 +8622,7 @@
  [web]
  # If you want hyperlinks (optional)
  baseurl = http://server/path/to/repo
@@ -3924,7 +5854,7 @@
  .fi
  .SS hgk
  .sp
[email protected]@ -8162,19 +8152,17 @@
[email protected]@ -8661,19 +8634,18 @@
  .sp
  hgk consists of two parts: a Tcl script that does the displaying and
  querying of information, and an extension to Mercurial named hgk.py,
@@ -3937,8 +5867,9 @@
 -to work, hgk must be in your search path. Alternately, you can specify
 -the path to hgk in your configuration file:
 +The \fBhg view\fP command will launch the hgk Tcl script. The script is
-+shipped in /usr/demo/mercurial, and hgk needs no configuration to find it.
-+You can specify the path to an alternate hgk in your configuration file:
++shipped in /usr/demo/mercurial, and hgk needs no configuration to find
++it.  You can specify the path to an alternate hgk in your configuration
++file:
  .sp
  .nf
 -.ft C
@@ -3950,7 +5881,7 @@
  .fi
  .sp
  hgk can make use of the extdiff extension to visualize revisions.
[email protected]@ -8181,10 +8169,10 @@
[email protected]@ -8680,10 +8652,10 @@
  Assuming you had already configured extdiff vdiff command, just add:
  .sp
  .nf
@@ -3963,7 +5894,7 @@
  .fi
  .sp
  Revisions context menu will now display additional entries to fire
[email protected]@ -8193,9 +8181,9 @@
[email protected]@ -8692,37 +8664,37 @@
  .SS view
  .sp
  .nf
@@ -3975,7 +5906,18 @@
  .fi
  .sp
  start interactive history viewer
[email protected]@ -8212,28 +8200,28 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-l,  \-\-limit
+ .
+ limit number of changes displayed
+-.UNINDENT
++.RE
+ .SS highlight
+ .sp
  syntax highlighting for hgweb (requires Pygments)
  .sp
  It depends on the Pygments syntax highlighting library:
@@ -3995,6 +5937,203 @@
  .sp
 -The default is \(aqcolorful\(aq.
 +The default is 'colorful'.
+ .SS histedit
+ .sp
+ interactive history editing
[email protected]@ -8731,7 +8703,7 @@
+ is as follows, assuming the following history:
+ .sp
+ .nf
+-.ft C
++.ft
+ @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
+ |    Add delta
+ |
[email protected]@ -8743,7 +8715,7 @@
+ |
+ o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
+      Add alpha
+-.ft P
++.ft
+ .fi
+ .sp
+ If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
[email protected]@ -8750,7 +8722,7 @@
+ file open in your editor:
+ .sp
+ .nf
+-.ft C
++.ft
+ pick c561b4e977df Add beta
+ pick 030b686bedc4 Add gamma
+ pick 7c2fd3b9020c Add delta
[email protected]@ -8764,7 +8736,7 @@
+ #  d, drop = remove commit from history
+ #  m, mess = edit message without changing commit content
+ #
+-.ft P
++.ft
+ .fi
+ .sp
+ In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
[email protected]@ -8773,7 +8745,7 @@
+ would reorganize the file to look like this:
+ .sp
+ .nf
+-.ft C
++.ft
+ pick 030b686bedc4 Add gamma
+ pick c561b4e977df Add beta
+ fold 7c2fd3b9020c Add delta
[email protected]@ -8787,7 +8759,7 @@
+ #  d, drop = remove commit from history
+ #  m, mess = edit message without changing commit content
+ #
+-.ft P
++.ft
+ .fi
+ .sp
+ At which point you close the editor and \fBhistedit\fP starts working. When you
[email protected]@ -8795,21 +8767,21 @@
+ those revisions together, offering you a chance to clean up the commit message:
+ .sp
+ .nf
+-.ft C
++.ft
+ Add beta
+ ***
+ Add delta
+-.ft P
++.ft
+ .fi
+ .sp
+ Edit the commit message to your liking, then close the editor. For
+-this example, let\(aqs assume that the commit message was changed to
++this example, let's assume that the commit message was changed to
+ \fBAdd beta and delta.\fP After histedit has run and had a chance to
+ remove any old or temporary revisions it needed, the history looks
+ like this:
+ .sp
+ .nf
+-.ft C
++.ft
+ @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
+ |    Add beta and delta.
+ |
[email protected]@ -8818,12 +8790,12 @@
+ |
+ o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
+      Add alpha
+-.ft P
++.ft
+ .fi
+ .sp
+ Note that \fBhistedit\fP does \fInot\fP remove any revisions (even its own temporary
+ ones) until after it has completed all the editing operations, so it will
+-probably perform several strip operations when it\(aqs done. For the above example,
++probably perform several strip operations when it's done. For the above example,
+ it had to run strip twice. Strip can be slow depending on a variety of factors,
+ so you might need to be a little patient. You can choose to keep the original
+ revisions by passing the \fB\-\-keep\fP flag.
[email protected]@ -8830,20 +8802,20 @@
+ .sp
+ The \fBedit\fP operation will drop you back to a command prompt,
+ allowing you to edit files freely, or even use \fBhg record\fP to commit
+-some changes as a separate commit. When you\(aqre done, any remaining
++some changes as a separate commit. When you're done, any remaining
+ uncommitted changes will be committed as well. When done, run \fBhg
+-histedit \-\-continue\fP to finish this step. You\(aqll be prompted for a
++histedit \-\-continue\fP to finish this step. You'll be prompted for a
+ new commit message, but the default commit message will be the
+ original message for the \fBedit\fP ed revision.
+ .sp
+ The \fBmessage\fP operation will give you a chance to revise a commit
+-message without changing the contents. It\(aqs a shortcut for doing
++message without changing the contents. It's a shortcut for doing
+ \fBedit\fP immediately followed by \fIhg histedit \-\-continue\(ga\fP.
+ .sp
+ If \fBhistedit\fP encounters a conflict when moving a revision (while
+-handling \fBpick\fP or \fBfold\fP), it\(aqll stop in a similar manner to
+-\fBedit\fP with the difference that it won\(aqt prompt you for a commit
+-message when done. If you decide at this point that you don\(aqt like how
++handling \fBpick\fP or \fBfold\fP), it'll stop in a similar manner to
++\fBedit\fP with the difference that it won't prompt you for a commit
++message when done. If you decide at this point that you don't like how
+ much work it will be to rearrange history, or that you made a mistake,
+ you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
+ have made and return to the state before you attempted to edit your
[email protected]@ -8853,7 +8825,7 @@
+ changes, such that we have the following history:
+ .sp
+ .nf
+-.ft C
++.ft
+ @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
+ |    Add theta
+ |
[email protected]@ -8874,7 +8846,7 @@
+ |
+ o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
+      Add alpha
+-.ft P
++.ft
+ .fi
+ .sp
+ If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
[email protected]@ -8885,9 +8857,9 @@
+ .SS histedit
+ .sp
+ .nf
+-.ft C
++.ft
+ hg histedit ANCESTOR | \-\-outgoing [URL]
+-.ft P
++.ft
+ .fi
+ .sp
+ This command edits changesets between ANCESTOR and the parent of
[email protected]@ -8895,7 +8867,7 @@
+ .sp
+ With \-\-outgoing, this edits changesets not found in the
+ destination repository. If URL of the destination is omitted, the
+-\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used.
++\&'default\-push' (or 'default') path will be used.
+ .sp
+ For safety, this command is aborted, also if there are ambiguous
+ outgoing revisions which may confuse users: for example, there are
[email protected]@ -8903,7 +8875,7 @@
+ .sp
+ Use "min(outgoing() and ::.)" or similar revset specification
+ instead of \-\-outgoing to specify edit target revision exactly in
+-such ambiguous situation. See \%\fBhg help revsets\fP\: for detail about
++such ambiguous situation. See \fBhg help revsets\fP for detail about
+ selecting revisions.
+ .sp
+ Returns 0 on success, 1 if user intervention is required (not only
[email protected]@ -8911,7 +8883,7 @@
+ conflicts).
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-commands
+ .
[email protected]@ -8923,7 +8895,7 @@
+ .TP
+ .B \-k,  \-\-keep
+ .
+-don\(aqt strip old nodes after edit is complete
++don't strip old nodes after edit is complete
+ .TP
+ .B \-\-abort
+ .
[email protected]@ -8940,23 +8912,23 @@
+ .B \-r,  \-\-rev
+ .
+ first revision to be edited
+-.UNINDENT
++.RE
  .SS inotify
  .sp
 -accelerate status report using Linux\(aqs inotify service
@@ -4011,22 +6150,23 @@
  .fi
  .sp
  start an inotify server for this repository
[email protected]@ -8269,12 +8257,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
[email protected]@ -8296,7 +8284,7 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-d,  \-\-daemon
+ .
[email protected]@ -8973,7 +8945,7 @@
+ .B \-\-pid\-file
+ .
+ name of file to write process ID to
+-.UNINDENT
++.RE
+ .SS interhg
+ .sp
+ None
[email protected]@ -8997,7 +8969,7 @@
  Example:
  .sp
  .nf
@@ -4035,18 +6175,16 @@
  [keyword]
  # expand keywords in every python file except those matching "x*"
  **.py =
[email protected]@ -8305,8 +8293,9 @@
[email protected]@ -9006,7 +8978,7 @@
  [keywordset]
  # prefer svn\- over cvs\-like default keywordmaps
  svn = True
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
- The more specific you are in your filename patterns the less you
[email protected]@ -8314,7 +8303,7 @@
[email protected]@ -9015,11 +8987,11 @@
  .RE
  .sp
  For [keywordmaps] template mapping and expansion demonstration and
@@ -4055,9 +6193,17 @@
  available templates and filters.
  .sp
  Three additional date template filters are provided:
[email protected]@ -8333,26 +8322,26 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fButcdate\fP
+ .sp
[email protected]@ -9032,28 +9004,28 @@
+ .B \fBsvnisodate\fP
+ .sp
  "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
- .UNINDENT
+-.UNINDENT
++.RE
  .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
@@ -4089,7 +6235,7 @@
  .fi
  .sp
  Show current, custom, or default keyword template maps and their
[email protected]@ -8363,7 +8352,7 @@
[email protected]@ -9064,10 +9036,10 @@
  .sp
  Use \-d/\-\-default to disable current configuration.
  .sp
@@ -4097,8 +6243,17 @@
 +See \fBhg help templates\fP for information on templates and filters.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -8379,9 +8368,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-d,  \-\-default
+ .
[email protected]@ -9076,13 +9048,13 @@
+ .B \-f,  \-\-rcfile
+ .
+ read maps from rcfile
+-.UNINDENT
++.RE
  .SS kwexpand
  .sp
  .nf
@@ -4110,7 +6265,21 @@
  .fi
  .sp
  Run after (re)enabling keyword expansion.
[email protected]@ -8402,9 +8391,9 @@
[email protected]@ -9090,7 +9062,7 @@
+ kwexpand refuses to run if given files contain local changes.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-I,  \-\-include
+ .
[email protected]@ -9099,13 +9071,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS kwfiles
  .sp
  .nf
@@ -4122,7 +6291,7 @@
  .fi
  .sp
  List which files in the working directory are matched by the
[email protected]@ -8414,7 +8403,7 @@
[email protected]@ -9115,7 +9087,7 @@
  execution by including only files that are actual candidates for
  expansion.
  .sp
@@ -4131,7 +6300,7 @@
  inclusion and exclusion of files.
  .sp
  With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
[email protected]@ -8421,12 +8410,12 @@
[email protected]@ -9122,16 +9094,16 @@
  of files are:
  .sp
  .nf
@@ -4146,7 +6315,17 @@
  .fi
  .sp
  Options:
[email protected]@ -8455,9 +8444,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-all
+ .
[email protected]@ -9152,13 +9124,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS kwshrink
  .sp
  .nf
@@ -4158,7 +6337,25 @@
  .fi
  .sp
  Must be run before changing/disabling active keywords.
[email protected]@ -8481,10 +8470,10 @@
[email protected]@ -9166,7 +9138,7 @@
+ kwshrink refuses to run if given files contain local changes.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-I,  \-\-include
+ .
[email protected]@ -9175,7 +9147,7 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
+ .SS largefiles
+ .sp
+ track large binary files
[email protected]@ -9182,10 +9154,10 @@
  .sp
  Large binary files tend to be not very compressible, not very
  diffable, and not at all mergeable. Such files are not handled
@@ -4171,7 +6368,7 @@
  problems by adding a centralized client\-server layer on top of
  Mercurial: largefiles live in a \fIcentral store\fP out on the network
  somewhere, and you only fetch the revisions that you need when you
[email protected]@ -8496,18 +8485,18 @@
[email protected]@ -9197,18 +9169,18 @@
  identified by the SHA\-1 hash of their contents, which is written to
  the standin. largefiles uses that revision ID to get/put largefile
  revisions from/to the central store. This saves both disk space and
@@ -4195,7 +6392,18 @@
  .fi
  .sp
  When you push a changeset that adds/modifies largefiles to a remote
[email protected]@ -8525,12 +8514,12 @@
[email protected]@ -9225,8 +9197,8 @@
+ copy to the latest pulled revision (and thereby downloading any new
+ largefiles).
+ .sp
+-If you want to pull largefiles you don\(aqt need for update yet, then
+-you can use pull with the \fI\-\-lfrev\fP option or the \%\fBhg lfpull\fP\: command.
++If you want to pull largefiles you don't need for update yet, then
++you can use pull with the \fI\-\-lfrev\fP option or the \fBhg lfpull\fP command.
+ .sp
+ If you know you are pulling from a non\-default location and want to
+ download all the largefiles that correspond to the new changesets at
[email protected]@ -9245,12 +9217,12 @@
  If you already have large files tracked by Mercurial without the
  largefiles extension, you will need to convert your repository in
  order to benefit from largefiles. This is done with the
@@ -4211,7 +6419,7 @@
  .fi
  .sp
  In repositories that already have largefiles in them, any new file
[email protected]@ -8540,20 +8529,20 @@
[email protected]@ -9260,20 +9232,20 @@
  \-\-lfsize option to the add command (also in megabytes):
  .sp
  .nf
@@ -4236,7 +6444,7 @@
  [largefiles]
  patterns =
    *.jpg
[email protected]@ -8560,7 +8549,7 @@
[email protected]@ -9280,7 +9252,7 @@
    re:.*\e.(png|bmp)$
    library.zip
    content/audio/*
@@ -4245,7 +6453,7 @@
  .fi
  .sp
  Files that match one of these patterns will be added as largefiles
[email protected]@ -8569,15 +8558,15 @@
[email protected]@ -9289,15 +9261,15 @@
  The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
  will be ignored for any repositories not already containing a
  largefile. To add the first largefile to a repository, you must
@@ -4264,7 +6472,84 @@
  .fi
  .sp
  Convert repository SOURCE to a new repository DEST, identical to
[email protected]@ -8618,10 +8607,10 @@
[email protected]@ -9317,7 +9289,7 @@
+ this, the DEST repository can be used without largefiles at all.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-size
+ .
[email protected]@ -9326,31 +9298,31 @@
+ .B \-\-to\-normal
+ .
+ convert from a largefiles repo to a normal repo
+-.UNINDENT
++.RE
+ .SS lfpull
+ .sp
+ .nf
+-.ft C
++.ft
+ hg lfpull \-r REV... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
+-.ft P
++.ft
+ .fi
+ .sp
+ Pull largefiles that are referenced from local changesets but missing
+ locally, pulling from a remote repository to the local cache.
+ .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
+ Some examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ pull largefiles for all branch heads:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg lfpull \-r "head() and not closed()"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -9357,14 +9329,14 @@
+ pull largefiles on the default branch:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg lfpull \-r "branch(default)"
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -9381,7 +9353,7 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
+ .SS mq
+ .sp
+ manage a stack of patches
[email protected]@ -9393,10 +9365,10 @@
  Known patches are represented as patch files in the .hg/patches
  directory. Applied patches are both patch files and changesets.
  .sp
@@ -4277,7 +6562,7 @@
  create new patch                          qnew
  import existing patch                     qimport
  
[email protected]@ -8631,7 +8620,7 @@
[email protected]@ -9406,7 +9378,7 @@
  add known patch to applied stack          qpush
  remove patch from applied stack           qpop
  refresh contents of top applied patch     qrefresh
@@ -4286,7 +6571,7 @@
  .fi
  .sp
  By default, mq will automatically use git patches when required to
[email protected]@ -8639,36 +8628,36 @@
[email protected]@ -9414,29 +9386,29 @@
  files creations or deletions. This behaviour can be configured with:
  .sp
  .nf
@@ -4303,7 +6588,7 @@
 -\(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
++\&'no', mq will override the [diff] section and always generate git or
  regular patches, possibly losing data in the second case.
  .sp
  It may be desirable for mq changesets to be kept in the secret phase (see
@@ -4322,7 +6607,23 @@
  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
+ .sp
+ If the working directory contains uncommitted files, qpush, qpop and
+ qgoto abort immediately. If \-f/\-\-force is used, the changes are
[email protected]@ -9443,10 +9415,10 @@
+ discarded. Setting:
+ .sp
+ .nf
+-.ft C
++.ft
+ [mq]
+ keepchanges = True
+-.ft P
++.ft
+ .fi
+ .sp
+ make them behave as if \-\-keep\-changes were passed, and non\-conflicting
[email protected]@ -9459,15 +9431,15 @@
  .SS qapplied
  .sp
  .nf
@@ -4334,7 +6635,19 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -8687,9 +8676,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-1,  \-\-last
+ .
[email protected]@ -9476,13 +9448,13 @@
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
  .SS qclone
  .sp
  .nf
@@ -4346,7 +6659,7 @@
  .fi
  .sp
  If source is local, destination will have no patches applied. If
[email protected]@ -8702,7 +8691,7 @@
[email protected]@ -9495,12 +9467,12 @@
  default. Use \-p <url> to change.
  .sp
  The patch directory must be a nested Mercurial repository, as
@@ -4355,7 +6668,18 @@
  .sp
  Return 0 on success.
  .sp
[email protected]@ -8740,12 +8729,12 @@
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-pull
+ .
[email protected]@ -9529,19 +9501,19 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
  .SS qcommit
  .sp
  .nf
@@ -4370,8 +6694,17 @@
 +This command is deprecated; use \fBhg commit \-\-mq\fP instead.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -8795,9 +8784,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-addremove
+ .
[email protected]@ -9588,13 +9560,13 @@
+ recurse into subrepositories
+ .sp
+ aliases: qci
+-.UNINDENT
++.RE
  .SS qdelete
  .sp
  .nf
@@ -4383,7 +6716,7 @@
  .fi
  .sp
  The patches must not be applied, and at least one patch is required. Exact
[email protected]@ -8805,7 +8794,7 @@
[email protected]@ -9602,10 +9574,10 @@
  preserved in the patch directory.
  .sp
  To stop managing a patch and move it into permanent history,
@@ -4391,8 +6724,17 @@
 +use the \fBhg qfinish\fP command.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -8823,9 +8812,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-k,  \-\-keep
+ .
[email protected]@ -9616,13 +9588,13 @@
+ stop managing a revision (DEPRECATED)
+ .sp
+ aliases: qremove qrm
+-.UNINDENT
++.RE
  .SS qdiff
  .sp
  .nf
@@ -4404,7 +6746,7 @@
  .fi
  .sp
  Shows a diff which includes the current patch as well as any
[email protected]@ -8833,8 +8822,8 @@
[email protected]@ -9630,8 +9602,8 @@
  last refresh (thus showing what the current patch would become
  after a qrefresh).
  .sp
@@ -4415,7 +6757,21 @@
  made by the current patch without including changes made since the
  qrefresh.
  .sp
[email protected]@ -8894,9 +8883,9 @@
[email protected]@ -9638,7 +9610,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-text
+ .
[email protected]@ -9687,13 +9659,13 @@
+ .B \-X,  \-\-exclude
+ .
+ exclude names matching the given patterns
+-.UNINDENT
++.RE
  .SS qfinish
  .sp
  .nf
@@ -4427,7 +6783,18 @@
  .fi
  .sp
  Finishes the specified revisions (corresponding to applied
[email protected]@ -8924,9 +8913,9 @@
[email protected]@ -9712,18 +9684,18 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-applied
+ .
+ finish all applied changesets
+-.UNINDENT
++.RE
  .SS qfold
  .sp
  .nf
@@ -4439,7 +6806,21 @@
  .fi
  .sp
  Patches must not yet be applied. Each patch will be successively
[email protected]@ -8963,9 +8952,9 @@
[email protected]@ -9739,7 +9711,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-edit
+ .
[email protected]@ -9756,19 +9728,19 @@
+ .B \-l,  \-\-logfile
+ .
+ read commit message from file
+-.UNINDENT
++.RE
  .SS qgoto
  .sp
  .nf
@@ -4451,7 +6832,19 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -8980,30 +8969,31 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-keep\-changes
+ .
[email protected]@ -9781,19 +9753,19 @@
+ .B \-\-no\-backup
+ .
+ do not save backup copies of files
+-.UNINDENT
++.RE
  .SS qguard
  .sp
  .nf
@@ -4471,8 +6864,8 @@
  has activated it.
  .sp
  With no arguments, print the currently active guards.
[email protected]@ -9800,21 +9772,21 @@
  With arguments, set guards for the named patch.
-+.RS 0
  .IP Note
  .
 -Specifying negative guards now requires \(aq\-\-\(aq.
@@ -4490,7 +6883,19 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9022,9 +9012,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-l,  \-\-list
+ .
[email protected]@ -9823,13 +9795,13 @@
+ .B \-n,  \-\-none
+ .
+ drop all guards
+-.UNINDENT
++.RE
  .SS qheader
  .sp
  .nf
@@ -4502,28 +6907,28 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9031,9 +9021,9 @@
[email protected]@ -9836,9 +9808,9 @@
  .SS qimport
  .sp
  .nf
 -.ft C
 +.ft
- hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... FILE...
+ 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
[email protected]@ -9054,7 +9044,7 @@
- With \-g/\-\-git, patches imported with \-\-rev will use the git diff
- format. See the diffs help topic for information on why this is
- important for preserving rename/copy information and permission
--changes. Use \%\fBhg qfinish\fP\: to remove changesets from mq control.
-+changes. Use \fBhg qfinish\fP to remove changesets from mq control.
[email protected]@ -9859,7 +9831,7 @@
+ under mq control). With \-g/\-\-git, patches imported with \-\-rev will
+ use the git diff format. See the diffs help topic for information
+ on why this is important for preserving rename/copy information
+-and permission changes. Use \%\fBhg qfinish\fP\: to remove changesets
++and permission changes. Use \fBhg qfinish\fP to remove changesets
+ from mq control.
  .sp
  To import a patch from standard input, pass \- as the patch file.
- When importing from standard input, a patch name must be specified
[email protected]@ -9063,9 +9053,9 @@
[email protected]@ -9869,15 +9841,15 @@
  To import an existing patch while renaming it:
  .sp
  .nf
@@ -4535,7 +6940,19 @@
  .fi
  .sp
  Returns 0 if import succeeded.
[email protected]@ -9100,9 +9090,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-existing
+ .
[email protected]@ -9902,13 +9874,13 @@
+ .B \-P,  \-\-push
+ .
+ qpush after importing
+-.UNINDENT
++.RE
  .SS qinit
  .sp
  .nf
@@ -4547,7 +6964,7 @@
  .fi
  .sp
  The queue repository is unversioned by default. If
[email protected]@ -9111,8 +9101,8 @@
[email protected]@ -9917,22 +9889,22 @@
  an unversioned patch repository into a versioned one). You can use
  qcommit to commit changes to this queue repository.
  .sp
@@ -4557,8 +6974,14 @@
 +commands. With \-c, use \fBhg init \-\-mq\fP instead.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -9124,9 +9114,9 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-c,  \-\-create\-repo
+ .
+ create queue repository
+-.UNINDENT
++.RE
  .SS qnew
  .sp
  .nf
@@ -4570,7 +6993,7 @@
  .fi
  .sp
  qnew creates a new patch on top of the currently\-applied patch (if
[email protected]@ -9142,7 +9132,7 @@
[email protected]@ -9948,7 +9920,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
@@ -4579,7 +7002,21 @@
  .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
[email protected]@ -9201,9 +9191,9 @@
[email protected]@ -9958,7 +9930,7 @@
+ Returns 0 on successful creation of a new patch.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-edit
+ .
[email protected]@ -10003,30 +9975,30 @@
+ .B \-l,  \-\-logfile
+ .
+ read commit message from file
+-.UNINDENT
++.RE
  .SS qnext
  .sp
  .nf
@@ -4591,7 +7028,16 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9218,9 +9208,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
  .SS qpop
  .sp
  .nf
@@ -4602,8 +7048,22 @@
 +.ft
  .fi
  .sp
- By default, pops off the top of the patch stack. If given a patch
[email protected]@ -9247,9 +9237,9 @@
+ Without argument, pops off the top of the patch stack. If given a
[email protected]@ -10041,7 +10013,7 @@
+ Return 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-all
+ .
[email protected]@ -10062,30 +10034,30 @@
+ .B \-\-no\-backup
+ .
+ do not save backup copies of files
+-.UNINDENT
++.RE
  .SS qprev
  .sp
  .nf
@@ -4615,7 +7075,16 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9264,9 +9254,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
  .SS qpush
  .sp
  .nf
@@ -4626,8 +7095,22 @@
 +.ft
  .fi
  .sp
- When \-f/\-\-force is applied, all local changes in patched files
[email protected]@ -9308,9 +9298,9 @@
+ By default, abort if the working directory contains uncommitted
[email protected]@ -10096,7 +10068,7 @@
+ Return 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-keep\-changes
+ .
[email protected]@ -10133,13 +10105,13 @@
+ .B \-\-no\-backup
+ .
+ do not save backup copies of files
+-.UNINDENT
++.RE
  .SS qqueue
  .sp
  .nf
@@ -4639,7 +7122,21 @@
  .fi
  .sp
  Supports switching between different patch queues, as well as creating
[email protected]@ -9361,9 +9351,9 @@
[email protected]@ -10161,7 +10133,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-l,  \-\-list
+ .
[email protected]@ -10186,13 +10158,13 @@
+ .B \-\-purge
+ .
+ delete queue, and remove patch dir
+-.UNINDENT
++.RE
  .SS qrefresh
  .sp
  .nf
@@ -4651,7 +7148,21 @@
  .fi
  .sp
  If any file patterns are provided, the refreshed patch will
[email protected]@ -9434,9 +9424,9 @@
[email protected]@ -10214,7 +10186,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-e,  \-\-edit
+ .
[email protected]@ -10259,13 +10231,13 @@
+ .B \-l,  \-\-logfile
+ .
+ read commit message from file
+-.UNINDENT
++.RE
  .SS qrename
  .sp
  .nf
@@ -4663,7 +7174,20 @@
  .fi
  .sp
  With one argument, renames the current patch to PATCH1.
[email protected]@ -9452,12 +9442,12 @@
[email protected]@ -10272,24 +10244,24 @@
+ With two arguments, renames PATCH1 to PATCH2.
+ .sp
+ Returns 0 on success.
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ aliases: qmv
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
  .SS qrestore
  .sp
  .nf
@@ -4678,8 +7202,17 @@
 +This command is deprecated, use \fBhg rebase\fP instead.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -9473,12 +9463,12 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-d,  \-\-delete
+ .
[email protected]@ -10298,19 +10270,19 @@
+ .B \-u,  \-\-update
+ .
+ update queue working directory
+-.UNINDENT
++.RE
  .SS qsave
  .sp
  .nf
@@ -4694,8 +7227,17 @@
 +This command is deprecated, use \fBhg rebase\fP instead.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -9510,12 +9500,12 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-c,  \-\-copy
+ .
[email protected]@ -10335,16 +10307,16 @@
+ .B \-l,  \-\-logfile
+ .
+ read commit message from file
+-.UNINDENT
++.RE
  .SS qselect
  .sp
  .nf
@@ -4711,7 +7253,7 @@
  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
[email protected]@ -9522,11 +9512,11 @@
[email protected]@ -10351,11 +10323,11 @@
  match the current guard. For example:
  .sp
  .nf
@@ -4725,7 +7267,21 @@
  .fi
  .sp
  This activates the "stable" guard. mq will skip foo.patch (because
[email protected]@ -9573,9 +9563,9 @@
[email protected]@ -10381,7 +10353,7 @@
+ Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-n,  \-\-none
+ .
[email protected]@ -10398,19 +10370,19 @@
+ .B \-\-reapply
+ .
+ pop, then reapply patches
+-.UNINDENT
++.RE
  .SS qseries
  .sp
  .nf
@@ -4737,7 +7293,19 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9594,9 +9584,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-m,  \-\-missing
+ .
[email protected]@ -10419,36 +10391,36 @@
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
  .SS qtop
  .sp
  .nf
@@ -4749,7 +7317,16 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9611,9 +9601,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
  .SS qunapplied
  .sp
  .nf
@@ -4761,38 +7338,31 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -9632,9 +9622,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
[email protected]@ -9648,8 +9638,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.
[email protected]@ -9697,13 +9687,13 @@
- This extension let you run hooks sending email notifications when
- changesets are being pushed, from the sending or receiving side.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-1,  \-\-first
+ .
[email protected]@ -10457,7 +10429,7 @@
+ .B \-s,  \-\-summary
+ .
+ print first line of patch header
+-.UNINDENT
++.RE
+ .SS notify
+ .sp
+ hooks for sending email push notifications
[email protected]@ -10465,13 +10437,13 @@
+ This extension implements hooks to send email notifications when
+ changesets are sent from or received by the local repository.
  .sp
 -First, enable the extension as explained in \%\fBhg help extensions\fP\:, and
 +First, enable the extension as explained in \fBhg help extensions\fP, and
  register the hook you want to run. \fBincoming\fP and \fBchangegroup\fP hooks
- are run by the changesets receiver while the \fBoutgoing\fP one is for
- the sender:
+ are run when changesets are received, while \fBoutgoing\fP hooks are for
+ changesets sent to another repository:
  .sp
  .nf
 -.ft C
@@ -4800,7 +7370,7 @@
  [hooks]
  # one email for each incoming changeset
  incoming.notify = python:hgext.notify.hook
[email protected]@ -9712,7 +9702,7 @@
[email protected]@ -10480,7 +10452,7 @@
  
  # one email for all outgoing changesets
  outgoing.notify = python:hgext.notify.hook
@@ -4808,27 +7378,40 @@
 +.ft
  .fi
  .sp
- Now the hooks are running, subscribers must be assigned to
[email protected]@ -9721,7 +9711,7 @@
- repository:
+ This registers the hooks. To enable notification, subscribers must
[email protected]@ -10489,7 +10461,7 @@
+ multiple recipients to a single repository:
  .sp
  .nf
 -.ft C
 +.ft
  [usersubs]
- # key is subscriber email, value is a comma\-separated list of glob
- # patterns
[email protected]@ -9731,7 +9721,7 @@
- # key is glob pattern, value is a comma\-separated list of subscriber
- # emails
+ # key is subscriber email, value is a comma\-separated list of repo patterns
+ [email protected] = pattern
[email protected]@ -10497,7 +10469,7 @@
+ [reposubs]
+ # key is repo pattern, value is a comma\-separated list of subscriber emails
  pattern = [email protected]
 -.ft P
 +.ft
  .fi
  .sp
- Glob patterns are matched against absolute path to repository
[email protected]@ -9739,10 +9729,10 @@
- referenced with:
+ A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
[email protected]@ -10505,10 +10477,10 @@
+ present, is separated from the glob by a hash. Example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [reposubs]
+ */widgets#branch(release) = qa\[email protected]
+-.ft P
++.ft
+ .fi
+ .sp
+ This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
[email protected]@ -10519,10 +10491,10 @@
+ incorporated by reference:
  .sp
  .nf
 -.ft C
@@ -4839,43 +7422,82 @@
 +.ft
  .fi
  .sp
- Alternatively, they can be added to Mercurial configuration files by
[email protected]@ -9764,7 +9754,7 @@
- if it includes the incoming or outgoing changes source. Incoming
- sources can be \fBserve\fP for changes coming from http or ssh,
- \fBpull\fP for pulled changes, \fBunbundle\fP for changes added by
--\%\fBhg unbundle\fP\: or \fBpush\fP for changes being pushed
-+\fBhg unbundle\fP or \fBpush\fP for changes being pushed
- locally. Outgoing sources are the same except for \fBunbundle\fP which
- is replaced by \fBbundle\fP. Default: serve.
- .TP
[email protected]@ -9848,10 +9838,10 @@
+ Notifications will not be sent until the \fBnotify.test\fP value is set
[email protected]@ -10529,7 +10501,7 @@
+ to \fBFalse\fP; see below.
+ .sp
+ Notifications content can be tweaked with the following configuration entries:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B notify.test
+ .
[email protected]@ -10538,8 +10510,8 @@
+ .B notify.sources
+ .
+ Space\-separated list of change sources. Notifications are activated only
+-when a changeset\(aqs source is in this list. Sources may be:
+-.INDENT 7.0
++when a changeset's source is in this list. Sources may be:
++.RS 7
+ .TP
+ .B \fBserve\fP
+ .sp
[email protected]@ -10560,7 +10532,7 @@
+ .B \fBbundle\fP
+ .sp
+ changesets sent via \fBhg unbundle\fP
+-.UNINDENT
++.RE
+ .sp
+ Default: serve.
+ .TP
[email protected]@ -10603,7 +10575,7 @@
+ .TP
+ .B notify.maxsubject
+ .
+-Maximum number of characters in email\(aqs subject line. Default: 67.
++Maximum number of characters in email's subject line. Default: 67.
+ .TP
+ .B notify.diffstat
+ .
[email protected]@ -10622,11 +10594,11 @@
+ If set, use the committer of the first changeset in a changegroup for
+ the "From" field of the notification mail. If not set, take the user
+ from the pushing repo.  Default: False.
+-.UNINDENT
++.RE
+ .sp
+ If set, the following entries will also be used to customize the
+ notifications:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B email.from
+ .
[email protected]@ -10637,7 +10609,7 @@
+ .
+ Root repository URL to combine with repository paths when making
+ references. See also \fBnotify.strip\fP.
+-.UNINDENT
++.RE
+ .SS pager
+ .sp
+ browse command output with an external pager
[email protected]@ -10645,10 +10617,10 @@
  To set the pager that should be used, set the application variable:
  .sp
  .nf
 -.ft C
 +.ft
  [pager]
- pager = less \-FRSX
+ pager = less \-FRX
 -.ft P
 +.ft
  .fi
  .sp
  If no pager is set, the pager extensions uses the environment variable
[email protected]@ -9861,10 +9851,10 @@
- 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
[email protected]@ -9871,10 +9861,10 @@
[email protected]@ -10658,10 +10630,10 @@
  pager.ignore list:
  .sp
  .nf
@@ -4888,7 +7510,7 @@
  .fi
  .sp
  You can also enable the pager only for certain commands using
[email protected]@ -9881,10 +9871,10 @@
[email protected]@ -10668,10 +10640,10 @@
  pager.attend. Below is the default list of commands to be paged:
  .sp
  .nf
@@ -4901,7 +7523,7 @@
  .fi
  .sp
  Setting pager.attend to an empty value will cause all commands to be
[email protected]@ -9892,7 +9882,7 @@
[email protected]@ -10679,7 +10651,7 @@
  .sp
  If pager.attend is present, pager.ignore will be ignored.
  .sp
@@ -4910,16 +7532,27 @@
  to specify them in your user configuration file.
  .sp
  The \-\-pager=... option can also be used to control when the pager is
[email protected]@ -9917,7 +9907,7 @@
[email protected]@ -10695,7 +10667,7 @@
+ Each patch email has a Subject line of "[PATCH M of N] ...", using the
+ first line of the changeset description as the subject text. The
+ message contains two or three body parts:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ The changeset description.
[email protected]@ -10704,8 +10676,8 @@
  [Optional] The result of running diffstat on the patch.
  .IP \(bu 2
  .
 -The patch itself, as generated by \%\fBhg export\fP\:.
+-.UNINDENT
 +The patch itself, as generated by \fBhg export\fP.
- .UNINDENT
++.RE
  .sp
  Each message refers to the first in the series using the In\-Reply\-To
[email protected]@ -9928,7 +9918,7 @@
+ and References headers, so they will show up as a sequence in threaded
[email protected]@ -10715,7 +10687,7 @@
  configuration file:
  .sp
  .nf
@@ -4928,7 +7561,7 @@
  [email]
  from = My Name <[email protected]>
  to = recipient1, recipient2, ...
[email protected]@ -9935,13 +9925,13 @@
[email protected]@ -10722,13 +10694,13 @@
  cc = cc1, cc2, ...
  bcc = bcc1, bcc2, ...
  reply\-to = address1, address2, ...
@@ -4944,7 +7577,7 @@
  changesets as a patchbomb.
  .sp
  You can also either configure the method option in the email section
[email protected]@ -9953,13 +9943,13 @@
[email protected]@ -10740,13 +10712,13 @@
  .SS email
  .sp
  .nf
@@ -4961,16 +7594,16 @@
  of N]" introduction, which describes the series as a whole.
  .sp
  Each patch email has a Subject line of "[PATCH M of N] ...", using
[email protected]@ -9970,7 +9960,7 @@
[email protected]@ -10757,7 +10729,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 the \-d/\-\-diffstat or \-\-confirm options, you will be presented
  with a final summary of all messages and asked for confirmation before
[email protected]@ -10010,7 +10000,7 @@
[email protected]@ -10797,7 +10769,7 @@
  Examples:
  .sp
  .nf
@@ -4979,7 +7612,7 @@
  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
[email protected]@ -10031,7 +10021,7 @@
[email protected]@ -10818,7 +10790,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
@@ -4988,7 +7621,25 @@
  .fi
  .sp
  Before using this command, you will need to enable email in your
[email protected]@ -10168,7 +10158,7 @@
[email protected]@ -10825,7 +10797,7 @@
+ hgrc. See the [email] section in hgrc(5) for details.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-g,  \-\-git
+ .
[email protected]@ -10942,7 +10914,7 @@
+ .B \-\-insecure
+ .
+ do not verify server certificate (ignoring web.cacerts config)
+-.UNINDENT
++.RE
+ .SS progress
+ .sp
+ show progress bars for some actions
[email protected]@ -10955,7 +10927,7 @@
  The following settings are available:
  .sp
  .nf
@@ -4997,7 +7648,7 @@
  [progress]
  delay = 3 # number of seconds (float) before showing the progress bar
  changedelay = 1 # changedelay: minimum delay before showing a new topic.
[email protected]@ -10178,11 +10168,11 @@
[email protected]@ -10965,11 +10937,11 @@
  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)
@@ -5012,7 +7663,7 @@
  .fi
  .sp
  Valid entries for the format field are topic, bar, number, unit,
[email protected]@ -10197,9 +10187,9 @@
[email protected]@ -10984,9 +10956,9 @@
  .SS purge
  .sp
  .nf
@@ -5024,8 +7675,12 @@
  .fi
  .sp
  Delete files not known to Mercurial. This is useful to test local
[email protected]@ -10209,7 +10199,7 @@
- .INDENT 0.0
[email protected]@ -10993,18 +10965,18 @@
+ and uncommitted changes in an otherwise\-clean source tree.
+ .sp
+ This means that purge will delete:
+-.INDENT 0.0
++.RS 0
  .IP \(bu 2
  .
 -Unknown files: files marked with "?" by \%\fBhg status\fP\:
@@ -5033,16 +7688,46 @@
  .IP \(bu 2
  .
  Empty directories: in fact Mercurial ignores directories unless
[email protected]@ -10226,7 +10216,7 @@
+ they contain files under source control management
+-.UNINDENT
++.RE
+ .sp
+ But it will leave untouched:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Modified and unmodified tracked files
[email protected]@ -11013,8 +10985,8 @@
  Ignored files (unless \-\-all is specified)
  .IP \(bu 2
  .
 -New files added to the repository (with \%\fBhg add\fP\:)
+-.UNINDENT
 +New files added to the repository (with \fBhg add\fP)
- .UNINDENT
++.RE
  .sp
  If directories are given on the command line, only files in these
[email protected]@ -10274,15 +10264,15 @@
+ directories are considered.
[email protected]@ -11025,7 +10997,7 @@
+ option.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-abort\-on\-err
+ .
[email protected]@ -11052,7 +11024,7 @@
+ exclude names matching the given patterns
+ .sp
+ aliases: clean
+-.UNINDENT
++.RE
+ .SS rebase
+ .sp
+ command to move sets of revisions to a different ancestor
[email protected]@ -11061,14 +11033,14 @@
  repository.
  .sp
  For more information:
@@ -5054,32 +7739,52 @@
  .nf
 -.ft C
 +.ft
- hg rebase [\-s REV | \-b REV] [\-d REV] [options]
- hg rebase {\-a|\-c}
+ hg rebase [\-s REV | \-b REV] [\-d REV] [OPTION]
 -.ft P
 +.ft
  .fi
  .sp
  Rebase uses repeated merging to graft changesets from one part of
[email protected]@ -10295,7 +10285,7 @@
- same rebase or they will end up with duplicated changesets after
[email protected]@ -11082,9 +11054,9 @@
  pulling in your rebased changesets.
  .sp
+ In its default configuration, Mercurial will prevent you from
+-rebasing published changes. See \%\fBhg help phases\fP\: for details.
++rebasing published changes. See \fBhg help phases\fP for details.
+ .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.)
[email protected]@ -10322,7 +10312,7 @@
+ rebase uses the current branch tip as the destination. (The
+ destination changeset is not modified by rebasing, but new
+ changesets are added as its descendants.)
[email protected]@ -11116,7 +11088,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
+ nothing if you are at the branch tip 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
[email protected]@ -10404,25 +10394,25 @@
[email protected]@ -11126,7 +11098,7 @@
+ unresolved conflicts.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-source
+ .
[email protected]@ -11191,7 +11163,7 @@
+ .B \-\-template
+ .
+ display with template
+-.UNINDENT
++.RE
+ .SS record
+ .sp
+ commands to interactively select changes for commit/qrefresh
[email protected]@ -11199,25 +11171,25 @@
  .SS qrecord
  .sp
  .nf
@@ -5112,7 +7817,7 @@
  .sp
  You will be prompted for whether to record changes to each
  modified file, and for files with multiple changes, for each
[email protected]@ -10430,7 +10420,7 @@
[email protected]@ -11225,7 +11197,7 @@
  possible:
  .sp
  .nf
@@ -5121,7 +7826,7 @@
  y \- record this change
  n \- skip this change
  e \- edit this change manually
[email protected]@ -10443,7 +10433,7 @@
[email protected]@ -11238,13 +11210,13 @@
  q \- quit, recording no changes
  
  ? \- display help
@@ -5130,7 +7835,23 @@
  .fi
  .sp
  This command is not available when committing a merge.
[email protected]@ -10510,9 +10500,9 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-addremove
+ .
[email protected]@ -11301,7 +11273,7 @@
+ .B \-B,  \-\-ignore\-blank\-lines
+ .
+ ignore changes whose lines are all blank
+-.UNINDENT
++.RE
+ .SS relink
+ .sp
+ recreates hardlinks between repository clones
[email protected]@ -11309,9 +11281,9 @@
  .SS relink
  .sp
  .nf
@@ -5142,7 +7863,7 @@
  .fi
  .sp
  When repositories are cloned locally, their data files will be
[email protected]@ -10544,18 +10534,18 @@
[email protected]@ -11343,18 +11315,18 @@
  lot of repositories to act like a scheme, for example:
  .sp
  .nf
@@ -5165,7 +7886,7 @@
  .fi
  .sp
  Additionally there is support for some more complex schemas, for
[email protected]@ -10562,10 +10552,10 @@
[email protected]@ -11361,10 +11333,10 @@
  example used by Google Code:
  .sp
  .nf
@@ -5178,7 +7899,7 @@
  .fi
  .sp
  The syntax is taken from Mercurial templates, and you have unlimited
[email protected]@ -10577,7 +10567,7 @@
[email protected]@ -11376,7 +11348,7 @@
  For convenience, the extension adds these schemes by default:
  .sp
  .nf
@@ -5187,7 +7908,7 @@
  [schemes]
  py = http://hg.python.org/
  bb = https://bitbucket.org/
[email protected]@ -10584,7 +10574,7 @@
[email protected]@ -11383,7 +11355,7 @@
  bb+ssh = ssh://[email protected]/
  gcode = https://{1}.googlecode.com/hg/
  kiln = https://{1}.kilnhg.com/Repo/
@@ -5196,7 +7917,7 @@
  .fi
  .sp
  You can override a predefined scheme by defining a new scheme with the
[email protected]@ -10596,13 +10586,14 @@
[email protected]@ -11395,9 +11367,9 @@
  .SS share
  .sp
  .nf
@@ -5208,12 +7929,18 @@
  .fi
  .sp
  Initialize a new repository and working directory that shares its
- history with another repository.
-+.RS 0
- .IP Note
- .
- using rollback or extensions that destroy/modify history (mq,
[email protected]@ -10626,9 +10617,9 @@
[email protected]@ -11415,18 +11387,18 @@
+ .RE
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-U,  \-\-noupdate
+ .
+ do not create a working copy
+-.UNINDENT
++.RE
  .SS unshare
  .sp
  .nf
@@ -5225,7 +7952,120 @@
  .fi
  .sp
  Copy the store data to the repo and remove the sharedpath data.
[email protected]@ -10644,9 +10635,9 @@
[email protected]@ -11440,7 +11412,7 @@
+ .sp
+ Later on, the "hg unshelve" command restores the changes saved by "hg
+ shelve". Changes can be restored even after updating to a different
+-parent, in which case Mercurial\(aqs merge machinery will resolve any
++parent, in which case Mercurial's merge machinery will resolve any
+ conflicts if necessary.
+ .sp
+ You can have more than one shelved change outstanding at a time; each
[email protected]@ -11450,9 +11422,9 @@
+ .SS shelve
+ .sp
+ .nf
+-.ft C
++.ft
+ hg shelve
+-.ft P
++.ft
+ .fi
+ .sp
+ Shelving takes files that "hg status" reports as not clean, saves
[email protected]@ -11480,7 +11452,7 @@
+ all shelved changes, use \fB\-\-cleanup\fP.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-A,  \-\-addremove
+ .
[email protected]@ -11517,13 +11489,13 @@
+ .B \-\-stat
+ .
+ output diffstat\-style summary of changes
+-.UNINDENT
++.RE
+ .SS unshelve
+ .sp
+ .nf
+-.ft C
++.ft
+ hg unshelve [SHELVED]
+-.ft P
++.ft
+ .fi
+ .sp
+ This command accepts an optional name of a shelved change to
[email protected]@ -11544,7 +11516,7 @@
+ does not delete the bundle.)
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-a,  \-\-abort
+ .
[email protected]@ -11557,7 +11529,7 @@
+ .B \-\-keep
+ .
+ keep shelve after unshelving
+-.UNINDENT
++.RE
+ .SS strip
+ .sp
+ strip changesets and their descendents from history
[email protected]@ -11568,9 +11540,9 @@
+ .SS strip
+ .sp
+ .nf
+-.ft C
++.ft
+ hg strip [\-k] [\-f] [\-n] [\-B bookmark] [\-r] REV...
+-.ft P
++.ft
+ .fi
+ .sp
+ The strip command removes the specified changesets and all their
[email protected]@ -11584,8 +11556,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.
[email protected]@ -11600,7 +11572,7 @@
+ Return 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-r,  \-\-rev
+ .
[email protected]@ -11633,13 +11605,13 @@
+ .B \-B,  \-\-bookmark
+ .
+ remove revs only reachable from given bookmark
+-.UNINDENT
++.RE
+ .SS transplant
+ .sp
+ command to transplant changesets from another branch
+ .sp
+ This extension allows you to transplant changes to another parent revision,
+-possibly in another repository. The transplant is done using \(aqdiff\(aq patches.
++possibly in another repository. The transplant is done using 'diff' patches.
+ .sp
+ Transplanted patches are recorded in .hg/transplant/transplants, as a
+ map from a changeset hash to its hash in the source repository.
[email protected]@ -11647,9 +11619,9 @@
  .SS transplant
  .sp
  .nf
@@ -5237,7 +8077,7 @@
  .fi
  .sp
  Selected changesets will be applied on top of the current working
[email protected]@ -10659,9 +10650,9 @@
[email protected]@ -11666,9 +11638,9 @@
  of the form:
  .sp
  .nf
@@ -5249,16 +8089,29 @@
  .fi
  .sp
  You can rewrite the changelog message with the \-\-filter option.
[email protected]@ -10675,7 +10666,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
[email protected]@ -10685,14 +10676,14 @@
[email protected]@ -11684,17 +11656,17 @@
+ with \-\-branch will be transplanted.
+ .sp
+ Example:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ transplant all changes up to REV on top of your current revision:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg transplant \-\-branch REV \-\-all
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+ You can optionally mark selected transplanted changesets as merge
+ changesets. You will not be prompted to transplant any ancestors
[email protected]@ -11702,17 +11674,17 @@
  normally instead of transplanting them.
  .sp
  Merge changesets may be transplanted directly by specifying the
@@ -5276,8 +8129,63 @@
 +\-\-continue/\-c\fP.
  .sp
  Options:
- .INDENT 0.0
[email protected]@ -10789,10 +10780,10 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-s,  \-\-source
+ .
[email protected]@ -11753,7 +11725,7 @@
+ .B \-\-filter
+ .
+ filter changesets through command
+-.UNINDENT
++.RE
+ .SS win32mbcs
+ .sp
+ allow the use of MBCS paths with problematic encodings
[email protected]@ -11766,7 +11738,7 @@
+ operation.
+ .sp
+ This extension is useful for:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Japanese Windows users using shift_jis encoding.
[email protected]@ -11777,10 +11749,10 @@
+ .
+ All users who use a repository with one of problematic encodings on
+ case\-insensitive file system.
+-.UNINDENT
++.RE
+ .sp
+ This extension is not needed for:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Any user who use only ASCII chars in path.
[email protected]@ -11787,10 +11759,10 @@
+ .IP \(bu 2
+ .
+ Any user who do not use any of problematic encodings.
+-.UNINDENT
++.RE
+ .sp
+ Note that there are some limitations on using this extension:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ You should use single encoding in one repository.
[email protected]@ -11800,16 +11772,16 @@
+ .IP \(bu 2
+ .
+ win32mbcs is not compatible with fixutf8 extension.
+-.UNINDENT
++.RE
+ .sp
+ By default, win32mbcs uses encoding.encoding decided by Mercurial.
  You can specify the encoding by config option:
  .sp
  .nf
@@ -5290,7 +8198,26 @@
  .fi
  .sp
  It is useful for the users who want to commit with UTF\-8 log message.
[email protected]@ -10815,7 +10806,7 @@
[email protected]@ -11816,8 +11788,8 @@
+ .SS win32text
+ .sp
+ perform automatic newline conversion
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ Deprecation: The win32text extension requires each user to configure
+ the extension again and again for each clone since the configuration
[email protected]@ -11826,13 +11798,13 @@
+ We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
+ uses a version controlled file for its configuration and each clone
+ will therefore use the right settings from the start.
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+ .sp
  To perform automatic newline conversion, use:
  .sp
  .nf
@@ -5299,7 +8226,7 @@
  [extensions]
  win32text =
  [encode]
[email protected]@ -10825,17 +10816,17 @@
[email protected]@ -11842,17 +11814,17 @@
  [decode]
  ** = cleverdecode:
  # or ** = macdecode:
@@ -5320,7 +8247,7 @@
  .fi
  .sp
  To do the same check on a server to prevent CRLF/CR from being
[email protected]@ -10842,11 +10833,11 @@
[email protected]@ -11859,11 +11831,11 @@
  pushed or pulled:
  .sp
  .nf
@@ -5334,7 +8261,7 @@
  .fi
  .SS zeroconf
  .sp
[email protected]@ -10857,23 +10848,23 @@
[email protected]@ -11874,33 +11846,33 @@
  without knowing their actual IP address.
  .sp
  To allow other people to discover your repository using run
@@ -5363,17 +8290,21 @@
 +.ft
  .fi
  .SH FILES
- .INDENT 0.0
[email protected]@ -10883,7 +10874,7 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fB/etc/mercurial/hgrc\fP, \fB$HOME/.hgrc\fP, \fB.hg/hgrc\fP
+ .sp
  This file contains defaults and configuration. Values in
- \fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
+-\fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
++\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.
  .TP
  .B \fB.hgignore\fP
[email protected]@ -10890,13 +10881,13 @@
[email protected]@ -11907,13 +11879,13 @@
  .sp
  This file contains regular expressions (one per line) that
  describe file names that should be ignored by \fBhg\fP. For details,
@@ -5389,7 +8320,7 @@
  .TP
  .B \fB.hgsubstate\fP
  .sp
[email protected]@ -10911,7 +10902,7 @@
[email protected]@ -11928,7 +11900,7 @@
  .TP
  .B \fB.hg/last\-message.txt\fP
  .sp
@@ -5398,15 +8329,22 @@
  in case the commit fails.
  .TP
  .B \fB.hg/localtags\fP
[email protected]@ -10924,23 +10915,28 @@
[email protected]@ -11936,28 +11908,34 @@
+ This file can be used to define local tags which are not shared among
+ repositories. The file format is the same as for \fB.hgtags\fP, but it is
+ encoded using the local system encoding.
+-.UNINDENT
++.TP
++.B \fB/usr/demo/mercurial\fP
+ .sp
++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.
++.RE
++.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\:
@@ -5432,13 +8370,10 @@
 +Mailing list: http://selenic.com/mailman/listinfo/mercurial
  .SH COPYING
  .sp
- Copyright (C) 2005\-2012 Matt Mackall.
---- mercurial-2.0/doc/hgignore.5	Sat Oct 15 12:31:31 2011
-+++ mercurial-2.0/doc/hgignore.5	Sat May 12 17:16:23 2012
[email protected]@ -1,35 +1,9 @@
-+'\" t
- .\" Man page generated from reStructeredText.
- .
+ Copyright (C) 2005\-2013 Matt Mackall.
+--- mercurial-2.8.2/doc/hgignore.5	Wed Jan  1 19:46:48 2014
++++ mercurial-2.8.2/doc/hgignore.5	Tue Jan  7 15:28:43 2014
[email protected]@ -3,33 +3,6 @@
  .TH HGIGNORE 5 "" "" "Mercurial Manual"
  .SH NAME
  hgignore \- syntax for Mercurial ignore files
@@ -5472,7 +8407,7 @@
  .SH SYNOPSIS
  .sp
  The Mercurial system uses a file called \fB.hgignore\fP in the root
[email protected]@ -55,12 +29,12 @@
[email protected]@ -55,16 +28,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -5485,10 +8420,15 @@
  commands support the \fB\-I\fP and \fB\-X\fP options; see
 -\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
 +\fBhg help <command>\fP and \fBhg help patterns\fP for details.
+ .sp
+ Files that are already tracked are not affected by .hgignore, even
+ if they appear in .hgignore. An untracked file X can be explicitly
+-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
++added with \fBhg add X\fP, even if X would be excluded by a pattern
+ in .hgignore.
  .SH SYNTAX
  .sp
- An ignore file is a plain text file consisting of a list of patterns,
[email protected]@ -74,9 +48,9 @@
[email protected]@ -79,13 +52,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -5500,15 +8440,30 @@
  .fi
  .sp
  where \fBNAME\fP is one of the following:
[email protected]@ -98,6 +72,7 @@
- the form \fB*.c\fP will match a file ending in \fB.c\fP in any directory,
- and a regexp pattern of the form \fB\e.c$\fP will do the same. To root a
- regexp pattern, start it with \fB^\fP.
-+.RS 0
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBregexp\fP
+ .sp
[email protected]@ -94,7 +67,7 @@
+ .B \fBglob\fP
+ .sp
+ Shell\-style glob.
+-.UNINDENT
++.RE
+ .sp
+ The chosen syntax stays in effect when parsing all patterns that
+ follow, until another syntax is selected.
[email protected]@ -106,7 +79,7 @@
  .IP Note
  .
  Patterns specified in other than \fB.hgignore\fP are always rooted.
[email protected]@ -108,7 +83,7 @@
+-Please see \%\fBhg help patterns\fP\: for details.
++Please see \fBhg help patterns\fP for details.
+ .RE
+ .SH EXAMPLE
+ .sp
[email protected]@ -113,7 +86,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -5517,7 +8472,7 @@
  # use glob syntax.
  syntax: glob
  
[email protected]@ -119,16 +94,16 @@
[email protected]@ -124,16 +97,16 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -5538,12 +8493,9 @@
  .SH COPYING
  .sp
  This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-2.2.1/doc/hgrc.5	Thu May  3 14:06:35 2012
-+++ mercurial-2.2.1/doc/hgrc.5	Sat May 12 17:18:32 2012
[email protected]@ -1,35 +1,9 @@
-+'\" t
- .\" Man page generated from reStructeredText.
- .
+--- mercurial-2.8.2/doc/hgrc.5	Wed Jan  1 19:46:48 2014
++++ mercurial-2.8.2/doc/hgrc.5	Tue Jan  7 15:28:46 2014
[email protected]@ -3,33 +3,6 @@
  .TH HGRC 5 "" "" "Mercurial Manual"
  .SH NAME
  hgrc \- configuration files for Mercurial
@@ -5574,10 +8526,10 @@
 -.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 -.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 -..
- .SH SYNOPSIS
+ .SH DESCRIPTION
  .sp
  The Mercurial system uses a set of configuration files to control
[email protected]@ -40,11 +14,11 @@
[email protected]@ -40,11 +13,11 @@
  by \fBname = value\fP entries:
  .sp
  .nf
@@ -5591,7 +8543,17 @@
  .fi
  .sp
  The above entries will be referred to as \fBui.username\fP and
[email protected]@ -65,7 +39,7 @@
[email protected]@ -54,8 +27,7 @@
+ Mercurial reads configuration data from several files, if they exist.
+ These files do not exist by default and you will have to create the
+ appropriate configuration files yourself: global configuration like
+-the username setting is typically put into
+-\fB%USERPROFILE%\emercurial.ini\fP or \fB$HOME/.hgrc\fP and local
++the username setting is typically put into \fB$HOME/.hgrc\fP and local
+ configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
+ .sp
+ The names of these files depend on the system on which Mercurial is
[email protected]@ -65,101 +37,50 @@
  ones.
  .sp
  .nf
@@ -5599,8 +8561,11 @@
 +\fB<repo>/.hg/hgrc\fP
  .fi
  .sp
- .INDENT 0.0
[email protected]@ -74,8 +48,8 @@
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
  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
@@ -5610,9 +8575,10 @@
 +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 \fB[trusted]\fP section below for more details.
- .UNINDENT
[email protected]@ -82,30 +56,22 @@
- .UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
  .sp
  .nf
 -(Plan 9) \fB$home/lib/hgrc\fP
@@ -5624,19 +8590,23 @@
 +\fB$HOME/.hgrc\fP
  .fi
  .sp
- .INDENT 0.0
- .INDENT 3.5
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
  .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
-+Per\-user configuration file, for the user running Mercurial. Options in
-+this file apply to all Mercurial commands executed by this user in any
++Per\-user configuration file, 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
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
  .sp
  .nf
 -(Plan 9) \fB/lib/mercurial/hgrc\fP
@@ -5647,11 +8617,17 @@
 +\fB/etc/mercurial/hgrc.d/*.rc\fP
  .fi
  .sp
- .INDENT 0.0
[email protected]@ -117,46 +83,6 @@
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ Per\-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. Options in these files
  override per\-installation options.
- .UNINDENT
- .UNINDENT
+-.UNINDENT
+-.UNINDENT
 -.sp
 -.nf
 -(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP
@@ -5687,15 +8663,19 @@
 -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
+-order until one or more configuration files are detected.
+-.UNINDENT
+-.UNINDENT
+-.IP Note
+-.
+-The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
+-is used when running 32\-bit Python on 64\-bit Windows.
+ .RE
++.RE
  .SH SYNTAX
  .sp
  A configuration file consists of sections, led by a \fB[section]\fP header
[email protected]@ -164,12 +90,12 @@
[email protected]@ -167,12 +88,12 @@
  \fBconfiguration keys\fP):
  .sp
  .nf
@@ -5710,7 +8690,7 @@
  .fi
  .sp
  Each line contains one entry. If the lines that follow are indented,
[email protected]@ -181,12 +107,12 @@
[email protected]@ -184,12 +105,12 @@
  will use the value that was configured last. As an example:
  .sp
  .nf
@@ -5725,7 +8705,7 @@
  .fi
  .sp
  This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
[email protected]@ -196,7 +122,7 @@
[email protected]@ -199,7 +120,7 @@
  example:
  .sp
  .nf
@@ -5734,7 +8714,7 @@
  [foo]
  eggs=large
  ham=serrano
[email protected]@ -211,7 +137,7 @@
[email protected]@ -214,7 +135,7 @@
  ham=prosciutto
  eggs=medium
  bread=toasted
@@ -5743,7 +8723,7 @@
  .fi
  .sp
  This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
[email protected]@ -233,9 +159,9 @@
[email protected]@ -236,9 +157,9 @@
  \fBfile\fP. This lets you do something like:
  .sp
  .nf
@@ -5755,7 +8735,7 @@
  .fi
  .sp
  to include a different configuration file on each computer you use.
[email protected]@ -252,9 +178,9 @@
[email protected]@ -255,9 +176,9 @@
  placed in double quotation marks:
  .sp
  .nf
@@ -5767,7 +8747,7 @@
  .fi
  .sp
  Quotation marks can be escaped by prefixing them with a backslash. Only
[email protected]@ -278,17 +204,17 @@
[email protected]@ -281,17 +202,17 @@
  Alias definitions consist of lines of the form:
  .sp
  .nf
@@ -5789,7 +8769,7 @@
  .fi
  .sp
  creates a new command \fBlatest\fP that shows only the five most recent
[email protected]@ -295,10 +221,11 @@
[email protected]@ -298,9 +219,9 @@
  changesets. You can define subsequent aliases using earlier ones:
  .sp
  .nf
@@ -5799,11 +8779,9 @@
 -.ft P
 +.ft
  .fi
-+.RS 0
  .IP Note
  .
- It is possible to create aliases with the same names as
[email protected]@ -311,9 +238,9 @@
[email protected]@ -314,9 +235,9 @@
  run arbitrary commands. As an example,
  .sp
  .nf
@@ -5815,7 +8793,7 @@
  .fi
  .sp
  will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
[email protected]@ -320,9 +247,9 @@
[email protected]@ -323,9 +244,9 @@
  terminal. A better example might be:
  .sp
  .nf
@@ -5827,15 +8805,25 @@
  .fi
  .sp
  which will make \fBhg purge\fP delete all unknown files in the
[email protected]@ -340,6 +267,7 @@
- alias, as was done above for the purge alias. In addition,
- \fB$HG_ARGS\fP expands to the arguments given to Mercurial. In the \fBhg
- echo foo\fP call above, \fB$HG_ARGS\fP would expand to \fBecho foo\fP.
-+.RS 0
- .IP Note
- .
- Some global configuration options such as \fB\-R\fP are
[email protected]@ -375,9 +303,9 @@
[email protected]@ -354,7 +275,7 @@
+ Settings used when displaying file annotations. All values are
+ Booleans and default to False. See \fBdiff\fP section for related
+ options for the diff command.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBignorews\fP
+ .sp
[email protected]@ -367,7 +288,7 @@
+ .B \fBignoreblanklines\fP
+ .sp
+ Ignore changes whose lines are all blank.
+-.UNINDENT
++.RE
+ .SS \fBauth\fP
+ .sp
+ Authentication credentials for HTTP authentication. This section
[email protected]@ -378,9 +299,9 @@
  Each line has the following format:
  .sp
  .nf
@@ -5847,7 +8835,7 @@
  .fi
  .sp
  where \fB<name>\fP is used to group arguments into authentication
[email protected]@ -384,7 +312,7 @@
[email protected]@ -387,7 +308,7 @@
  entries. Example:
  .sp
  .nf
@@ -5856,7 +8844,7 @@
  foo.prefix = hg.intevation.org/mercurial
  foo.username = foo
  foo.password = bar
[email protected]@ -394,7 +322,7 @@
[email protected]@ -397,11 +318,11 @@
  bar.key = path/to/file.key
  bar.cert = path/to/file.cert
  bar.schemes = https
@@ -5865,7 +8853,12 @@
  .fi
  .sp
  Supported arguments:
[email protected]@ -405,7 +333,7 @@
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBprefix\fP
+ .sp
[email protected]@ -408,7 +329,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
@@ -5874,7 +8867,7 @@
  against the URI with its scheme stripped as well, and the schemes
  argument, q.v., is then subsequently consulted.
  .TP
[email protected]@ -437,7 +365,7 @@
[email protected]@ -440,11 +361,11 @@
  .B \fBschemes\fP
  .sp
  Optional. Space separated list of URI schemes to use this
@@ -5883,7 +8876,12 @@
  a scheme. Supported schemes are http and https. They will match
  static\-http and static\-https respectively, as well.
  Default: https.
[email protected]@ -467,7 +395,7 @@
+-.UNINDENT
++.RE
+ .sp
+ If no suitable authentication entry is found, the user is prompted
+ for credentials as usual if required by the remote.
[email protected]@ -