--- a/components/mercurial/Makefile	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/Makefile	Fri Apr 21 10:43:44 2017 -0700
@@ -28,16 +28,16 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	3.7.3
-COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
+COMPONENT_VERSION=	4.1.3
+COMPONENT_PROJECT_URL=	http://mercurial-scm.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30
-COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
+    sha256:103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8
+COMPONENT_ARCHIVE_URL=	https://www.mercurial-scm.org/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
-TPNO=			27571
+TPNO=			34883
 
 # Mercurial does not yet support Python 3.
 PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
@@ -60,6 +60,7 @@
 TEST_BLACKLIST = \
 	test-check-code.t \
 	test-check-config.t \
+	test-devel-warnings.t \
 	test-hghave.t \
 	test-module-imports.t \
 	test-run-tests.t
@@ -90,7 +91,7 @@
 # Only build this target if it doesn't already exist, since this recipe is just
 # for the component maintainer's benefit.
 patches/manpages.patch: $(SOURCE_DIR)/.unpacked \
-    $(SOURCE_DIR)/.patched-rst.patch $(SOURCE_DIR)/.patched-hgmanpage.patch
+    $(SOURCE_DIR)/.rst.patched $(SOURCE_DIR)/.hgmanpage.patched
 	if [[ -f [email protected] ]]; then exit 0; fi; \
 	if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \
 		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
@@ -107,12 +108,12 @@
 		done > [email protected]; \
 	fi || true
 
-# common targets
-build:		$(BUILD_32)
+# Build and install 64-bit first, so that the 32-bit hg is what's installed.
+build:		$(BUILD_64) $(BUILD_32)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64) $(INSTALL_32)
 
-test:		install $(TEST_32)
+test:		install $(TEST_64) $(TEST_32)
 
 
 REQUIRED_PACKAGES += runtime/python-27

--- a/components/mercurial/mercurial-GENFRAG.p5m	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Fri Apr 21 10:43:44 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -34,11 +34,19 @@
 # And we don't create .pyc files for demo files.
 <transform file path=usr/demo/mercurial/.*\.py$ -> default pkg.tmp.autopyc false>
 #
-dir  path=usr
-dir  path=usr/demo
-dir  path=usr/demo/mercurial
 file path=usr/demo/mercurial/bash_completion
+file path=usr/demo/mercurial/bdiff-torture.py
 file path=usr/demo/mercurial/casesmash.py
+file path=usr/demo/mercurial/chg/Makefile
+file path=usr/demo/mercurial/chg/README
+file path=usr/demo/mercurial/chg/chg.1
+file path=usr/demo/mercurial/chg/chg.c
+file path=usr/demo/mercurial/chg/hgclient.c
+file path=usr/demo/mercurial/chg/hgclient.h
+file path=usr/demo/mercurial/chg/procutil.c
+file path=usr/demo/mercurial/chg/procutil.h
+file path=usr/demo/mercurial/chg/util.c
+file path=usr/demo/mercurial/chg/util.h
 file path=usr/demo/mercurial/debugcmdserver.py mode=555
 file path=usr/demo/mercurial/debugshell.py
 file path=usr/demo/mercurial/dirstatenonnormalcheck.py
@@ -47,7 +55,6 @@
 file path=usr/demo/mercurial/hg-ssh mode=555
 file path=usr/demo/mercurial/hgclient.py
 file path=usr/demo/mercurial/hgk mode=555
-dir  path=usr/demo/mercurial/hgsh
 file path=usr/demo/mercurial/hgsh/Makefile
 file path=usr/demo/mercurial/hgsh/hgsh.c
 file path=usr/demo/mercurial/hgweb.fcgi mode=555
@@ -65,7 +72,6 @@
 file path=usr/demo/mercurial/tcsh_completion
 file path=usr/demo/mercurial/tcsh_completion_build.sh mode=555
 file path=usr/demo/mercurial/undumprevlog mode=555
-dir  path=usr/demo/mercurial/vim
 file path=usr/demo/mercurial/vim/HGAnnotate.vim
 file path=usr/demo/mercurial/vim/hg-menu.vim
 file path=usr/demo/mercurial/vim/hgcommand.vim
@@ -73,13 +79,9 @@
 file path=usr/demo/mercurial/vim/patchreview.txt
 file path=usr/demo/mercurial/vim/patchreview.vim
 file path=usr/demo/mercurial/xml.rnc
-file path=usr/demo/mercurial/zsh_completion
-dir  path=usr/share
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
-#
 file hg.1 path=usr/share/man/man1/hg.1
-dir  path=usr/share/man/man5
 file hgignore.5 path=usr/share/man/man5/hgignore.5
 file hgrc.5 path=usr/share/man/man5/hgrc.5
+file contrib/zsh_completion path=usr/share/zsh/vendor-functions/Completion/_hg
+#
 license mercurial.copyright license=GPLv2+

--- a/components/mercurial/mercurial-PYVER.p5m	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/mercurial-PYVER.p5m	Fri Apr 21 10:43:44 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -46,10 +46,10 @@
 dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/acl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/automv.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/bugzilla.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/censor.py
-file path=usr/lib/python$(PYVER)/vendor-packages/hgext/chgserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/clonebundles.py
@@ -74,14 +74,25 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/extdiff.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/factotum.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fetch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/64/bser.so
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/bser.so
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/capabilities.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/encoding.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/load.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/pybser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/state.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/watchmanclient.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/gpg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/graphlog.py
-file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgcia.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgk.py
 dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/highlight.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/histedit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/journal.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/keyword.py
 dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/__init__.py
@@ -93,8 +104,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/proto.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/remotestore.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/reposetup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/storefactory.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/uisetup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/wirestore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/logtoprocess.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/mq.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/notify.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/pager.py
@@ -113,9 +126,19 @@
 dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/Zeroconf.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/__init__.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/hgext3rd/
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext3rd/__init__.py
 dir  path=usr/lib/python$(PYVER)/vendor-packages/mercurial
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/base85.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/bdiff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/diffhelpers.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/mpatch.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/osutil.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/parsers.so
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/64/zstd.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__modulepolicy__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__version__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ancestor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/archival.py
@@ -128,7 +151,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/byterange.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changegroup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/changelog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/chgserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cmdutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/color.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commands.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/commandserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/config.py
@@ -137,11 +162,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/crecord.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagparser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/debugcommands.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/default.d/mergetools.rc
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/destutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstateguard.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/discovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dispatch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dummycert.pem
@@ -166,6 +193,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/extensions.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/filesets.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/glossary.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg-ssh.8.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg.1.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.5.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.txt
@@ -173,13 +201,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgweb.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/bundles.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/changegroups.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/requirements.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/revlogs.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/wireprotocol.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/merge-tools.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/multirevs.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/patterns.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/phases.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revisions.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revsets.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/scripting.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/subrepos.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/templates.txt
@@ -200,7 +228,6 @@
 dir  path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/_readers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/socketutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpconnection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httppeer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/i18n.py
@@ -251,6 +278,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/match.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mdiff.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/merge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mergeutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minirst.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mpatch.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/namespaces.py
@@ -263,11 +291,20 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pathutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/peer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/phases.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/policy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/posix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/profiling.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/progress.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/base85.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/bdiff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/diffhelpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/mpatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/osutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pure/parsers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pushkey.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pvec.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/py3kcompat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pycompat.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/registrar.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repair.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repoview.py
@@ -276,17 +313,19 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmposix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmwindows.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/setdiscovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/similar.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py \
-    pkg.depend.bypass-generate=.*
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshpeer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sslutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statichttprepo.py
+# pkgdepend complains about a "__main__" import: bug 15710704
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statprof.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/store.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/streamclone.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/strutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/subrepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tagmerge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tags.py
@@ -470,10 +509,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/windows.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireproto.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/zstd.so
 #
 license mercurial.copyright.excanvas license="Apache v2.0"
-license mercurial.copyright.google license="BSD 3-Clause"
+license mercurial.copyright.google license="BSD 3-Clause (httpclient)"
+license mercurial.copyright.zstd license="BSD 3-Clause (zstd)"
 license mercurial.copyright license=GPLv2+
+license mercurial.copyright.statprof license=LGPLv2.1
 
 # force a dependency on the mercurial package
 depend type=optional \

--- a/components/mercurial/mercurial.copyright	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/mercurial.copyright	Fri Apr 21 10:43:44 2017 -0700
@@ -55,7 +55,7 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,63 +278,3 @@
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

--- a/components/mercurial/mercurial.copyright.excanvas	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/mercurial.copyright.excanvas	Fri Apr 21 10:43:44 2017 -0700
@@ -1,31 +1,3 @@
-Copyright 2006 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-You may not use the identified files except in compliance with the Apache
-License, Version 2.0 (the "License.")
-
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also
-reproduced below.
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and limitations
-under the License.
-
                               Apache License
                         Version 2.0, January 2004
                      http://www.apache.org/licenses/
@@ -202,28 +174,3 @@
    of your accepting any such warranty or additional liability.
 
 END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial.copyright.statprof	Fri Apr 21 10:43:44 2017 -0700
@@ -0,0 +1,459 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial.copyright.zstd	Fri Apr 21 10:43:44 2017 -0700
@@ -0,0 +1,141 @@
+== contrib/python-zstandard ====================================================
+Copyright (c) 2016, Gregory Szorc
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+== contrib/python-zstandard/zstd, hgext/fsmonitor/pywatchman ===================
+Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+== contrib/python-zstandard/zstd ===============================================
+Additional Grant of Patent Rights Version 2
+
+"Software" means the Zstandard software distributed by Facebook, Inc.
+
+Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
+("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
+(subject to the termination provision below) license under any Necessary
+Claims, to make, have made, use, sell, offer to sell, import, and otherwise
+transfer the Software. For avoidance of doubt, no license is granted under
+Facebook's rights in any patent claims that are infringed by (i) modifications
+to the Software made by you or any third party or (ii) the Software in
+combination with any software or other technology.
+
+The license granted hereunder will terminate, automatically and without notice,
+if you (or any of your subsidiaries, corporate affiliates or agents) initiate
+directly or indirectly, or take a direct financial interest in, any Patent
+Assertion: (i) against Facebook or any of its subsidiaries or corporate
+affiliates, (ii) against any party if such Patent Assertion arises in whole or
+in part from any software, technology, product or service of Facebook or any of
+its subsidiaries or corporate affiliates, or (iii) against any party relating
+to the Software. Notwithstanding the foregoing, if Facebook or any of its
+subsidiaries or corporate affiliates files a lawsuit alleging patent
+infringement against you in the first instance, and you respond by filing a
+patent infringement counterclaim in that lawsuit against that party that is
+unrelated to the Software, the license granted hereunder will not terminate
+under section (i) of this paragraph due to such counterclaim.
+
+A "Necessary Claim" is a claim of a patent owned by Facebook that is
+necessarily infringed by the Software standing alone.
+
+A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
+or contributory infringement or inducement to infringe any patent, including a
+cross-claim or counterclaim.
+
+== contrib/python-zstandard/zstd/common ========================================
+Copyright (C) 2013-2016, Yann Collet.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+== contrib/python-zstandard/zstd/dictBuilder ===================================
+Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/64bit-crash.patch	Fri Apr 21 10:43:44 2017 -0700
@@ -0,0 +1,31 @@
+A 64-bit build results in a segfault in the parsers module (on both SPARC
+and x86).  Dialing down the optimization to -xO1 eliminates the crash.
+
+In order to only lower the optimization for the one object that needs it
+and only in a 64-bit build, we do some monkeypatching of the distutils
+compiler class, and replace its _compile() method with one that does that
+check and replaces the original optimization level with the lower one.
+
+This patch can be removed when we move to Studio 12.5.
+
+--- a/setup.py	2017-02-01 08:18:58.000000000 -0800
++++ b/setup.py	2017-02-03 18:13:20.479471297 -0800
[email protected]@ -302,7 +302,18 @@
+ 
+         return build_ext.build_extensions(self)
+ 
++    def my_compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
++        if src == "mercurial/parsers.c" and "-m64" in self.compiler.compiler_so:
++            for i, arg in enumerate(self.compiler.compiler_so):
++                if arg.startswith("-xO"):
++                    break
++            self.compiler.compiler_so[i] = "-xO1"
++        self.compiler.old_compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
++
+     def build_extension(self, ext):
++        if not hasattr(self.compiler, "old_compile"):
++            self.compiler.old_compile = self.compiler._compile
++            self.compiler._compile = self.my_compile
+         try:
+             build_ext.build_extension(self, ext)
+         except CCompilerError:

--- a/components/mercurial/patches/demandimport.patch	Wed Apr 19 03:24:59 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-Mercurial's demandload system is incompatible with sqlalchemy.
-
-This was reported upstream as
-
-    https://bz.mercurial-scm.org/show_bug.cgi?id=5085
-
-and is available in the upstream repository in changesets c25e3fd38ff1 and
-9ff7261cc0f5.
-
-diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
---- a/mercurial/demandimport.py
-+++ b/mercurial/demandimport.py
[email protected]@ -174,7 +174,12 @@ def _demandimport(name, globals=None, lo
-             """
-             symbol = getattr(mod, attr, nothing)
-             if symbol is nothing:
--                symbol = _demandmod(attr, mod.__dict__, locals, level=1)
-+                mn = '%s.%s' % (mod.__name__, attr)
-+                if mn in ignore:
-+                    importfunc = _origimport
-+                else:
-+                    importfunc = _demandmod
-+                symbol = importfunc(attr, mod.__dict__, locals, level=1)
-                 setattr(mod, attr, symbol)
- 
-             # Record the importing module references this symbol so we can
[email protected]@ -250,6 +255,7 @@ ignore = [
-     '_sre', # issue4920
-     'rfc822',
-     'mimetools',
-+    'sqlalchemy.events', # has import-time side effects (issue5085)
-     # setuptools 8 expects this module to explode early when not on windows
-     'distutils.msvc9compiler'
-     ]

--- a/components/mercurial/patches/hgmanpage.patch	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/patches/hgmanpage.patch	Fri Apr 21 10:43:44 2017 -0700
@@ -21,9 +21,9 @@
 (found in rst.patch) with the patched hgmanpage.py, and updates the
 manpage.patch file.
 
---- mercurial-2.7/doc/hgmanpage.py	Thu Aug  1 20:37:39 2013
-+++ mercurial-2.7/doc/hgmanpage.py	Mon Aug 19 14:40:04 2013
[email protected]@ -197,6 +197,7 @@
+--- mercurial.hg/doc/hgmanpage.py	2016-10-09 20:00:17.207404849 -0700
++++ mercurial.hg/doc/hgmanpage.py	2016-10-10 10:04:03.695820057 -0700
[email protected]@ -202,6 +202,7 @@
          self._in_docinfo = None
          self._active_table = None
          self._in_literal = False
@@ -31,7 +31,7 @@
          self.header_written = 0
          self._line_block = 0
          self.authors = []
[email protected]@ -212,15 +213,15 @@
[email protected]@ -217,15 +218,15 @@
          # ``B`` bold, ``I`` italic, ``R`` roman should be available.
          # Hopefully ``C`` courier too.
          self.defs = {
@@ -50,7 +50,7 @@
                  'emphasis': ('\\fI', '\\fP'),
                  'strong' : ('\\fB', '\\fP'),
                  'term' : ('\n.B ', '\n'),
[email protected]@ -267,6 +268,7 @@
[email protected]@ -272,6 +273,7 @@
                      self.body[i - 2][:4] == '.TP\n'):
                      self.body[i] = '.\n'
                  elif (self.body[i - 1] == '\n' and
@@ -58,15 +58,15 @@
                      self.body[i - 2][0] != '.' and
                      (self.body[i - 3][:7] == '.TP\n.B '
                          or self.body[i - 3][:4] == '\n.B ')
[email protected]@ -284,7 +286,6 @@
[email protected]@ -289,7 +291,6 @@
          text = text.replace('\\','\\e')
          replace_pairs = [
-             (u'-', ur'\-'),
--            (u'\'', ur'\(aq'),
-             (u'´', ur'\''),
-             (u'`', ur'\(ga'),
+             (u'-', u'\\-'),
+-            (u"'", u'\\(aq'),
+             (u'´', u"\\'"),
+             (u'`', u'\\(ga'),
              ]
[email protected]@ -297,6 +298,15 @@
[email protected]@ -302,6 +303,15 @@
              if text[0] == '.':
                  text = '\\&' + text
              text = text.replace('\n.', '\n\\&.')
@@ -82,7 +82,7 @@
          self.body.append(text)
  
      def depart_Text(self, node):
[email protected]@ -381,7 +391,6 @@
[email protected]@ -386,7 +396,6 @@
          if self.header_written:
              return
          self.body.append(self.header())
@@ -90,7 +90,7 @@
          self.header_written = 1
  
      def visit_address(self, node):
[email protected]@ -795,8 +804,10 @@
[email protected]@ -800,8 +809,10 @@
  
      def visit_literal(self, node):
          self.body.append(self.defs['literal'][0])

--- a/components/mercurial/patches/manpages.patch	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/patches/manpages.patch	Fri Apr 21 10:43:44 2017 -0700
@@ -7,8 +7,8 @@
 
 These changes are Solaris-specific and not appropriate for upstream.
 
---- mercurial-3.7.3/doc/hg.1	Tue Mar 29 09:54:51 2016
-+++ mercurial-3.7.3/doc/hg.1	Tue Mar 29 10:26:31 2016
+--- mercurial-4.1/doc/hg.1	2017-02-01 08:19:54.000000000 -0800
++++ mercurial-4.1/doc/hg.1	2017-02-03 11:20:06.570123444 -0800
 @@ -3,33 +3,6 @@
  .TH HG 1 "" "" "Mercurial Manual"
  .SH NAME
@@ -650,8 +650,8 @@
 -.UNINDENT
 +.RE
  .sp
--See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
-+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.
+-See \%\fBhg help revisions.bisect\fP\: for more about the \fIbisect()\fP predicate.
++See \fBhg help revisions.bisect\fP for more about the \fIbisect()\fP predicate.
  .sp
  Returns 0 on success.
  .sp
@@ -1062,7 +1062,7 @@
  .nf
 -.ft C
 +.ft
- hg clone http://selenic.com/hg
+ hg clone https://www.mercurial\-scm.org/repo/hg/
 -.ft P
 +.ft
  .fi
@@ -1122,7 +1122,7 @@
  .nf
 -.ft C
 +.ft
- hg clone http://selenic.com/hg#stable
+ hg clone https://www.mercurial\-scm.org/repo/hg/#stable
 -.ft P
 +.ft
  .fi
@@ -1297,8 +1297,8 @@
  .TP
  .B \-u,  \-\-untrusted
  .
[email protected]@ -1574,15 +1547,15 @@
- edit global config
[email protected]@ -1578,15 +1551,15 @@
+ display with template (EXPERIMENTAL)
  .sp
  aliases: showconfig debugconfig
 -.UNINDENT
@@ -1316,7 +1316,7 @@
  .fi
  .sp
  Mark dest as having copies of source files. If dest is a
[email protected]@ -1594,12 +1567,12 @@
[email protected]@ -1598,12 +1571,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect with the next commit. To undo a copy
@@ -1331,7 +1331,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -1620,23 +1593,23 @@
[email protected]@ -1624,23 +1597,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1362,7 +1362,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files.
[email protected]@ -1644,8 +1617,8 @@
[email protected]@ -1648,8 +1621,8 @@
  Differences between files are shown using the unified diff format.
  .IP Note
  .
@@ -1373,7 +1373,7 @@
  parent changeset if no revisions are specified.
  .RE
  .sp
[email protected]@ -1663,18 +1636,18 @@
[email protected]@ -1667,18 +1640,18 @@
  anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1396,7 +1396,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1681,9 +1654,9 @@
[email protected]@ -1685,9 +1658,9 @@
  compare two historical versions of a directory, with rename info:
  .sp
  .nf
@@ -1408,7 +1408,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1690,9 +1663,9 @@
[email protected]@ -1694,9 +1667,9 @@
  get change stats relative to the last change on some date:
  .sp
  .nf
@@ -1421,7 +1421,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1699,9 +1672,9 @@
[email protected]@ -1703,9 +1676,9 @@
  diff all newly\-added files that contain a keyword:
  .sp
  .nf
@@ -1433,7 +1433,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1708,18 +1681,18 @@
[email protected]@ -1712,18 +1685,18 @@
  compare a revision and its parents:
  .sp
  .nf
@@ -1456,7 +1456,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -1788,7 +1761,7 @@
[email protected]@ -1792,7 +1765,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1465,7 +1465,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS export
[email protected]@ -1796,9 +1769,9 @@
[email protected]@ -1800,9 +1773,9 @@
  dump the header and diffs for one or more changesets:
  .sp
  .nf
@@ -1477,7 +1477,7 @@
  .fi
  .sp
  Print the changeset header and diffs for one or more revisions.
[email protected]@ -1809,7 +1782,7 @@
[email protected]@ -1813,7 +1786,7 @@
  comment.
  .IP Note
  .
@@ -1486,7 +1486,7 @@
  changesets, as it will compare the merge changeset against its
  first parent only.
  .RE
[email protected]@ -1816,7 +1789,7 @@
[email protected]@ -1820,7 +1793,7 @@
  .sp
  Output may be to a file, in which case the name of the file is
  given using a format string. The formatting rules are as follows:
@@ -1495,7 +1495,7 @@
  .TP
  .B \fB%%\fP
  .sp
[email protected]@ -1853,7 +1826,7 @@
[email protected]@ -1857,7 +1830,7 @@
  .B \fB%r\fP
  .sp
  zero\-padded changeset revision number
@@ -1504,7 +1504,7 @@
  .sp
  Without the \-a/\-\-text option, export will avoid generating diffs
  of files it detects as binary. With \-a, export will generate a
[email protected]@ -1860,13 +1833,13 @@
[email protected]@ -1864,13 +1837,13 @@
  diff anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1520,7 +1520,7 @@
  .IP \(bu 2
  .
  use export and import to transplant a bugfix to the current
[email protected]@ -1873,9 +1846,9 @@
[email protected]@ -1877,9 +1850,9 @@
  branch:
  .sp
  .nf
@@ -1532,7 +1532,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1883,9 +1856,9 @@
[email protected]@ -1887,9 +1860,9 @@
  rename information:
  .sp
  .nf
@@ -1544,7 +1544,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1893,16 +1866,16 @@
[email protected]@ -1897,16 +1870,16 @@
  descriptive names:
  .sp
  .nf
@@ -1565,7 +1565,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
[email protected]@ -1927,7 +1900,7 @@
[email protected]@ -1931,7 +1904,7 @@
  .B \-\-nodates
  .
  omit dates from diff headers
@@ -1574,20 +1574,20 @@
  .sp
  [+] marked option can be specified multiple times
  .SS files
[email protected]@ -1935,9 +1908,9 @@
[email protected]@ -1939,9 +1912,9 @@
  list tracked files:
  .sp
  .nf
 -.ft C
 +.ft
- hg files [OPTION]... [PATTERN]...
+ hg files [OPTION]... [FILE]...
 -.ft P
 +.ft
  .fi
  .sp
  Print files under Mercurial control in the working directory or
[email protected]@ -1948,15 +1921,15 @@
- of all files under Mercurial control in the working directory.
[email protected]@ -1952,15 +1925,15 @@
+ of all files under Mercurial control.
  .sp
  Examples:
 -.INDENT 0.0
@@ -1605,7 +1605,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1963,9 +1936,9 @@
[email protected]@ -1967,9 +1940,9 @@
  shows sizes and flags for current revision:
  .sp
  .nf
@@ -1617,7 +1617,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1972,9 +1945,9 @@
[email protected]@ -1976,9 +1949,9 @@
  list all files named README:
  .sp
  .nf
@@ -1629,7 +1629,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1981,9 +1954,9 @@
[email protected]@ -1985,9 +1958,9 @@
  list all binary files:
  .sp
  .nf
@@ -1641,7 +1641,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1990,9 +1963,9 @@
[email protected]@ -1994,9 +1967,9 @@
  find files containing a regular expression:
  .sp
  .nf
@@ -1654,7 +1654,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -1999,19 +1972,19 @@
[email protected]@ -2003,19 +1976,19 @@
  search tracked file contents with xargs and grep:
  .sp
  .nf
@@ -1679,7 +1679,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2036,7 +2009,7 @@
[email protected]@ -2040,7 +2013,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1688,7 +1688,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS forget
[email protected]@ -2044,9 +2017,9 @@
[email protected]@ -2048,9 +2021,9 @@
  forget the specified files on the next commit:
  .sp
  .nf
@@ -1700,7 +1700,7 @@
  .fi
  .sp
  Mark the specified files so they will no longer be tracked
[email protected]@ -2056,20 +2029,20 @@
[email protected]@ -2060,20 +2033,20 @@
  entire project history, and it does not delete them from the
  working directory.
  .sp
@@ -1726,7 +1726,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2076,16 +2049,16 @@
[email protected]@ -2080,16 +2053,16 @@
  forget files that would be excluded by .hgignore:
  .sp
  .nf
@@ -1747,7 +1747,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -2094,7 +2067,7 @@
[email protected]@ -2098,7 +2071,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1756,7 +1756,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS graft
[email protected]@ -2102,15 +2075,15 @@
[email protected]@ -2106,15 +2079,15 @@
  copy changes from other branches onto the current branch:
  .sp
  .nf
@@ -1777,7 +1777,7 @@
  description from the source changesets.
  .sp
  Changesets that are ancestors of the current revision, that have
[email protected]@ -2120,9 +2093,9 @@
[email protected]@ -2124,9 +2097,9 @@
  of the form:
  .sp
  .nf
@@ -1789,7 +1789,7 @@
  .fi
  .sp
  If \-\-force is specified, revisions will be grafted even if they
[email protected]@ -2140,16 +2113,16 @@
[email protected]@ -2144,16 +2117,16 @@
  .RE
  .sp
  Examples:
@@ -1809,7 +1809,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2156,9 +2129,9 @@
[email protected]@ -2160,9 +2133,9 @@
  graft a range of changesets with one exception, updating dates:
  .sp
  .nf
@@ -1821,7 +1821,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2165,9 +2138,9 @@
[email protected]@ -2169,9 +2142,9 @@
  continue a graft after resolving conflicts:
  .sp
  .nf
@@ -1833,7 +1833,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2174,9 +2147,9 @@
[email protected]@ -2178,9 +2151,9 @@
  show the source of a grafted changeset:
  .sp
  .nf
@@ -1845,23 +1845,21 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2183,19 +2156,19 @@
[email protected]@ -2187,18 +2160,18 @@
  show revisions sorted by date:
  .sp
  .nf
 -.ft C
--hg log \-r \(aqsort(all(), date)\(aq
--.ft P
-+.ft
-+hg log \-r 'sort(all(), date)'
-+.ft
- .fi
--.UNINDENT
-+.RE
- .sp
--See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
-+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
- specifying revisions.
++.ft
+ hg log \-r "sort(all(), date)"
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+-See \%\fBhg help revisions\fP\: for more about specifying revisions.
++See \fBhg help revisions\fP for more about specifying revisions.
  .sp
  Returns 0 on successful completion.
  .sp
@@ -1871,7 +1869,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -2240,7 +2213,7 @@
[email protected]@ -2243,7 +2216,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1880,8 +1878,8 @@
  .sp
  [+] marked option can be specified multiple times
  .SS grep
[email protected]@ -2248,9 +2221,9 @@
- search for a pattern in specified files and revisions:
[email protected]@ -2251,9 +2224,9 @@
+ search revision history for a pattern in specified files:
  .sp
  .nf
 -.ft C
@@ -1891,8 +1889,17 @@
 +.ft
  .fi
  .sp
- Search revisions of files for a regular expression.
[email protected]@ -2269,7 +2242,7 @@
+ Search revision history for a regular expression in the specified
[email protected]@ -2268,14 +2241,14 @@
+ PATTERN can be any Python (roughly Perl\-compatible) regular
+ expression.
+ .sp
+-If no FILEs are specified (and \-f/\-\-follow isn\(aqt set), all files in
+-the repository are searched, including those that don\(aqt exist in the
++If no FILEs are specified (and \-f/\-\-follow isn't set), all files in
++the repository are searched, including those that don't exist in the
+ current branch or have been deleted in a prior changeset.
+ .sp
  Returns 0 if a match is found, 1 otherwise.
  .sp
  Options:
@@ -1901,7 +1908,7 @@
  .TP
  .B \-0,  \-\-print0
  .
[email protected]@ -2318,7 +2291,7 @@
[email protected]@ -2328,7 +2301,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1910,7 +1917,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS heads
[email protected]@ -2326,9 +2299,9 @@
[email protected]@ -2336,9 +2309,9 @@
  show branch heads:
  .sp
  .nf
@@ -1922,7 +1929,7 @@
  .fi
  .sp
  With no arguments, show all open branch heads in the repository.
[email protected]@ -2338,11 +2311,11 @@
[email protected]@ -2348,11 +2321,11 @@
  .sp
  If one or more REVs are given, only open branch heads on the
  branches associated with the specified changesets are shown. This
@@ -1936,7 +1943,7 @@
  .sp
  If STARTREV is specified, only those heads that are descendants of
  STARTREV will be displayed.
[email protected]@ -2353,7 +2326,7 @@
[email protected]@ -2363,7 +2336,7 @@
  Returns 0 if matching heads are found, 1 if not.
  .sp
  Options:
@@ -1945,7 +1952,7 @@
  .TP
  .BI \-r,  \-\-rev \ <STARTREV>
  .
[email protected]@ -2378,15 +2351,15 @@
[email protected]@ -2388,15 +2361,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -1964,7 +1971,7 @@
  .fi
  .sp
  With no arguments, print a list of commands with short help messages.
[email protected]@ -2397,7 +2370,7 @@
[email protected]@ -2407,7 +2380,7 @@
  Returns 0 if successful.
  .sp
  Options:
@@ -1973,7 +1980,7 @@
  .TP
  .B \-e,  \-\-extension
  .
[email protected]@ -2414,7 +2387,7 @@
[email protected]@ -2424,7 +2397,7 @@
  .BI \-s,  \-\-system \ <VALUE[+]>
  .
  show help for specific platform(s)
@@ -1982,7 +1989,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS identify
[email protected]@ -2422,9 +2395,9 @@
[email protected]@ -2432,9 +2405,9 @@
  identify the working directory or specified revision:
  .sp
  .nf
@@ -1994,7 +2001,7 @@
  .fi
  .sp
  Print a summary identifying the repository state at REV using one or
[email protected]@ -2439,15 +2412,15 @@
[email protected]@ -2449,15 +2422,15 @@
  cause lookup to operate on that repository/bundle.
  .sp
  Examples:
@@ -2013,7 +2020,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2454,9 +2427,9 @@
[email protected]@ -2464,9 +2437,9 @@
  find the revision corresponding to a tag:
  .sp
  .nf
@@ -2025,13 +2032,13 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2463,19 +2436,19 @@
[email protected]@ -2473,19 +2446,19 @@
  check the most recent revision of a remote repository:
  .sp
  .nf
 -.ft C
 +.ft
- hg id \-r tip http://selenic.com/hg/
+ hg id \-r tip https://www.mercurial\-scm.org/repo/hg/
 -.ft P
 +.ft
  .fi
@@ -2050,7 +2057,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2514,15 +2487,15 @@
[email protected]@ -2524,15 +2497,15 @@
  do not verify server certificate (ignoring web.cacerts config)
  .sp
  aliases: id
@@ -2069,7 +2076,7 @@
  .fi
  .sp
  Import a list of patches and commit them individually (unless
[email protected]@ -2547,7 +2520,7 @@
[email protected]@ -2557,7 +2530,7 @@
  text/plain body parts before first diff are added to the commit
  message.
  .sp
@@ -2078,7 +2085,13 @@
  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]@ -2561,37 +2534,37 @@
[email protected]@ -2567,42 +2540,42 @@
+ resulting changeset has a different ID than the one recorded in
+ the patch. This will guard against various ways that portable
+ patch formats and mail systems might fail to transfer Mercurial
+-data or metadata. See \%\fBhg bundle\fP\: for lossless transmission.
++data or metadata. See \fBhg bundle\fP for lossless transmission.
+ .sp
  Use \-\-partial to ensure a changeset will be created from the patch
  even if some hunks fail to apply. Hunks that fail to apply will be
  written to a <target\-file>.rej file. Conflicts can then be resolved
@@ -2124,19 +2137,19 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2598,9 +2571,9 @@
[email protected]@ -2609,9 +2582,9 @@
  import a changeset from an hgweb server:
  .sp
  .nf
 -.ft C
 +.ft
- hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
--.ft P
-+.ft
- .fi
- .IP \(bu 2
- .
[email protected]@ -2607,9 +2580,9 @@
+ hg import https://www.mercurial\-scm.org/repo/hg/rev/5ca8c111e9aa
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -2618,9 +2591,9 @@
  import all the patches in an Unix\-style mbox:
  .sp
  .nf
@@ -2148,7 +2161,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2617,35 +2590,35 @@
[email protected]@ -2628,35 +2601,35 @@
  possible):
  .sp
  .nf
@@ -2196,7 +2209,7 @@
  .TP
  .BI \-p,  \-\-strip \ <NUM>
  .
[email protected]@ -2665,7 +2638,7 @@
[email protected]@ -2676,7 +2649,7 @@
  .TP
  .B \-\-no\-commit
  .
@@ -2205,7 +2218,7 @@
  .TP
  .B \-\-bypass
  .
[email protected]@ -2708,15 +2681,15 @@
[email protected]@ -2719,15 +2692,15 @@
  guess renamed files by similarity (0<=s<=100)
  .sp
  aliases: patch
@@ -2224,7 +2237,7 @@
  .fi
  .sp
  Show new changesets found in the specified path/URL or the default
[email protected]@ -2730,17 +2703,17 @@
[email protected]@ -2741,17 +2714,17 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -2245,7 +2258,7 @@
  .TP
  .B \fBadded\fP
  .sp
[email protected]@ -2757,7 +2730,7 @@
[email protected]@ -2768,7 +2741,7 @@
  .B \fBchanged\fP
  .sp
  result depends on remote changesets
@@ -2254,7 +2267,7 @@
  .sp
  From the point of view of pulling behavior, bookmark
  existing only in the remote repository are treated as \fBadded\fP,
[email protected]@ -2767,15 +2740,15 @@
[email protected]@ -2778,15 +2751,15 @@
  changesets twice if the incoming is followed by a pull.
  .sp
  Examples:
@@ -2273,7 +2286,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2782,10 +2755,10 @@
[email protected]@ -2793,10 +2766,10 @@
  show incoming changes excluding merges, store a bundle:
  .sp
  .nf
@@ -2286,7 +2299,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -2792,16 +2765,16 @@
[email protected]@ -2803,16 +2776,16 @@
  briefly list changes inside a bundle:
  .sp
  .nf
@@ -2307,7 +2320,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -2874,23 +2847,23 @@
[email protected]@ -2885,23 +2858,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2338,7 +2351,7 @@
  .fi
  .sp
  Initialize a new repository in the given directory. If the given
[email protected]@ -2899,12 +2872,12 @@
[email protected]@ -2910,12 +2883,12 @@
  If no directory is given, the current directory is used.
  .sp
  It is possible to specify an \fBssh://\fP URL as the destination.
@@ -2353,7 +2366,7 @@
  .TP
  .BI \-e,  \-\-ssh \ <CMD>
  .
[email protected]@ -2917,15 +2890,15 @@
[email protected]@ -2928,15 +2901,15 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2372,7 +2385,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory whose
[email protected]@ -2943,12 +2916,12 @@
[email protected]@ -2954,12 +2927,12 @@
  will avoid the problem of "xargs" treating single filenames that
  contain whitespace as multiple filenames.
  .sp
@@ -2387,7 +2400,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -2969,7 +2942,7 @@
[email protected]@ -2980,7 +2953,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2396,7 +2409,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS log
[email protected]@ -2977,9 +2950,9 @@
[email protected]@ -2988,9 +2961,9 @@
  show revision history of entire repository or files:
  .sp
  .nf
@@ -2408,7 +2421,7 @@
  .fi
  .sp
  Print the revision history of the specified files or the entire
[email protected]@ -3001,12 +2974,12 @@
[email protected]@ -3012,12 +2985,12 @@
  .sp
  With \-\-graph the revisions are shown as an ASCII art DAG with the most
  recent changeset at the top.
@@ -2425,7 +2438,7 @@
  changesets, as it will only compare the merge changeset against
  its first parent. Also, only files different from BOTH parents
  will appear in files:.
[email protected]@ -3013,21 +2986,21 @@
[email protected]@ -3024,21 +2997,21 @@
  .RE
  .IP Note
  .
@@ -2451,7 +2464,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3034,9 +3007,9 @@
[email protected]@ -3045,9 +3018,9 @@
  changesets ancestral to the working directory:
  .sp
  .nf
@@ -2463,7 +2476,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3043,9 +3016,9 @@
[email protected]@ -3054,9 +3027,9 @@
  last 10 commits on the current branch:
  .sp
  .nf
@@ -2475,7 +2488,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3052,9 +3025,9 @@
[email protected]@ -3063,9 +3036,9 @@
  changesets showing all modifications of a file, including removals:
  .sp
  .nf
@@ -2487,7 +2500,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3061,9 +3034,9 @@
[email protected]@ -3072,9 +3045,9 @@
  all changesets that touch a directory, with diffs, excluding merges:
  .sp
  .nf
@@ -2499,7 +2512,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3070,9 +3043,9 @@
[email protected]@ -3081,9 +3054,9 @@
  all revision numbers that match a keyword:
  .sp
  .nf
@@ -2511,7 +2524,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3079,9 +3052,9 @@
[email protected]@ -3090,9 +3063,9 @@
  the full hash identifier of the working directory parent:
  .sp
  .nf
@@ -2523,7 +2536,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3088,9 +3061,9 @@
[email protected]@ -3099,9 +3072,9 @@
  list available log templates:
  .sp
  .nf
@@ -2535,7 +2548,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3097,9 +3070,9 @@
[email protected]@ -3108,9 +3081,9 @@
  check if a given changeset is included in a tagged release:
  .sp
  .nf
@@ -2547,7 +2560,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3106,9 +3079,9 @@
[email protected]@ -3117,9 +3090,9 @@
  find all changesets by some user in a date range:
  .sp
  .nf
@@ -2559,7 +2572,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -3115,24 +3088,24 @@
[email protected]@ -3126,24 +3099,24 @@
  summary of all changesets after the last tag:
  .sp
  .nf
@@ -2575,9 +2588,9 @@
 -See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 +See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
  .sp
--See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
-+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
- specifying and ordering revisions.
+-See \%\fBhg help revisions\fP\: for more about specifying and ordering
++See \fBhg help revisions\fP for more about specifying and ordering
+ revisions.
  .sp
 -See \%\fBhg help templates\fP\: for more about pre\-packaged styles and
 +See \fBhg help templates\fP for more about pre\-packaged styles and
@@ -2591,7 +2604,7 @@
  .TP
  .B \-f,  \-\-follow
  .
[email protected]@ -3221,23 +3194,23 @@
[email protected]@ -3232,23 +3205,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2622,7 +2635,7 @@
  .fi
  .sp
  Print a list of version controlled files for the given revision.
[email protected]@ -3253,7 +3226,7 @@
[email protected]@ -3264,7 +3237,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2631,7 +2644,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -3266,15 +3239,15 @@
[email protected]@ -3277,15 +3250,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -2650,7 +2663,7 @@
  .fi
  .sp
  The current working directory is updated with all changes made in
[email protected]@ -3287,16 +3260,16 @@
[email protected]@ -3298,16 +3271,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
@@ -2671,7 +2684,7 @@
  will check out a clean copy of the original merge parent, losing
  all changes.
  .sp
[email protected]@ -3303,7 +3276,7 @@
[email protected]@ -3314,7 +3287,7 @@
  Returns 0 on success, 1 if there are unresolved files.
  .sp
  Options:
@@ -2680,7 +2693,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3320,15 +3293,15 @@
[email protected]@ -3331,15 +3304,15 @@
  .BI \-t,  \-\-tool \ <VALUE>
  .
  specify merge tool
@@ -2699,7 +2712,7 @@
  .fi
  .sp
  Show changesets not found in the specified destination repository
[email protected]@ -3342,18 +3315,18 @@
[email protected]@ -3353,18 +3326,18 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -2721,7 +2734,7 @@
  .TP
  .B \fBadded\fP
  .sp
[email protected]@ -3374,7 +3347,7 @@
[email protected]@ -3385,7 +3358,7 @@
  .B \fBchanged\fP
  .sp
  push with \fB\-B\fP will update it
@@ -2730,7 +2743,7 @@
  .sp
  From the point of view of pushing behavior, bookmarks
  existing only in the remote repository are treated as
[email protected]@ -3383,7 +3356,7 @@
[email protected]@ -3394,7 +3367,7 @@
  Returns 0 if there are outgoing changes, 1 otherwise.
  .sp
  Options:
@@ -2739,7 +2752,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3452,26 +3425,26 @@
[email protected]@ -3463,26 +3436,26 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2774,7 +2787,7 @@
  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]@ -3480,20 +3453,20 @@
[email protected]@ -3491,20 +3464,20 @@
  This command is equivalent to:
  .sp
  .nf
@@ -2799,7 +2812,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -3506,15 +3479,15 @@
[email protected]@ -3517,15 +3490,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -2818,7 +2831,7 @@
  .fi
  .sp
  Show definition of symbolic path name NAME. If no name is given,
[email protected]@ -3537,29 +3510,29 @@
[email protected]@ -3548,29 +3521,29 @@
  .IP Note
  .
  \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
@@ -2855,7 +2868,7 @@
  .fi
  .sp
  With no argument, show the phase name of the current revision(s).
[email protected]@ -3567,21 +3540,21 @@
[email protected]@ -3578,21 +3551,21 @@
  With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
  phase value of the specified revisions.
  .sp
@@ -2882,7 +2895,7 @@
  .TP
  .B \-p,  \-\-public
  .
[email protected]@ -3602,7 +3575,7 @@
[email protected]@ -3613,7 +3586,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  target revision
@@ -2891,7 +2904,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS pull
[email protected]@ -3610,9 +3583,9 @@
[email protected]@ -3621,9 +3594,9 @@
  pull changes from the specified source:
  .sp
  .nf
@@ -2903,7 +2916,7 @@
  .fi
  .sp
  Pull changes from a remote repository to a local one.
[email protected]@ -3622,18 +3595,18 @@
[email protected]@ -3633,21 +3606,21 @@
  \-R is specified). By default, this does not update the copy of the
  project in the working directory.
  .sp
@@ -2920,6 +2933,10 @@
 +If SOURCE is omitted, the 'default' path will be used.
 +See \fBhg help urls\fP for more information.
  .sp
+ Specifying bookmark as \fB.\fP is equivalent to specifying the active
+-bookmark\(aqs name.
++bookmark's name.
+ .sp
  Returns 0 on success, 1 if an update had unresolved files.
  .sp
  Options:
@@ -2928,7 +2945,7 @@
  .TP
  .B \-u,  \-\-update
  .
[email protected]@ -3666,7 +3639,7 @@
[email protected]@ -3680,7 +3653,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2937,7 +2954,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS push
[email protected]@ -3674,9 +3647,9 @@
[email protected]@ -3688,9 +3661,9 @@
  push changes to the specified destination:
  .sp
  .nf
@@ -2949,9 +2966,12 @@
  .fi
  .sp
  Push changesets from the local repository to the specified
[email protected]@ -3707,13 +3680,13 @@
[email protected]@ -3720,15 +3693,15 @@
+ If \-B/\-\-bookmark is used, the specified bookmarked revision, its
  ancestors, and the bookmark will be pushed to the remote
- repository.
+ repository. Specifying \fB.\fP is equivalent to specifying the active
+-bookmark\(aqs name.
++bookmark's name.
  .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
@@ -2965,7 +2985,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -3746,7 +3719,7 @@
[email protected]@ -3761,7 +3734,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2974,7 +2994,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS recover
[email protected]@ -3754,9 +3727,9 @@
[email protected]@ -3769,9 +3742,9 @@
  roll back an interrupted transaction:
  .sp
  .nf
@@ -2986,7 +3006,7 @@
  .fi
  .sp
  Recover from an interrupted commit or pull.
[email protected]@ -3771,16 +3744,16 @@
[email protected]@ -3786,16 +3759,16 @@
  remove the specified files on the next commit:
  .sp
  .nf
@@ -3007,7 +3027,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]@ -3790,7 +3763,7 @@
[email protected]@ -3805,7 +3778,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 [!]
@@ -3016,7 +3036,7 @@
  (from branch) and Delete (from disk):
  .TS
  center;
[email protected]@ -3859,7 +3832,7 @@
[email protected]@ -3874,7 +3847,7 @@
  .TE
  .IP Note
  .
@@ -3025,7 +3045,7 @@
  working directory, not even if \fB\-\-force\fP is specified.
  .RE
  .sp
[email protected]@ -3866,7 +3839,7 @@
[email protected]@ -3881,7 +3854,7 @@
  Returns 0 on success, 1 if any warnings encountered.
  .sp
  Options:
@@ -3034,7 +3054,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -3887,23 +3860,23 @@
[email protected]@ -3902,23 +3875,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -3065,7 +3085,7 @@
  .fi
  .sp
  Mark dest as copies of sources; mark sources for deletion. If dest
[email protected]@ -3915,12 +3888,12 @@
[email protected]@ -3930,12 +3903,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect at the next commit. To undo a rename
@@ -3080,7 +3100,7 @@
  .TP
  .B \-A,  \-\-after
  .
[email protected]@ -3941,23 +3914,23 @@
[email protected]@ -3956,23 +3929,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -3111,7 +3131,7 @@
  .fi
  .sp
  Merges with unresolved conflicts are often the result of
[email protected]@ -3964,15 +3937,15 @@
[email protected]@ -3979,15 +3952,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
@@ -3132,7 +3152,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]@ -3981,22 +3954,22 @@
[email protected]@ -3996,22 +3969,22 @@
  contents are saved with a \fB.orig\fP suffix.
  .IP \(bu 2
  .
@@ -3160,7 +3180,7 @@
  commit after a conflicting merge.
  .RE
  .sp
[email protected]@ -4003,7 +3976,7 @@
[email protected]@ -4018,7 +3991,7 @@
  Returns 0 on success, 1 if any files fail a resolve attempt.
  .sp
  Options:
@@ -3169,7 +3189,7 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -4040,7 +4013,7 @@
[email protected]@ -4055,7 +4028,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -3178,7 +3198,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS revert
[email protected]@ -4048,15 +4021,15 @@
[email protected]@ -4063,15 +4036,15 @@
  restore files to their checkout state:
  .sp
  .nf
@@ -3198,7 +3218,7 @@
  .RE
  .sp
  With no revision specified, revert the specified files or directories
[email protected]@ -4070,21 +4043,21 @@
[email protected]@ -4085,7 +4058,7 @@
  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
@@ -3207,7 +3227,9 @@
  related method.
  .sp
  Modified files are saved with a .orig suffix before reverting.
- To disable these backups, use \-\-no\-backup.
[email protected]@ -4094,15 +4067,15 @@
+ repository by setting the \fBui.origbackuppath\fP configuration
+ option.
  .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.
@@ -3224,7 +3246,7 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -4117,7 +4090,7 @@
[email protected]@ -4135,7 +4108,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -3233,7 +3255,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS rollback
[email protected]@ -4125,12 +4098,12 @@
[email protected]@ -4143,12 +4116,12 @@
  roll back the last transaction (DANGEROUS) (DEPRECATED):
  .sp
  .nf
@@ -3249,7 +3271,7 @@
  mistakes in the last commit.
  .sp
  This command should be used with care. There is only one level of
[email protected]@ -4145,7 +4118,7 @@
[email protected]@ -4163,7 +4136,7 @@
  .sp
  For example, the following commands are transactional, and their
  effects can be rolled back:
@@ -3258,7 +3280,7 @@
  .IP \(bu 2
  .
  commit
[email protected]@ -4161,10 +4134,10 @@
[email protected]@ -4179,15 +4152,15 @@
  .IP \(bu 2
  .
  unbundle
@@ -3270,8 +3292,15 @@
 +commit transaction if it isn't checked out. Use \-\-force to
  override this protection.
  .sp
+ The rollback command can be entirely disabled by setting the
+-\fBui.rollback\fP configuration setting to false. If you\(aqre here
+-because you want to use rollback and it\(aqs disabled, you can
++\fBui.rollback\fP configuration setting to false. If you're here
++because you want to use rollback and it's disabled, you can
+ re\-enable the command by setting \fBui.rollback\fP to true.
+ .sp
  This command is not intended for use on public repositories. Once
[email protected]@ -4177,7 +4150,7 @@
[email protected]@ -4200,7 +4173,7 @@
  Returns 0 on success, 1 if no rollback data is available.
  .sp
  Options:
@@ -3280,7 +3309,7 @@
  .TP
  .B \-n,  \-\-dry\-run
  .
[email protected]@ -4186,15 +4159,15 @@
[email protected]@ -4209,15 +4182,15 @@
  .B \-f,  \-\-force
  .
  ignore safety measures
@@ -3299,7 +3328,7 @@
  .fi
  .sp
  Print the root directory of the current repository.
[email protected]@ -4205,9 +4178,9 @@
[email protected]@ -4228,9 +4201,9 @@
  start stand\-alone webserver:
  .sp
  .nf
@@ -3311,7 +3340,7 @@
  .fi
  .sp
  Start a local HTTP repository browser and pull server. You can use
[email protected]@ -4232,7 +4205,7 @@
[email protected]@ -4255,7 +4228,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3320,14 +3349,25 @@
  .TP
  .BI \-A,  \-\-accesslog \ <FILE>
  .
[email protected]@ -4301,15 +4274,15 @@
[email protected]@ -4291,7 +4264,7 @@
+ .TP
+ .BI \-\-web\-conf \ <FILE>
+ .
+-name of the hgweb config file (see \(aqhg help hgweb\(aq)
++name of the hgweb config file (see 'hg help hgweb')
+ .TP
+ .BI \-\-webdir\-conf \ <FILE>
+ .
[email protected]@ -4324,7 +4297,7 @@
  .BI \-\-certificate \ <FILE>
  .
  SSL certificate file
 -.UNINDENT
 +.RE
+ .sp
+ [+] marked option can be specified multiple times
  .SS status
- .sp
[email protected]@ -4332,9 +4305,9 @@
  show changed files in the working directory:
  .sp
  .nf
@@ -3339,7 +3379,7 @@
  .fi
  .sp
  Show status of files in the repository. If names are given, only
[email protected]@ -4323,7 +4296,7 @@
[email protected]@ -4348,7 +4321,7 @@
  unless explicitly requested with \-u/\-\-unknown or \-i/\-\-ignored.
  .IP Note
  .
@@ -3348,7 +3388,7 @@
  changed or a merge has occurred. The standard diff format does
  not report permission changes and diff only reports changes
  relative to one merge parent.
[email protected]@ -4337,7 +4310,7 @@
[email protected]@ -4362,7 +4335,7 @@
  The codes used to show the status of files are:
  .sp
  .nf
@@ -3357,7 +3397,7 @@
  M = modified
  A = added
  R = removed
[email protected]@ -4346,11 +4319,11 @@
[email protected]@ -4371,11 +4344,11 @@
  ? = not tracked
  I = ignored
    = origin of the previous file (with \-\-copies)
@@ -3371,7 +3411,7 @@
  .IP \(bu 2
  .
  show changes in the working directory relative to a
[email protected]@ -4357,19 +4330,19 @@
[email protected]@ -4382,19 +4355,19 @@
  changeset:
  .sp
  .nf
@@ -3396,7 +3436,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4376,9 +4349,9 @@
[email protected]@ -4401,9 +4374,9 @@
  show all changes including copies in an existing changeset:
  .sp
  .nf
@@ -3408,7 +3448,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -4385,16 +4358,16 @@
[email protected]@ -4410,16 +4383,16 @@
  get a NUL separated list of added files, suitable for xargs:
  .sp
  .nf
@@ -3429,7 +3469,7 @@
  .TP
  .B \-A,  \-\-all
  .
[email protected]@ -4463,23 +4436,23 @@
[email protected]@ -4488,23 +4461,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -3460,7 +3500,7 @@
  .fi
  .sp
  This generates a brief summary of the working directory state,
[email protected]@ -4491,7 +4464,7 @@
[email protected]@ -4516,7 +4489,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3469,7 +3509,7 @@
  .TP
  .B \-\-remote
  .
[email protected]@ -4498,15 +4471,15 @@
[email protected]@ -4523,15 +4496,15 @@
  check for push and pull
  .sp
  aliases: sum
@@ -3488,7 +3528,7 @@
  .fi
  .sp
  Name a particular revision using <name>.
[email protected]@ -4527,11 +4500,11 @@
[email protected]@ -4552,11 +4525,11 @@
  repositories).
  .sp
  Tag commits are usually made at the head of a branch. If the parent
@@ -3502,7 +3542,7 @@
  .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]@ -4539,7 +4512,7 @@
[email protected]@ -4564,7 +4537,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3511,7 +3551,7 @@
  .TP
  .B \-f,  \-\-force
  .
[email protected]@ -4572,15 +4545,15 @@
[email protected]@ -4597,15 +4570,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -3530,7 +3570,7 @@
  .fi
  .sp
  This lists both regular and local tags. When the \-v/\-\-verbose
[email protected]@ -4590,20 +4563,20 @@
[email protected]@ -4615,20 +4588,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3555,7 +3595,7 @@
  .fi
  .sp
  The tip revision (usually just called the tip) is the changeset
[email protected]@ -4615,12 +4588,12 @@
[email protected]@ -4640,12 +4613,12 @@
  that repository becomes the current tip. The "tip" tag is special
  and cannot be renamed or assigned to a different changeset.
  .sp
@@ -3570,7 +3610,7 @@
  .TP
  .B \-p,  \-\-patch
  .
[email protected]@ -4637,15 +4610,15 @@
[email protected]@ -4662,15 +4635,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -3589,7 +3629,7 @@
  .fi
  .sp
  Apply one or more compressed changegroup files generated by the
[email protected]@ -4654,32 +4627,32 @@
[email protected]@ -4679,32 +4652,32 @@
  Returns 0 on success, 1 if an update has unresolved files.
  .sp
  Options:
@@ -3627,12 +3667,12 @@
 +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.
[email protected]@ -4686,12 +4659,12 @@
+-directory\(aqs parent and there are uncommitted changes, the update is
++directory's parent and there are uncommitted changes, 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.
[email protected]@ -4711,12 +4684,12 @@
  .sp
  The following rules apply when the working directory contains
  uncommitted changes:
@@ -3647,7 +3687,7 @@
  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]@ -4705,23 +4678,23 @@
[email protected]@ -4730,23 +4703,23 @@
  .
  With the \-C/\-\-clean option, uncommitted changes are discarded and
  the working directory is updated to the requested changeset.
@@ -3677,7 +3717,7 @@
  .TP
  .B \-C,  \-\-clean
  .
[email protected]@ -4744,25 +4717,25 @@
[email protected]@ -4769,25 +4742,25 @@
  specify merge tool
  .sp
  aliases: up checkout co
@@ -3708,7 +3748,7 @@
  for more information about recovery from corruption of the
  repository.
  .sp
[email protected]@ -4772,9 +4745,9 @@
[email protected]@ -4797,24 +4770,24 @@
  output version and copyright information:
  .sp
  .nf
@@ -3720,7 +3760,16 @@
  .fi
  .sp
  output version and copyright information
[email protected]@ -4781,7 +4754,7 @@
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .BI \-T,  \-\-template \ <TEMPLATE>
+ .
+ display with template (EXPERIMENTAL)
+-.UNINDENT
++.RE
  .SH DATE FORMATS
  .sp
  Some commands allow the user to specify a date, e.g.:
@@ -3729,7 +3778,7 @@
  .IP \(bu 2
  .
  backout, commit, import, tag: Specify the commit date.
[email protected]@ -4788,10 +4761,10 @@
[email protected]@ -4821,10 +4794,10 @@
  .IP \(bu 2
  .
  log, revert, update: Select revision(s) by date.
@@ -3742,7 +3791,7 @@
  .IP \(bu 2
  .
  \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
[email protected]@ -4840,14 +4813,14 @@
[email protected]@ -4873,14 +4846,14 @@
  .IP \(bu 2
  .
  \fBnow\fP \- right now
@@ -3761,7 +3810,7 @@
  .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]@ -4855,7 +4828,7 @@
[email protected]@ -4888,7 +4861,7 @@
  (negative if the timezone is east of UTC).
  .sp
  The log command also accepts date ranges:
@@ -3770,7 +3819,7 @@
  .IP \(bu 2
  .
  \fB<DATE\fP \- at or before a given date/time
[email protected]@ -4868,16 +4841,16 @@
[email protected]@ -4901,16 +4874,16 @@
  .IP \(bu 2
  .
  \fB\-DAYS\fP \- within a given number of days of today
@@ -3790,7 +3839,7 @@
  .IP \(bu 2
  .
  executable status and other permission bits
[email protected]@ -4890,7 +4863,7 @@
[email protected]@ -4923,7 +4896,7 @@
  .IP \(bu 2
  .
  creation or deletion of empty files
@@ -3799,7 +3848,7 @@
  .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]@ -4898,26 +4871,26 @@
[email protected]@ -4931,26 +4904,26 @@
  format.
  .sp
  This means that when generating diffs from a Mercurial repository
@@ -3833,7 +3882,7 @@
  Windows) is searched.
  .TP
  .B HGEDITOR
[email protected]@ -4935,9 +4908,9 @@
[email protected]@ -4968,9 +4941,9 @@
  .TP
  .B HGENCODINGMODE
  .
@@ -3845,7 +3894,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]@ -4944,7 +4917,7 @@
[email protected]@ -4977,7 +4950,7 @@
  .TP
  .B HGENCODINGAMBIGUOUS
  .
@@ -3854,7 +3903,7 @@
  "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]@ -4966,19 +4939,19 @@
[email protected]@ -4999,19 +4972,19 @@
  the .hg/hgrc from the current repository is read.
  .sp
  For each element in HGRCPATH:
@@ -3878,7 +3927,7 @@
  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]@ -4990,11 +4963,11 @@
[email protected]@ -5023,11 +4996,11 @@
  .
  This is a comma\-separated list of features to preserve when
  HGPLAIN is enabled. Currently the following values are supported:
@@ -3892,18 +3941,28 @@
  .TP
  .B \fBi18n\fP
  .sp
[email protected]@ -5002,8 +4975,8 @@
[email protected]@ -5035,16 +5008,16 @@
  .TP
  .B \fBrevsetalias\fP
  .sp
 -Don\(aqt remove revset aliases.
--.UNINDENT
 +Don't remove revset aliases.
+ .TP
+ .B \fBtemplatealias\fP
+ .sp
+-Don\(aqt remove template aliases.
++Don't remove template aliases.
+ .TP
+ .B \fBprogress\fP
+ .sp
+-Don\(aqt hide progress output.
+-.UNINDENT
++Don't hide progress output.
 +.RE
  .sp
  Setting HGPLAINEXCEPT to anything (even an empty string) will
  enable plain mode.
[email protected]@ -5012,7 +4985,7 @@
[email protected]@ -5053,7 +5026,7 @@
  .
  This is the string used as the author of a commit. If not set,
  available values will be considered in this order:
@@ -3912,7 +3971,7 @@
  .IP \(bu 2
  .
  HGUSER (deprecated)
[email protected]@ -5028,7 +5001,7 @@
[email protected]@ -5069,7 +5042,7 @@
  .IP \(bu 2
  .
  LOGNAME (with \[email protected]\fP appended)
@@ -3921,7 +3980,7 @@
  .sp
  (deprecated, use configuration file)
  .TP
[email protected]@ -5051,13 +5024,13 @@
[email protected]@ -5092,13 +5065,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
@@ -3937,7 +3996,7 @@
  .SH USING ADDITIONAL FEATURES
  .sp
  Mercurial has the ability to add new features through the use of
[email protected]@ -5070,22 +5043,22 @@
[email protected]@ -5111,22 +5084,22 @@
  like this:
  .sp
  .nf
@@ -3965,7 +4024,7 @@
  .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]@ -5099,19 +5072,19 @@
[email protected]@ -5140,19 +5113,19 @@
  broader scope, prepend its path with !:
  .sp
  .nf
@@ -3990,7 +4049,7 @@
  .TP
  .B acl
  .
[email protected]@ -5244,9 +5217,9 @@
[email protected]@ -5277,9 +5250,9 @@
  .B zeroconf
  .
  discover and advertise repositories on the local network
@@ -4003,7 +4062,7 @@
  .SH SPECIFYING FILE SETS
  .sp
  Mercurial supports a functional language for selecting a set of
[email protected]@ -5253,7 +5226,7 @@
[email protected]@ -5286,7 +5259,7 @@
  files.
  .sp
  Like other file patterns, this pattern type is indicated by a prefix,
@@ -4012,13 +4071,17 @@
  by infix operators. Parenthesis can be used for grouping.
  .sp
  Identifiers such as filenames or patterns must be quoted with single
[email protected]@ -5264,18 +5237,18 @@
[email protected]@ -5297,21 +5270,21 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
 -interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
 +interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
  .sp
+-See also \%\fBhg help patterns\fP\:.
++See also \fBhg help patterns\fP.
+ .SS Operators
+ .sp
  There is a single prefix operator:
 -.INDENT 0.0
 +.RS 0
@@ -4035,12 +4098,13 @@
  .TP
  .B \fBx and y\fP
  .sp
[email protected]@ -5289,14 +5262,14 @@
[email protected]@ -5325,15 +5298,15 @@
  .B \fBx \- y\fP
  .sp
  Files in x but not in y.
 -.UNINDENT
 +.RE
+ .SS Predicates
  .sp
  The following predicates are supported:
 -.INDENT 0.0
@@ -4053,7 +4117,7 @@
  .TP
  .B \fBbinary()\fP
  .sp
[email protected]@ -5304,7 +5277,7 @@
[email protected]@ -5341,7 +5314,7 @@
  .TP
  .B \fBclean()\fP
  .sp
@@ -4062,7 +4126,7 @@
  .TP
  .B \fBcopied()\fP
  .sp
[email protected]@ -5340,34 +5313,34 @@
[email protected]@ -5377,47 +5350,47 @@
  .TP
  .B \fBignored()\fP
  .sp
@@ -4103,17 +4167,26 @@
 +.RS 7
  .IP \(bu 2
  .
- 1k (files from 1024 to 2047 bytes)
[email protected]@ -5380,7 +5353,7 @@
- .IP \(bu 2
- .
- 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
--.UNINDENT
+-size(\(aq1k\(aq) \- files from 1024 to 2047 bytes
++size('1k') \- files from 1024 to 2047 bytes
+ .IP \(bu 2
+ .
+-size(\(aq< 20k\(aq) \- files less than 20480 bytes
++size('< 20k') \- files less than 20480 bytes
+ .IP \(bu 2
+ .
+-size(\(aq>= .5MB\(aq) \- files at least 524288 bytes
++size('>= .5MB') \- files at least 524288 bytes
+ .IP \(bu 2
+ .
+-size(\(aq4k \- 1MB\(aq) \- files from 4096 bytes to 1048576 bytes
+-.UNINDENT
++size('4k \- 1MB') \- files from 4096 bytes to 1048576 bytes
 +.RE
  .TP
  .B \fBsubrepo([pattern])\fP
  .sp
[email protected]@ -5392,24 +5365,24 @@
[email protected]@ -5429,25 +5402,25 @@
  .TP
  .B \fBunknown()\fP
  .sp
@@ -4127,6 +4200,7 @@
 -.UNINDENT
 +File that is marked unresolved according to \fBhg resolve \-l\fP.
 +.RE
+ .SS Examples
  .sp
  Some sample queries:
 -.INDENT 0.0
@@ -4144,7 +4218,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5416,9 +5389,9 @@
[email protected]@ -5454,9 +5427,9 @@
  Forget files that are in .hgignore but are already tracked:
  .sp
  .nf
@@ -4156,7 +4230,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5425,9 +5398,9 @@
[email protected]@ -5463,9 +5436,9 @@
  Find text files that contain a string:
  .sp
  .nf
@@ -4168,7 +4242,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5434,9 +5407,9 @@
[email protected]@ -5472,9 +5445,9 @@
  Find C files in a non\-standard encoding:
  .sp
  .nf
@@ -4181,7 +4255,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5443,9 +5416,9 @@
[email protected]@ -5481,9 +5454,9 @@
  Revert copies of large binary files:
  .sp
  .nf
@@ -4194,7 +4268,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -5452,15 +5425,15 @@
[email protected]@ -5490,13 +5463,13 @@
  Remove files listed in foo.lst that contain the letter a or b:
  .sp
  .nf
@@ -4207,16 +4281,13 @@
  .fi
 -.UNINDENT
 +.RE
- .sp
--See also \%\fBhg help patterns\fP\:.
-+See also \fBhg help patterns\fP.
  .SH GLOSSARY
 -.INDENT 0.0
 +.RS 0
  .TP
  .B Ancestor
  .
[email protected]@ -5468,7 +5441,7 @@
[email protected]@ -5504,7 +5477,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
@@ -4225,7 +4296,7 @@
  .TP
  .B Bookmark
  .
[email protected]@ -5475,7 +5448,7 @@
[email protected]@ -5511,7 +5484,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
@@ -4234,7 +4305,7 @@
  when you make a commit.
  .sp
  Bookmarks can be renamed, copied and deleted. Bookmarks are local,
[email protected]@ -5487,9 +5460,9 @@
[email protected]@ -5523,9 +5496,9 @@
  .
  (Noun) A child changeset that has been created from a parent that
  is not a head. These are known as topological branches, see
@@ -4246,7 +4317,7 @@
  .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]@ -5504,7 +5477,7 @@
[email protected]@ -5540,7 +5513,7 @@
  (Verb) The action of creating a child changeset which results in
  its parent having more than one child.
  .sp
@@ -4255,7 +4326,7 @@
  .TP
  .B Branch, anonymous
  .
[email protected]@ -5523,19 +5496,19 @@
[email protected]@ -5559,19 +5532,19 @@
  .TP
  .B Branch head
  .
@@ -4280,7 +4351,7 @@
  .TP
  .B Branch, named
  .
[email protected]@ -5542,8 +5515,8 @@
[email protected]@ -5578,8 +5551,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
@@ -4291,7 +4362,7 @@
  branches.
  .sp
  Named branches can be thought of as a kind of namespace, dividing
[email protected]@ -5556,7 +5529,7 @@
[email protected]@ -5592,7 +5565,7 @@
  .TP
  .B Branch tip
  .
@@ -4300,7 +4371,7 @@
  .TP
  .B Branch, topological
  .
[email protected]@ -5606,24 +5579,24 @@
[email protected]@ -5642,24 +5615,24 @@
  revision. This use should probably be avoided where possible, as
  changeset is much more appropriate than checkout in this context.
  .sp
@@ -4331,7 +4402,7 @@
  .TP
  .B Clone
  .
[email protected]@ -5632,13 +5605,13 @@
[email protected]@ -5668,13 +5641,13 @@
  .sp
  Example: "Is your clone up to date?"
  .sp
@@ -4348,7 +4419,7 @@
  .TP
  .B Commit
  .
[email protected]@ -5663,7 +5636,7 @@
[email protected]@ -5699,7 +5672,7 @@
  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
@@ -4357,7 +4428,7 @@
  Mercurial, the DAG is limited by the requirement for children to
  have at most two parents.
  .TP
[email protected]@ -5673,7 +5646,7 @@
[email protected]@ -5709,7 +5682,7 @@
  .TP
  .B Default branch
  .
@@ -4366,7 +4437,7 @@
  .TP
  .B Descendant
  .
[email protected]@ -5681,7 +5654,7 @@
[email protected]@ -5717,7 +5690,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
@@ -4375,7 +4446,7 @@
  .TP
  .B Diff
  .
[email protected]@ -5706,7 +5679,7 @@
[email protected]@ -5742,7 +5715,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
@@ -4384,7 +4455,7 @@
  to the files introduced manually or by a merge. The repository
  metadata exists in the .hg directory inside the working directory.
  .TP
[email protected]@ -5714,7 +5687,7 @@
[email protected]@ -5750,7 +5723,7 @@
  .
  Changesets in the draft phase have not been shared with publishing
  repositories and may thus be safely changed by history\-modifying
@@ -4393,7 +4464,7 @@
  .TP
  .B Experimental
  .
[email protected]@ -5722,13 +5695,13 @@
[email protected]@ -5758,13 +5731,13 @@
  .TP
  .B Graph
  .
@@ -4411,7 +4482,7 @@
  .sp
  Heads are where development generally takes place and are the
  usual targets for update and merge operations.
[email protected]@ -5740,9 +5713,9 @@
[email protected]@ -5776,9 +5749,9 @@
  .B Head, closed branch
  .
  A changeset that marks a head as no longer interesting. The closed
@@ -4423,7 +4494,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]@ -5771,11 +5744,11 @@
[email protected]@ -5807,11 +5780,11 @@
  .TP
  .B Immutable history
  .
@@ -4437,7 +4508,7 @@
  .TP
  .B Manifest
  .
[email protected]@ -5792,7 +5765,7 @@
[email protected]@ -5828,7 +5801,7 @@
  .TP
  .B Named branch
  .
@@ -4446,7 +4517,7 @@
  .TP
  .B Null changeset
  .
[email protected]@ -5799,30 +5772,30 @@
[email protected]@ -5835,30 +5808,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
@@ -4485,7 +4556,7 @@
  .sp
  (Verb) The process of using a patch file to transform one
  changeset into another.
[email protected]@ -5832,13 +5805,13 @@
[email protected]@ -5868,13 +5841,13 @@
  .B Phase
  .
  A per\-changeset state tracking how the changeset has been or
@@ -4502,7 +4573,7 @@
  .TP
  .B Pull
  .
[email protected]@ -5846,7 +5819,7 @@
[email protected]@ -5882,7 +5855,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
@@ -4511,7 +4582,7 @@
  .TP
  .B Push
  .
[email protected]@ -5854,7 +5827,7 @@
[email protected]@ -5890,7 +5863,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
@@ -4520,7 +4591,7 @@
  .TP
  .B Repository
  .
[email protected]@ -5867,13 +5840,13 @@
[email protected]@ -5903,13 +5876,13 @@
  .TP
  .B Repository head
  .
@@ -4537,7 +4608,7 @@
  .TP
  .B Revision number
  .
[email protected]@ -5882,7 +5855,7 @@
[email protected]@ -5918,7 +5891,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
@@ -4546,7 +4617,7 @@
  .TP
  .B Revlog
  .
[email protected]@ -5893,7 +5866,7 @@
[email protected]@ -5929,7 +5902,7 @@
  .TP
  .B Rewriting history
  .
@@ -4555,7 +4626,7 @@
  .TP
  .B Root
  .
[email protected]@ -5903,13 +5876,13 @@
[email protected]@ -5939,13 +5912,13 @@
  .B Secret
  .
  Changesets in the secret phase may not be shared via push, pull,
@@ -4571,7 +4642,7 @@
  will thus automatically be shared with other using push and pull.
  .TP
  .B Tip
[email protected]@ -5921,7 +5894,7 @@
[email protected]@ -5957,7 +5930,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
@@ -4580,7 +4651,7 @@
  numbers may be different in different repository clones, the
  branch tip may be different in different cloned repositories.
  .TP
[email protected]@ -5929,22 +5902,22 @@
[email protected]@ -5965,22 +5938,22 @@
  .
  (Noun) Another synonym of changeset.
  .sp
@@ -4608,7 +4679,7 @@
  .SH SYNTAX FOR MERCURIAL IGNORE FILES
  .SS Synopsis
  .sp
[email protected]@ -5971,16 +5944,16 @@
[email protected]@ -6007,16 +5980,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -4629,7 +4700,7 @@
  in .hgignore.
  .SS Syntax
  .sp
[email protected]@ -5995,13 +5968,13 @@
[email protected]@ -6031,13 +6004,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -4646,7 +4717,7 @@
  .TP
  .B \fBregexp\fP
  .sp
[email protected]@ -6010,7 +5983,7 @@
[email protected]@ -6046,7 +6019,7 @@
  .B \fBglob\fP
  .sp
  Shell\-style glob.
@@ -4655,7 +4726,7 @@
  .sp
  The chosen syntax stays in effect when parsing all patterns that
  follow, until another syntax is selected.
[email protected]@ -6022,11 +5995,11 @@
[email protected]@ -6058,11 +6031,11 @@
  .sp
  Subdirectories can have their own .hgignore settings by adding
  \fBsubinclude:path/to/subdir/.hgignore\fP to the root \fB.hgignore\fP. See
@@ -4669,7 +4740,7 @@
  .RE
  .SS Example
  .sp
[email protected]@ -6033,7 +6006,7 @@
[email protected]@ -6069,7 +6042,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -4678,7 +4749,7 @@
  # use glob syntax.
  syntax: glob
  
[email protected]@ -6044,21 +6017,21 @@
[email protected]@ -6080,21 +6053,21 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -4706,7 +4777,7 @@
  .IP \(bu 2
  .
  web
[email protected]@ -6068,11 +6041,11 @@
[email protected]@ -6104,11 +6077,11 @@
  .IP \(bu 2
  .
  collections
@@ -4722,7 +4793,7 @@
  .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]@ -6087,7 +6060,7 @@
[email protected]@ -6123,7 +6096,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
@@ -4731,7 +4802,7 @@
  With \fB**\fP it will also search inside repository working directories
  and possibly find subrepositories.
  .sp
[email protected]@ -6094,15 +6067,15 @@
[email protected]@ -6130,15 +6103,15 @@
  In this example:
  .sp
  .nf
@@ -4750,7 +4821,7 @@
  .IP \(bu 2
  .
  The first two entries make two repositories in different directories
[email protected]@ -6116,7 +6089,7 @@
[email protected]@ -6152,7 +6125,7 @@
  .
  The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
  and \fBhttp://server/user/bob/quux/testsubrepo/\fP
@@ -4759,7 +4830,7 @@
  .sp
  The \fBcollections\fP section is deprecated and has been superseded by
  \fBpaths\fP.
[email protected]@ -6139,7 +6112,7 @@
[email protected]@ -6175,7 +6148,7 @@
  \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
  .sp
  Not all templates are available for all styles. Attempting to use
@@ -4768,7 +4839,7 @@
  rendering the page.
  .sp
  Many commands take a \fB{revision}\fP URL parameter. This defines the
[email protected]@ -6146,7 +6119,7 @@
[email protected]@ -6182,7 +6155,7 @@
  changeset to operate on. This is commonly specified as the short,
  12 digit hexadecimal abbreviation for the full 40 character unique
  revision identifier. However, any value described by
@@ -4777,7 +4848,7 @@
  .SS Commands and URLs
  .sp
  The following web commands and their URLs are available:
[email protected]@ -6200,7 +6173,7 @@
[email protected]@ -6236,7 +6209,7 @@
  .sp
  The argument for \fBrev\fP can be a single revision, a revision set,
  or a literal keyword to search for in changeset data (equivalent to
@@ -4786,7 +4857,7 @@
  .sp
  The \fBrevcount\fP query string argument defines the maximum numbers of
  changesets to render.
[email protected]@ -6285,7 +6258,7 @@
[email protected]@ -6321,7 +6294,7 @@
  .sp
  Render help documentation.
  .sp
@@ -4795,7 +4866,7 @@
  is defined, that help topic will be rendered. If not, an index of
  available help topics will be rendered.
  .sp
[email protected]@ -6348,9 +6321,9 @@
[email protected]@ -6384,9 +6357,9 @@
  .sp
  The \fBtags\fP template is rendered.
  .SH TECHNICAL IMPLEMENTATION TOPICS
@@ -4808,10 +4879,10 @@
  .TP
  .B bundles
  .
[email protected]@ -6363,9 +6336,9 @@
- .B revlogs
- .
- revision storage mechanism
[email protected]@ -6407,9 +6380,9 @@
+ .B wireprotocol
+ .
+ Wire Protocol
 -.UNINDENT
 -.UNINDENT
 -.UNINDENT
@@ -4821,7 +4892,7 @@
  .SH MERGE TOOLS
  .sp
  To merge files Mercurial uses merge tools.
[email protected]@ -6375,8 +6348,8 @@
[email protected]@ -6419,8 +6392,8 @@
  ancestor of the two file versions, so they can determine the changes
  made on both branches.
  .sp
@@ -4832,7 +4903,7 @@
  .sp
  Usually, the merge tool tries to automatically reconcile the files by
  combining all non\-overlapping changes that occurred separately in
[email protected]@ -6401,7 +6374,7 @@
[email protected]@ -6445,7 +6418,7 @@
  .sp
  There are some internal merge tools which can be used. The internal
  merge tools are:
@@ -4841,7 +4912,7 @@
  .TP
  .B \fB:dump\fP
  .sp
[email protected]@ -6464,7 +6437,7 @@
[email protected]@ -6508,7 +6481,7 @@
  Uses the internal non\-interactive simple merge algorithm for merging
  files. It will use both left and right sides for conflict regions.
  No markers are inserted.
@@ -4850,7 +4921,7 @@
  .sp
  Internal tools are always available and do not require a GUI but will by default
  not handle symlinks or binary files.
[email protected]@ -6471,7 +6444,7 @@
[email protected]@ -6515,7 +6488,7 @@
  .SS Choosing a merge tool
  .sp
  Mercurial uses these rules when deciding which merge tool to use:
@@ -4859,7 +4930,7 @@
  .IP 1. 3
  .
  If a tool has been specified with the \-\-tool option to merge or resolve, it
[email protected]@ -6508,11 +6481,11 @@
[email protected]@ -6552,11 +6525,11 @@
  .IP 8. 3
  .
  The merge of the file fails and must be resolved before commit.
@@ -4873,7 +4944,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]@ -6548,7 +6521,7 @@
[email protected]@ -6577,7 +6550,7 @@
  .IP Note
  .
  Patterns specified in \fB.hgignore\fP are not rooted.
@@ -4882,7 +4953,7 @@
  .RE
  .sp
  To use a plain path name without any pattern matching, start it with
[email protected]@ -6573,8 +6546,8 @@
[email protected]@ -6602,8 +6575,8 @@
  To read a set of patterns from a file, use \fBinclude:\fP or \fBsubinclude:\fP.
  \fBinclude:\fP will use all the patterns from the given file and treat them as if
  they had been passed in manually.  \fBsubinclude:\fP will only apply the patterns
@@ -4893,7 +4964,7 @@
  .sp
  All patterns, except for \fBglob:\fP specified in command line (not for
  \fB\-I\fP or \fB\-X\fP options), can match also against directories: files
[email protected]@ -6583,17 +6556,17 @@
[email protected]@ -6612,17 +6585,17 @@
  Plain examples:
  .sp
  .nf
@@ -4914,7 +4985,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]@ -6601,36 +6574,36 @@
[email protected]@ -6630,36 +6603,36 @@
  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.
@@ -4959,7 +5030,7 @@
  .fi
  .SH WORKING WITH PHASES
  .SS What are phases?
[email protected]@ -6640,9 +6613,9 @@
[email protected]@ -6669,9 +6642,9 @@
  (for instance, with the mq or rebase extensions).
  .sp
  Each changeset in a repository is in one of the following phases:
@@ -4972,7 +5043,7 @@
  .IP \(bu 2
  .
  public : changeset is visible on a public server
[email protected]@ -6652,9 +6625,9 @@
[email protected]@ -6681,9 +6654,9 @@
  .IP \(bu 2
  .
  secret : changeset should not be pushed, pulled, or cloned
@@ -4985,7 +5056,7 @@
  .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]@ -6668,17 +6641,17 @@
[email protected]@ -6697,17 +6670,17 @@
  .sp
  Once changesets become public, extensions like mq and rebase will
  refuse to operate on them to prevent creating duplicate changesets.
@@ -5007,7 +5078,7 @@
  .fi
  .SS Phases and servers
  .sp
[email protected]@ -6685,7 +6658,7 @@
[email protected]@ -6714,7 +6687,7 @@
  Normally, all servers are \fBpublishing\fP by default. This means:
  .sp
  .nf
@@ -5016,7 +5087,7 @@
  \- all draft changesets that are pulled or cloned appear in phase
  public on the client
  
[email protected]@ -6693,7 +6666,7 @@
[email protected]@ -6722,7 +6695,7 @@
  client and server
  
  \- secret changesets are neither pushed, pulled, or cloned
@@ -5025,7 +5096,7 @@
  .fi
  .IP Note
  .
[email protected]@ -6706,13 +6679,13 @@
[email protected]@ -6735,13 +6708,13 @@
  repository to disable publishing in its configuration file:
  .sp
  .nf
@@ -5042,7 +5113,7 @@
  .IP Note
  .
  Servers running older versions of Mercurial are treated as
[email protected]@ -6726,17 +6699,17 @@
[email protected]@ -6755,17 +6728,17 @@
  of the secret changeset may be communicated to the server.
  .RE
  .SS Examples
@@ -5065,7 +5136,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6743,9 +6716,9 @@
[email protected]@ -6772,9 +6745,9 @@
  change all secret changesets to draft:
  .sp
  .nf
@@ -5077,7 +5148,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6752,9 +6725,9 @@
[email protected]@ -6781,9 +6754,9 @@
  forcibly move the current changeset and descendants from public to draft:
  .sp
  .nf
@@ -5089,7 +5160,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6761,9 +6734,9 @@
[email protected]@ -6790,9 +6763,9 @@
  show a list of changeset revision and phase:
  .sp
  .nf
@@ -5101,7 +5172,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -6770,15 +6743,15 @@
[email protected]@ -6799,15 +6772,15 @@
  resynchronize draft changesets relative to a remote repository:
  .sp
  .nf
@@ -5120,15 +5191,16 @@
  .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]@ -6824,18 +6797,18 @@
+ .SH SPECIFYING REVISIONS
+ .sp
+ Mercurial supports several ways to specify revisions.
[email protected]@ -6858,19 +6831,19 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
 -interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
 +interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
+ .SS Operators
  .sp
  There is a single prefix operator:
 -.INDENT 0.0
@@ -5146,10 +5218,24 @@
  .TP
  .B \fBx::y\fP
  .sp
[email protected]@ -6874,18 +6847,18 @@
- .B \fBx~n\fP
- .sp
- The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
[email protected]@ -6926,25 +6899,25 @@
+ For example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [revsetalias]
+-issue(a1) = grep(r\(aq\ebissue[ :]?\(aq ## a1 ## r\(aq\eb|\ebbug\e(\(aq ## a1 ## r\(aq\e)\(aq)
++issue(a1) = grep(r'\ebissue[ :]?' ## a1 ## r'\eb|\ebbug\e(' ## a1 ## r'\e)')
+ 
+ \(ga\(gaissue(1234)\(ga\(ga is equivalent to
+-\(ga\(gagrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\(ga\(ga
++\(ga\(gagrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\(ga\(ga
+ in this case. This matches against all of "issue 1234", "issue:1234",
+ "issue1234" and "bug(1234)".
+-.ft P
++.ft
+ .fi
 -.UNINDENT
 +.RE
  .sp
@@ -5162,6 +5248,33 @@
  Equivalent to \fBx^1\fP, the first parent of each changeset in x.
 -.UNINDENT
 +.RE
+ .SS Patterns
+ .sp
+ Where noted, predicates that perform string matching can accept a pattern
[email protected]@ -6956,22 +6929,22 @@
+ Matching is case\-sensitive, unless otherwise noted.  To perform a case\-
+ insensitive match on a case\-sensitive predicate, use a regular expression,
+ prefixed with \fB(?i)\fP.
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ For example:
+ .sp
+ .nf
+-.ft C
+-\(ga\(gatag(r\(aqre:(?i)release\(aq)\(ga\(ga matches "release" or "RELEASE" or "Release", etc
+-.ft P
++.ft
++\(ga\(gatag(r're:(?i)release')\(ga\(ga matches "release" or "RELEASE" or "Release", etc
++.ft
+ .fi
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+ .SS Predicates
  .sp
  The following predicates are supported:
 -.INDENT 0.0
@@ -5169,7 +5282,7 @@
  .TP
  .B \fBadds(pattern)\fP
  .sp
[email protected]@ -6918,7 +6891,7 @@
[email protected]@ -7004,7 +6977,7 @@
  .B \fBbisect(string)\fP
  .sp
  Changesets marked in the specified bisect status:
@@ -5178,7 +5291,7 @@
  .IP \(bu 2
  .
  \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
[email protected]@ -6940,7 +6913,7 @@
[email protected]@ -7026,13 +6999,13 @@
  .IP \(bu 2
  .
  \fBcurrent\fP            : the cset currently being bisected
@@ -5187,7 +5300,23 @@
  .TP
  .B \fBbookmark([name])\fP
  .sp
[email protected]@ -6985,8 +6958,8 @@
+ The named bookmark or all bookmarks.
+ .sp
+-Pattern matching is supported for \fIname\fP. See \%\fBhg help revisions.patterns\fP\:.
++Pattern matching is supported for \fIname\fP. See \fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBbranch(string or set)\fP
+ .sp
[email protected]@ -7040,7 +7013,7 @@
+ changesets.
+ .sp
+ Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBbranchpoint()\fP
+ .sp
[email protected]@ -7068,8 +7041,8 @@
  .TP
  .B \fBcontains(pattern)\fP
  .sp
@@ -5198,7 +5327,7 @@
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
  relative to the current directory and match against a file exactly
[email protected]@ -6999,7 +6972,7 @@
[email protected]@ -7082,7 +7055,7 @@
  .TP
  .B \fBdate(interval)\fP
  .sp
@@ -5207,7 +5336,25 @@
  .TP
  .B \fBdesc(string)\fP
  .sp
[email protected]@ -7051,7 +7024,7 @@
[email protected]@ -7089,7 +7062,7 @@
+ Search commit message for string. The match is case\-insensitive.
+ .sp
+ Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBdescendants(set)\fP
+ .sp
[email protected]@ -7119,7 +7092,7 @@
+ optional value.
+ .sp
+ Pattern matching is supported for \fIvalue\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBfile(pattern)\fP
+ .sp
[email protected]@ -7136,7 +7109,7 @@
  .sp
  For performance reasons, visits only revisions mentioned in the file\-level
  filelog, rather than filtering through all changesets (much faster, but
@@ -5216,7 +5363,7 @@
  result, use \fBfile()\fP.
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
[email protected]@ -7058,7 +7031,7 @@
[email protected]@ -7143,7 +7116,7 @@
  relative to the current directory and match against a file exactly
  for efficiency.
  .sp
@@ -5225,14 +5372,25 @@
  work around it to return a non\-filtered value.
  .TP
  .B \fBfirst(set, [n])\fP
[email protected]@ -7067,13 +7040,13 @@
- .TP
- .B \fBfollow([pattern])\fP
[email protected]@ -7152,21 +7125,21 @@
+ .TP
+ .B \fBfollow([pattern[, startrev]])\fP
  .sp
 -An alias for \fB::.\fP (ancestors of the working directory\(aqs first parent).
 +An alias for \fB::.\fP (ancestors of the working directory's first parent).
  If pattern is specified, the histories of files matching given
- pattern is followed, including copies.
+ pattern in the revision given by startrev are followed, including copies.
+ .TP
+ .B \fBfollowlines(file, fromline:toline[, startrev=.])\fP
+ .sp
+-Changesets modifying \fIfile\fP in line range (\(aqfromline\(aq, \(aqtoline\(aq).
++Changesets modifying \fIfile\fP in line range ('fromline', 'toline').
+ .sp
+-Line range corresponds to \(aqfile\(aq content at \(aqstartrev\(aq and should hence be
+-consistent with file size. If startrev is not specified, working directory\(aqs
++Line range corresponds to 'file' content at 'startrev' and should hence be
++consistent with file size. If startrev is not specified, working directory's
+ parent is used.
  .TP
  .B \fBgrep(regex)\fP
  .sp
@@ -5241,7 +5399,16 @@
  to ensure special escape characters are handled correctly. Unlike
  \fBkeyword(string)\fP, the match is case\-sensitive.
  .TP
[email protected]@ -7197,7 +7170,7 @@
[email protected]@ -7252,7 +7225,7 @@
+ The changesets in a given namespace.
+ .sp
+ Pattern matching is supported for \fInamespace\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBobsolete()\fP
+ .sp
[email protected]@ -7292,7 +7265,7 @@
  .TP
  .B \fBpresent(set)\fP
  .sp
@@ -5250,7 +5417,7 @@
  all revisions in set.
  .sp
  If any of specified revisions is not present in the local repository,
[email protected]@ -7211,7 +7184,7 @@
[email protected]@ -7306,7 +7279,7 @@
  .B \fBremote([id [,path]])\fP
  .sp
  Local revision that corresponds to the given identifier in a
@@ -5259,7 +5426,7 @@
  synonym for the current local branch.
  .TP
  .B \fBremoves(pattern)\fP
[email protected]@ -7244,7 +7217,7 @@
[email protected]@ -7339,7 +7312,7 @@
  as \fB\-key\fP to sort in descending order.
  .sp
  The keys can be:
@@ -5268,23 +5435,36 @@
  .IP \(bu 2
  .
  \fBrev\fP for the revision number,
[email protected]@ -7260,7 +7233,7 @@
- .IP \(bu 2
- .
- \fBdate\fP for the commit date
--.UNINDENT
-+.RE
- .TP
- .B \fBsubrepo([pattern])\fP
- .sp
[email protected]@ -7286,15 +7259,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
[email protected]@ -7358,7 +7331,7 @@
+ .IP \(bu 2
+ .
+ \fBtopo\fP for a reverse topographical sort
+-.UNINDENT
++.RE
+ .sp
+ The \fBtopo\fP sort order cannot be combined with other sort keys. This sort
+ takes one optional argument, \fBtopo.firstbranch\fP, which takes a revset that
[email protected]@ -7374,7 +7347,7 @@
+ The specified tag by name, or all tagged revisions if no name is given.
+ .sp
+ Pattern matching is supported for \fIname\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+ .TP
+ .B \fBunstable()\fP
+ .sp
[email protected]@ -7385,8 +7358,8 @@
+ User name contains string. The match is case\-insensitive.
+ .sp
+ Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
+-.UNINDENT
++\fBhg help revisions.patterns\fP.
++.RE
+ .SS Aliases
  .sp
  New predicates (known as "aliases") can be defined, using any combination of
[email protected]@ -7393,9 +7366,9 @@
  existing predicates or other aliases. An alias definition looks like:
  .sp
  .nf
@@ -5296,7 +5476,7 @@
  .fi
  .sp
  in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
[email protected]@ -7304,12 +7277,12 @@
[email protected]@ -7405,12 +7378,12 @@
  For example,
  .sp
  .nf
@@ -5304,34 +5484,16 @@
 +.ft
  [revsetalias]
  h = heads()
- d($1) = sort($1, date)
- rs($1, $2) = reverse(sort($1, $2))
+ d(s) = sort(s, date)
+ rs(s, k) = reverse(sort(s, k))
 -.ft P
 +.ft
  .fi
  .sp
  defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
[email protected]@ -7319,13 +7292,13 @@
- one string. For example:
- .sp
- .nf
--.ft C
-+.ft
- [revsetalias]
--issue($1) = grep(r\(aq\ebissue[ :]?\(aq ## $1 ## r\(aq\eb|\ebbug\e(\(aq ## $1 ## r\(aq\e)\(aq)
--.ft P
-+issue($1) = grep(r'\ebissue[ :]?' ## $1 ## r'\eb|\ebbug\e(' ## $1 ## r'\e)')
-+.ft
- .fi
- .sp
--\fBissue(1234)\fP is equivalent to \fBgrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\fP
-+\fBissue(1234)\fP is equivalent to \fBgrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\fP
- in this case. This matches against all of "issue 1234", "issue:1234",
- "issue1234" and "bug(1234)".
- .sp
[email protected]@ -7332,10 +7305,10 @@
- All other prefix, infix and postfix operators have lower priority than
- \fB##\fP. For example, \fB$1 ## $2~2\fP is equivalent to \fB($1 ## $2)~2\fP.
[email protected]@ -7417,10 +7390,10 @@
+ exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
+ .SS Equivalents
  .sp
 -Command line equivalents for \%\fBhg log\fP\::
 +Command line equivalents for \fBhg log\fP:
@@ -5342,13 +5504,14 @@
  \-f    \->  ::.
  \-d x  \->  date(x)
  \-k x  \->  keyword(x)
[email protected]@ -7344,19 +7317,19 @@
[email protected]@ -7429,20 +7402,20 @@
  \-b x  \->  branch(x)
  \-P x  \->  !::x
  \-l x  \->  limit(expr, x)
 -.ft P
 +.ft
  .fi
+ .SS Examples
  .sp
  Some sample queries:
 -.INDENT 0.0
@@ -5366,7 +5529,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7363,9 +7336,9 @@
[email protected]@ -7449,9 +7422,9 @@
  Changesets on the default branch since tag 1.5 (excluding merges):
  .sp
  .nf
@@ -5378,7 +5541,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7372,9 +7345,9 @@
[email protected]@ -7458,9 +7431,9 @@
  Open branch heads:
  .sp
  .nf
@@ -5390,7 +5553,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7382,9 +7355,9 @@
[email protected]@ -7468,9 +7441,9 @@
  \fBhgext/*\fP:
  .sp
  .nf
@@ -5403,7 +5566,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7391,9 +7364,9 @@
[email protected]@ -7477,9 +7450,9 @@
  Changesets committed in May 2008, sorted by user:
  .sp
  .nf
@@ -5416,7 +5579,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -7401,11 +7374,11 @@
[email protected]@ -7487,9 +7460,9 @@
  release:
  .sp
  .nf
@@ -5426,12 +5589,36 @@
 -.ft P
 +.ft
  .fi
+ .IP \(bu 2
+ .
[email protected]@ -7497,9 +7470,9 @@
+ bookmark (this works because the last revision of the revset is used):
+ .sp
+ .nf
+-.ft C
++.ft
+ hg update :@
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -7507,11 +7480,11 @@
+ last revisions of the revset are used):
+ .sp
+ .nf
+-.ft C
++.ft
+ hg diff \-r 1.3::1.5
+-.ft P
++.ft
+ .fi
 -.UNINDENT
 +.RE
  .SH USING MERCURIAL FROM SCRIPTS AND AUTOMATION
  .sp
  It is common for machines (as opposed to humans) to consume Mercurial.
[email protected]@ -7415,7 +7388,7 @@
[email protected]@ -7521,7 +7494,7 @@
  .sp
  Machines have a choice of several methods to interface with Mercurial.
  These include:
@@ -5440,7 +5627,7 @@
  .IP \(bu 2
  .
  Executing the \fBhg\fP process
[email protected]@ -7425,21 +7398,21 @@
[email protected]@ -7531,21 +7504,21 @@
  .IP \(bu 2
  .
  Calling out to a command server
@@ -5460,15 +5647,15 @@
 +\fBhg serve\fP can also start a "command server." Clients can connect
  to this server and issue Mercurial commands over a special protocol.
  For more details on the command server, including links to client
--libraries, see \%https://mercurial.selenic.com/wiki/CommandServer\:.
-+libraries, see https://mercurial.selenic.com/wiki/CommandServer.
+-libraries, see \%https://www.mercurial\-scm.org/wiki/CommandServer\:.
++libraries, see https://www.mercurial\-scm.org/wiki/CommandServer.
  .sp
 -\%\fBhg serve\fP\: based interfaces (the hgweb and command servers) have the
 +\fBhg serve\fP based interfaces (the hgweb and command servers) have the
  advantage over simple \fBhg\fP process invocations in that they are
  likely more efficient. This is because there is significant overhead
  to spawn new Python processes.
[email protected]@ -7451,14 +7424,14 @@
[email protected]@ -7557,14 +7530,14 @@
  .RE
  .SS Environment Variables
  .sp
@@ -5486,7 +5673,7 @@
  settings that impact its encoding, verbose mode, localization, etc.
  .sp
  It is highly recommended for machines to set this variable when
[email protected]@ -7479,7 +7452,7 @@
[email protected]@ -7585,7 +7558,7 @@
  .B HGRCPATH
  .
  If not set, Mercurial will inherit config options from config files
@@ -5495,7 +5682,7 @@
  inheriting user or system\-wide config files.
  .sp
  When utmost control over the Mercurial configuration is desired, the
[email protected]@ -7490,7 +7463,7 @@
[email protected]@ -7596,7 +7569,7 @@
  consequences, as the user and system config files often define things
  like the username and extensions that may be required to interface
  with a repository.
@@ -5504,7 +5691,7 @@
  .SS Consuming Command Output
  .sp
  It is common for machines to need to parse the output of Mercurial
[email protected]@ -7514,7 +7487,7 @@
[email protected]@ -7620,7 +7593,7 @@
  .SS Using Templates to Control Output
  .sp
  Many \fBhg\fP commands support templatized output via the
@@ -5513,7 +5700,7 @@
  .sp
  Templates are useful for explicitly controlling output so that
  you get exactly the data you want formatted how you want it. For
[email protected]@ -7552,13 +7525,13 @@
[email protected]@ -7658,13 +7631,13 @@
  .sp
  Commands often have varying output verbosity, even when machine
  readable styles are being used (e.g. \fB\-T json\fP). Adding
@@ -5529,7 +5716,7 @@
  .TP
  .B revsets
  .
[email protected]@ -7566,7 +7539,7 @@
[email protected]@ -7672,7 +7645,7 @@
  of revisions. Think of it as SQL for Mercurial repositories. Revsets
  are useful for querying repositories for specific data.
  .sp
@@ -5538,7 +5725,7 @@
  .TP
  .B share extension
  .
[email protected]@ -7580,8 +7553,8 @@
[email protected]@ -7686,8 +7659,8 @@
  network. This is especially true for continuous integration (CI)
  environments.
  .sp
@@ -5549,7 +5736,7 @@
  .SH SUBREPOSITORIES
  .sp
  Subrepositories let you nest external repositories or projects into a
[email protected]@ -7592,7 +7565,7 @@
[email protected]@ -7698,7 +7671,7 @@
  subrepositories.
  .sp
  Subrepositories are made of three components:
@@ -5558,7 +5745,7 @@
  .IP 1. 3
  .
  Nested repository checkouts. They can appear anywhere in the
[email protected]@ -7605,18 +7578,18 @@
[email protected]@ -7711,18 +7684,18 @@
  subrepositories are referenced like:
  .sp
  .nf
@@ -5581,7 +5768,7 @@
  .fi
  .sp
  where \fBpath/to/nested\fP is the checkout location relatively to the
[email protected]@ -7639,7 +7612,7 @@
[email protected]@ -7745,7 +7718,7 @@
  .
  The \fB.hgsubstate\fP file should not be edited manually.
  .RE
@@ -5590,7 +5777,7 @@
  .SS Adding a Subrepository
  .sp
  If \fB.hgsub\fP does not exist, create it and add it to the parent
[email protected]@ -7647,7 +7620,7 @@
[email protected]@ -7753,7 +7726,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
@@ -5599,7 +5786,7 @@
  .SS Synchronizing a Subrepository
  .sp
  Subrepos do not automatically track the latest changeset of their
[email protected]@ -7664,7 +7637,7 @@
[email protected]@ -7770,7 +7743,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
@@ -5608,7 +5795,7 @@
  .TP
  .B add
  .
[email protected]@ -7699,7 +7672,7 @@
[email protected]@ -7805,7 +7778,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
@@ -5617,7 +5804,7 @@
  longer any modified subrepositories, it records their state and
  finally commits it in the parent repository.  The \-\-addremove
  option also honors the \-S/\-\-subrepos option.  However, Git and
[email protected]@ -7739,7 +7712,7 @@
[email protected]@ -7845,7 +7818,7 @@
  .B pull
  .
  pull is not recursive since it is not clear what to pull prior
@@ -5626,7 +5813,7 @@
  subrepositories changes referenced by the parent repository pulled
  changesets is expensive at best, impossible in the Subversion
  case.
[email protected]@ -7774,7 +7747,7 @@
[email protected]@ -7880,7 +7853,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.
@@ -5635,7 +5822,7 @@
  .SS Remapping Subrepositories Sources
  .sp
  A subrepository source location may change during a project life,
[email protected]@ -7792,12 +7765,12 @@
[email protected]@ -7898,12 +7871,12 @@
  outgoing, incoming, tip, parents, and heads.
  .sp
  Some built\-in styles are packaged with Mercurial. These can be listed
@@ -5651,7 +5838,7 @@
  .fi
  .sp
  A template is a piece of text, with markup to invoke variable
[email protected]@ -7804,16 +7777,16 @@
[email protected]@ -7910,10 +7883,10 @@
  expansion:
  .sp
  .nf
@@ -5662,7 +5849,9 @@
 -.ft P
 +.ft
  .fi
- .sp
+ .SS Keywords
+ .sp
[email protected]@ -7920,7 +7893,7 @@
  Strings in curly braces are called keywords. The availability of
  keywords depends on the exact context of the templater. These
  keywords are usually available for templating a log\-like command:
@@ -5671,7 +5860,7 @@
  .TP
  .B activebookmark
  .
[email protected]@ -7831,7 +7804,7 @@
[email protected]@ -7938,7 +7911,7 @@
  .B bookmarks
  .
  List of strings. Any bookmarks associated with the
@@ -5680,7 +5869,7 @@
  .TP
  .B branch
  .
[email protected]@ -7861,7 +7834,7 @@
[email protected]@ -7968,7 +7941,7 @@
  .TP
  .B extras
  .
@@ -5689,7 +5878,7 @@
  field of this changeset.
  .TP
  .B file_adds
[email protected]@ -7917,24 +7890,24 @@
[email protected]@ -8024,24 +7997,24 @@
  .TP
  .B p1node
  .
@@ -5718,10 +5907,10 @@
  second parent, or \-1 if the changeset has no second parent.
  .TP
  .B parents
[email protected]@ -7962,24 +7935,24 @@
- .B tags
- .
- List of strings. Any tags associated with the changeset.
[email protected]@ -8073,25 +8046,25 @@
+ .B termwidth
+ .
+ Integer. The width of the current terminal.
 -.UNINDENT
 +.RE
  .sp
@@ -5741,6 +5930,7 @@
 -.ft P
 +.ft
  .fi
+ .SS Filters
  .sp
  List of filters:
 -.INDENT 0.0
@@ -5748,7 +5938,7 @@
  .TP
  .B addbreaks
  .
[email protected]@ -8062,7 +8035,7 @@
[email protected]@ -8174,7 +8147,7 @@
  .TP
  .B nonempty
  .
@@ -5757,15 +5947,17 @@
  .TP
  .B obfuscate
  .
[email protected]@ -8138,17 +8111,17 @@
- .
- Any text. Returns a short representation of a user name or email
- address.
[email protected]@ -8254,7 +8227,7 @@
+ .B utf8
+ .
+ Any text. Converts from the local character encoding to UTF\-8.
 -.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.
[email protected]@ -8261,11 +8234,11 @@
+ .SS Functions
  .sp
  In addition to filters, there are some basic built\-in functions:
 -.INDENT 0.0
@@ -5778,16 +5970,25 @@
  strings. The default is a Unix date format, including the timezone:
  "Mon Sep 04 15:13:13 2006 0700".
  .TP
[email protected]@ -8210,7 +8183,7 @@
- Converts a date to the specified timezone.
- The default is local date.
- .TP
--.B pad(text, width[, fillchar=\(aq \(aq[, right=False]])
-+.B pad(text, width[, fillchar=' '[, right=False]])
[email protected]@ -8277,7 +8250,7 @@
+ .B files(pattern)
+ .
+ All files of the current changeset matching the pattern. See
+-\%\fBhg help patterns\fP\:.
++\fBhg help patterns\fP.
+ .TP
+ .B fill(text[, width[, initialident[, hangindent]]])
+ .
[email protected]@ -8336,7 +8309,7 @@
+ .
+ Calculate a mod b such that a / b + a mod b == a
+ .TP
+-.B pad(text, width[, fillchar=\(aq \(aq[, left=False]])
++.B pad(text, width[, fillchar=' '[, left=False]])
  .
  Pad text with a
  fill character.
[email protected]@ -8218,7 +8191,7 @@
[email protected]@ -8349,7 +8322,7 @@
  .B revset(query[, formatargs...])
  .
  Execute a revision set query. See
@@ -5796,13 +5997,29 @@
  .TP
  .B rstdoc(text, style)
  .
[email protected]@ -8247,30 +8220,30 @@
[email protected]@ -8382,18 +8355,18 @@
  .B word(number, text[, separator])
  .
  Return the nth word from a string.
 -.UNINDENT
 +.RE
- .sp
+ .SS Operators
+ .sp
+ We provide a limited set of infix arithmetic operations on integers:
+ .sp
+ .nf
+-.ft C
++.ft
+ + for addition
+ \- for subtraction
+ * for multiplication
+ / for floor division (division rounded to integer nearest \-infinity)
+-.ft P
++.ft
+ .fi
+ .sp
+ Division fulfils the law x = x / y + mod(x, y).
[email protected]@ -8401,14 +8374,14 @@
  Also, for any expression that returns a list, there is a list operator:
  .sp
  .nf
@@ -5817,6 +6034,64 @@
  To prevent it from being interpreted, you can use an escape character \fB\e{\fP
 -or a raw string prefix, \fBr\(aq...\(aq\fP.
 +or a raw string prefix, \fBr'...'\fP.
+ .SS Aliases
+ .sp
+ New keywords and functions can be defined in the \fBtemplatealias\fP section of
[email protected]@ -8415,9 +8388,9 @@
+ a Mercurial configuration file:
+ .sp
+ .nf
+-.ft C
++.ft
+ <alias> = <definition>
+-.ft P
++.ft
+ .fi
+ .sp
+ Arguments of the form \fIa1\fP, \fIa2\fP, etc. are substituted from the alias into
[email protected]@ -8426,48 +8399,48 @@
+ For example,
+ .sp
+ .nf
+-.ft C
++.ft
+ [templatealias]
+ r = rev
+ rn = "{r}:{node|short}"
+-leftpad(s, w) = pad(s, w, \(aq \(aq, True)
+-.ft P
++leftpad(s, w) = pad(s, w, ' ', True)
++.ft
+ .fi
+ .sp
+ defines two symbol aliases, \fBr\fP and \fBrn\fP, and a function alias
+ \fBleftpad()\fP.
+ .sp
+-It\(aqs also possible to specify complete template strings, using the
++It's also possible to specify complete template strings, using the
+ \fBtemplates\fP section. The syntax used is the general template string syntax.
+ .sp
+ For example,
+ .sp
+ .nf
+-.ft C
++.ft
+ [templates]
+ nodedate = "{node|short}: {date(date, "%Y\-%m\-%d")}\en"
+-.ft P
++.ft
+ .fi
+ .sp
+ defines a template, \fBnodedate\fP, which can be called like:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ hg log \-r . \-Tnodedate
+-.ft P
++.ft
+ .fi
+ .SS Examples
  .sp
  Some sample command line templates:
 -.INDENT 0.0
@@ -5835,7 +6110,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8277,9 +8250,9 @@
[email protected]@ -8474,9 +8447,9 @@
  Join the list of files with a ", ":
  .sp
  .nf
@@ -5848,7 +6123,33 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8286,9 +8259,9 @@
[email protected]@ -8483,9 +8456,9 @@
+ Join the list of files ending with ".py" with a ", ":
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "pythonfiles: {join(files(\(aq**.py\(aq), \(aq, \(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "pythonfiles: {join(files('**.py'), ', ')}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -8492,9 +8465,9 @@
+ Separate non\-empty arguments by a " ":
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{separate(\(aq \(aq, node, bookmarks, tags}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{separate(' ', node, bookmarks, tags}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
[email protected]@ -8501,9 +8474,9 @@
  Modify each line of a commit description:
  .sp
  .nf
@@ -5861,7 +6162,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8295,9 +8268,9 @@
[email protected]@ -8510,9 +8483,9 @@
  Format date:
  .sp
  .nf
@@ -5874,7 +6175,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8304,9 +8277,9 @@
[email protected]@ -8519,9 +8492,9 @@
  Display date in UTC:
  .sp
  .nf
@@ -5887,7 +6188,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8313,9 +8286,9 @@
[email protected]@ -8528,9 +8501,9 @@
  Output the description set to a fill\-width of 30:
  .sp
  .nf
@@ -5899,7 +6200,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8322,10 +8295,10 @@
[email protected]@ -8537,10 +8510,10 @@
  Use a conditional to test for the default branch:
  .sp
  .nf
@@ -5914,7 +6215,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8332,9 +8305,9 @@
[email protected]@ -8547,9 +8520,9 @@
  Append a newline if not empty:
  .sp
  .nf
@@ -5927,7 +6228,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8341,9 +8314,9 @@
[email protected]@ -8556,9 +8529,9 @@
  Label the output for use with the color extension:
  .sp
  .nf
@@ -5940,7 +6241,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8350,27 +8323,27 @@
[email protected]@ -8565,27 +8538,27 @@
  Invert the firstline filter, i.e. everything but the first line:
  .sp
  .nf
@@ -5979,7 +6280,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8377,18 +8350,18 @@
[email protected]@ -8592,18 +8565,18 @@
  Find the previous release candidate tag, the distance and changes since the tag:
  .sp
  .nf
@@ -6005,7 +6306,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8395,9 +8368,9 @@
[email protected]@ -8610,9 +8583,9 @@
  Show details of parent revisions:
  .sp
  .nf
@@ -6018,7 +6319,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8404,9 +8377,9 @@
[email protected]@ -8619,9 +8592,9 @@
  Show only commit descriptions that start with "template":
  .sp
  .nf
@@ -6031,7 +6332,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -8413,34 +8386,34 @@
[email protected]@ -8628,34 +8601,34 @@
  Print the first word of each line of a commit message:
  .sp
  .nf
@@ -6076,7 +6377,7 @@
  possible if the feature is explicitly enabled on the remote Mercurial
  server.
  .sp
[email protected]@ -8448,7 +8421,7 @@
[email protected]@ -8663,7 +8636,7 @@
  web.cacerts.
  .sp
  Some notes about using SSH with Mercurial:
@@ -6085,7 +6386,7 @@
  .IP \(bu 2
  .
  SSH requires an accessible shell account on the destination machine
[email protected]@ -8455,63 +8428,63 @@
[email protected]@ -8670,63 +8643,63 @@
  and a copy of hg in the remote path or specified with as remotecmd.
  .IP \(bu 2
  .
@@ -6165,7 +6466,7 @@
  .SH EXTENSIONS
  .sp
  This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
[email protected]@ -8535,7 +8508,7 @@
[email protected]@ -8750,7 +8723,7 @@
  distinguish them.
  .sp
  The order in which access checks are performed is:
@@ -6174,7 +6475,7 @@
  .IP 1. 3
  .
  Deny  list for branches (section \fBacl.deny.branches\fP)
[email protected]@ -8548,7 +8521,7 @@
[email protected]@ -8763,7 +8736,7 @@
  .IP 4. 3
  .
  Allow list for paths    (section \fBacl.allow\fP)
@@ -6183,7 +6484,7 @@
  .sp
  The allow and deny sections take key\-value pairs.
  .SS Branch\-based Access Control
[email protected]@ -8556,7 +8529,7 @@
[email protected]@ -8771,7 +8744,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:
@@ -6192,7 +6493,7 @@
  .IP \(bu 2
  .
  a branch name, or
[email protected]@ -8563,10 +8536,10 @@
[email protected]@ -8778,10 +8751,10 @@
  .IP \(bu 2
  .
  an asterisk, to match any branch;
@@ -6205,7 +6506,7 @@
  .IP \(bu 2
  .
  a comma\-separated list containing users and groups, or
[email protected]@ -8573,7 +8546,7 @@
[email protected]@ -8788,7 +8761,7 @@
  .IP \(bu 2
  .
  an asterisk, to match anyone;
@@ -6214,7 +6515,7 @@
  .sp
  You can add the "!" prefix to a user or group name to invert the sense
  of the match.
[email protected]@ -8595,7 +8568,7 @@
[email protected]@ -8810,7 +8783,7 @@
  .SS Example Configuration
  .sp
  .nf
@@ -6223,7 +6524,7 @@
  [hooks]
  
  # Use this if you want to check access restrictions at commit time
[email protected]@ -8671,12 +8644,12 @@
[email protected]@ -8886,12 +8859,12 @@
  src/main/resources/** = *
  
  \&.hgtags = release_engineer
@@ -6239,7 +6540,7 @@
  be created.
  .sp
  The "!" prefix allows you to prevent anyone except a given user or group to
[email protected]@ -8688,18 +8661,18 @@
[email protected]@ -8903,18 +8876,18 @@
  3) Deny access to a file to anyone but user "gollum"
  .sp
  .nf
@@ -6263,7 +6564,7 @@
  lake = [email protected]
  
  # You can also deny access based on file paths:
[email protected]@ -8708,10 +8681,10 @@
[email protected]@ -8923,10 +8896,10 @@
  # Empty
  
  [acl.deny]
@@ -6275,9 +6576,9 @@
 -.ft P
 +.ft
  .fi
- .SS blackbox
- .sp
[email protected]@ -8722,7 +8695,7 @@
+ .SS automv
+ .sp
[email protected]@ -8948,7 +8921,7 @@
  Examples:
  .sp
  .nf
@@ -6285,8 +6586,8 @@
 +.ft
  [blackbox]
  track = *
- 
[email protected]@ -8737,7 +8710,7 @@
+ # dirty is *EXPENSIVE* (slow);
[email protected]@ -8968,7 +8941,7 @@
  maxsize = 1.5 MB
  # rotate up to N log files when the current one gets too big
  maxfiles = 3
@@ -6295,7 +6596,7 @@
  .fi
  .SS Commands
  .SS blackbox
[email protected]@ -8745,20 +8718,20 @@
[email protected]@ -8976,20 +8949,20 @@
  view the recent repository events:
  .sp
  .nf
@@ -6320,7 +6621,7 @@
  .SS bugzilla
  .sp
  hooks for integrating with the Bugzilla bug tracker
[email protected]@ -8771,7 +8744,7 @@
[email protected]@ -9002,7 +8975,7 @@
  hours spent working on the bug. Bugs can also be marked fixed.
  .sp
  Three basic modes of access to Bugzilla are provided:
@@ -6329,7 +6630,7 @@
  .IP 1. 3
  .
  Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
[email protected]@ -8783,7 +8756,7 @@
[email protected]@ -9014,7 +8987,7 @@
  .
  Writing directly to the Bugzilla database. Only Bugzilla installations
  using MySQL are supported. Requires Python MySQLdb.
@@ -6338,7 +6639,7 @@
  .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]@ -8811,12 +8784,12 @@
[email protected]@ -9042,12 +9015,12 @@
  works on all supported Bugzilla versions.
  .sp
  Configuration items common to all access modes:
@@ -6353,7 +6654,7 @@
  .TP
  .B \fBxmlrpc\fP
  .sp
[email protected]@ -8839,7 +8812,7 @@
[email protected]@ -9070,7 +9043,7 @@
  .sp
  MySQL access, Bugzilla 2.16 and up to but not
  including 2.18.
@@ -6362,7 +6663,7 @@
  .TP
  .B bugzilla.regexp
  .
[email protected]@ -8884,7 +8857,7 @@
[email protected]@ -9115,7 +9088,7 @@
  Template to use when formatting comments. Overrides style if
  specified. In addition to the usual Mercurial keywords, the
  extension specifies:
@@ -6371,7 +6672,7 @@
  .TP
  .B \fB{bug}\fP
  .sp
[email protected]@ -8901,7 +8874,7 @@
[email protected]@ -9132,7 +9105,7 @@
  .B \fB{hgweb}\fP
  .sp
  Base URL for browsing Mercurial repositories.
@@ -6380,7 +6681,7 @@
  .sp
  Default \fBchangeset {node|short} in repo {root} refers to bug
  {bug}.\endetails:\en\et{desc|tabindent}\fP
[email protected]@ -8918,10 +8891,10 @@
[email protected]@ -9149,10 +9122,10 @@
  .
  Base URL for browsing Mercurial repositories. Referenced from
  templates as \fB{hgweb}\fP.
@@ -6393,7 +6694,7 @@
  .TP
  .B bugzilla.usermap
  .
[email protected]@ -8930,13 +8903,13 @@
[email protected]@ -9161,13 +9134,13 @@
  line:
  .sp
  .nf
@@ -6410,7 +6711,7 @@
  .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]@ -8943,7 +8916,7 @@
[email protected]@ -9174,7 +9147,7 @@
  Contains entries of the form \fBcommitter = Bugzilla user\fP.
  .sp
  XMLRPC access mode configuration:
@@ -6419,7 +6720,7 @@
  .TP
  .B bugzilla.bzurl
  .
[email protected]@ -8958,22 +8931,22 @@
[email protected]@ -9189,22 +9162,22 @@
  .B bugzilla.password
  .
  The password for Bugzilla login.
@@ -6446,7 +6747,7 @@
  .TP
  .B bugzilla.host
  .
[email protected]@ -9013,12 +8986,12 @@
[email protected]@ -9244,12 +9217,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".
@@ -6461,7 +6762,7 @@
  [extensions]
  bugzilla =
  
[email protected]@ -9025,7 +8998,7 @@
[email protected]@ -9256,7 +9229,7 @@
  [hooks]
  # run bugzilla hook on every change pulled or pushed in here
  incoming.bugzilla = python:hgext.bugzilla.hook
@@ -6470,7 +6771,7 @@
  .fi
  .sp
  Example configurations:
[email protected]@ -9037,7 +9010,7 @@
[email protected]@ -9268,7 +9241,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -6479,7 +6780,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -9050,7 +9023,7 @@
[email protected]@ -9281,7 +9254,7 @@
  
  [web]
  baseurl=http://my\-project.org/hg
@@ -6488,7 +6789,7 @@
  .fi
  .sp
  XMLRPC+email example configuration. This uses the Bugzilla at
[email protected]@ -9062,7 +9035,7 @@
[email protected]@ -9293,7 +9266,7 @@
  \[email protected]\-project.org\fP.
  .sp
  .nf
@@ -6497,7 +6798,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  [email protected]\-project.org
[email protected]@ -9079,7 +9052,7 @@
[email protected]@ -9310,7 +9283,7 @@
  
  [usermap]
  [email protected][email protected]
@@ -6506,7 +6807,7 @@
  .fi
  .sp
  MySQL example configuration. This has a local Bugzilla 3.2 installation
[email protected]@ -9090,7 +9063,7 @@
[email protected]@ -9321,7 +9294,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -6515,7 +6816,7 @@
  [bugzilla]
  host=localhost
  password=XYZZY
[email protected]@ -9107,18 +9080,18 @@
[email protected]@ -9338,18 +9311,18 @@
  
  [usermap]
  [email protected][email protected]
@@ -6537,7 +6838,7 @@
  .fi
  .SS censor
  .sp
[email protected]@ -9132,14 +9105,14 @@
[email protected]@ -9363,14 +9336,14 @@
  Typical uses for censor are due to security or legal requirements, including:
  .sp
  .nf
@@ -6555,7 +6856,7 @@
  data needs to be materialized. Some commands, like \fBhg cat\fP/\fBhg revert\fP,
  simply fail when asked to produce censored data. Others, like \fBhg verify\fP and
  \fBhg update\fP, must be capable of tolerating censored data to continue to
[email protected]@ -9149,13 +9122,13 @@
[email protected]@ -9380,13 +9353,13 @@
  .SS censor
  .sp
  .nf
@@ -6572,50 +6873,12 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -9164,42 +9137,42 @@
[email protected]@ -9395,13 +9368,13 @@
  .BI \-t,  \-\-tombstone \ <TEXT>
  .
  replacement tombstone data
 -.UNINDENT
 +.RE
- .SS chgserver
- .sp
- command server extension for cHg (EXPERIMENTAL)
--.INDENT 0.0
-+.RS 0
- .TP
--.B \(aqS\(aq channel (read/write)
-+.B \&'S' channel (read/write)
- .
- propagate ui.system() request to client
- .TP
--.B \(aqattachio\(aq command
-+.B \&'attachio' command
- .
--attach client\(aqs stdio passed by sendmsg()
-+attach client's stdio passed by sendmsg()
- .TP
--.B \(aqchdir\(aq command
-+.B \&'chdir' command
- .
- change current directory
- .TP
--.B \(aqgetpager\(aq command
-+.B \&'getpager' command
- .
- checks if pager is enabled and which pager should be executed
- .TP
--.B \(aqsetenv\(aq command
-+.B \&'setenv' command
- .
- replace os.environ completely
- .TP
--.B \(aqSIGHUP\(aq signal
-+.B \&'SIGHUP' signal
- .
- reload configuration files
--.UNINDENT
-+.RE
  .SS children
  .sp
  command to display child changesets (DEPRECATED)
@@ -6627,7 +6890,7 @@
  .SS Commands
  .SS children
  .sp
[email protected]@ -9206,30 +9179,30 @@
[email protected]@ -9408,30 +9381,30 @@
  show the children of the given or working directory revision:
  .sp
  .nf
@@ -6650,12 +6913,10 @@
  .sp
  .nf
 -.ft C
--hg children => hg log \-r \(aqchildren()\(aq
--hg children \-r REV => hg log \-r \(aqchildren(REV)\(aq
--.ft P
-+.ft
-+hg children => hg log \-r 'children()'
-+hg children \-r REV => hg log \-r 'children(REV)'
++.ft
+ hg children => hg log \-r "children()"
+ hg children \-r REV => hg log \-r "children(REV)"
+-.ft P
 +.ft
  .fi
  .sp
@@ -6668,7 +6929,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
[email protected]@ -9242,7 +9215,7 @@
[email protected]@ -9444,7 +9417,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -6677,7 +6938,7 @@
  .SS churn
  .sp
  command to display statistics about repository history
[email protected]@ -9252,9 +9225,9 @@
[email protected]@ -9454,9 +9427,9 @@
  histogram of changes to the repository:
  .sp
  .nf
@@ -6689,7 +6950,7 @@
  .fi
  .sp
  This command will display a histogram representing the number
[email protected]@ -9270,7 +9243,7 @@
[email protected]@ -9472,7 +9445,7 @@
  Examples:
  .sp
  .nf
@@ -6698,7 +6959,7 @@
  # display count of changed lines for every committer
  hg churn \-t "{author|email}"
  
[email protected]@ -9282,7 +9255,7 @@
[email protected]@ -9484,7 +9457,7 @@
  
  # display count of lines changed in every year
  hg churn \-f "%Y" \-s
@@ -6707,7 +6968,7 @@
  .fi
  .sp
  It is possible to map alternate email addresses to a main address
[email protected]@ -9289,9 +9262,9 @@
[email protected]@ -9491,9 +9464,9 @@
  by providing a file using the following format:
  .sp
  .nf
@@ -6719,7 +6980,7 @@
  .fi
  .sp
  Such a file may be specified with the \-\-aliases option, otherwise
[email protected]@ -9299,7 +9272,7 @@
[email protected]@ -9501,7 +9474,7 @@
  Aliases will be split from the rightmost "=".
  .sp
  Options:
@@ -6728,7 +6989,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -9344,7 +9317,7 @@
[email protected]@ -9546,7 +9519,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6737,7 +6998,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS clonebundles
[email protected]@ -9357,7 +9330,7 @@
[email protected]@ -9559,7 +9532,7 @@
  resources on the server.
  .sp
  Cloning can be a CPU and I/O intensive operation on servers. Traditionally,
@@ -6746,7 +7007,7 @@
  a bundle containing the entire repository content and sends it to the client.
  There is no caching on the server and the server will have to redundantly
  generate the same outgoing bundle in response to each clone request. For
[email protected]@ -9365,8 +9338,8 @@
[email protected]@ -9567,8 +9540,8 @@
  clones can make scaling the server challenging and costly.
  .sp
  This extension provides server operators the ability to offload potentially
@@ -6757,7 +7018,7 @@
  .IP 1. 3
  .
  A server operator establishes a mechanism for making bundle files available
[email protected]@ -9393,10 +9366,10 @@
[email protected]@ -9595,10 +9568,10 @@
  .IP 7. 3
  .
  The client reconnects to the original server and performs the equivalent
@@ -6770,7 +7031,7 @@
  .sp
  Instead of the server generating full repository bundles for every clone
  request, it generates full bundles once and they are subsequently reused to
[email protected]@ -9406,7 +9379,7 @@
[email protected]@ -9608,7 +9581,7 @@
  clones to less than 1% of original.
  .sp
  To work, this extension requires the following of server operators:
@@ -6779,7 +7040,7 @@
  .IP \(bu 2
  .
  Generating bundle files of repository content (typically periodically,
[email protected]@ -9420,23 +9393,23 @@
[email protected]@ -9622,23 +9595,23 @@
  .
  A process for keeping the bundles manifest in sync with available bundle
  files.
@@ -6809,7 +7070,7 @@
  operators need to be aware that newer versions of Mercurial may produce
  streaming clone bundles incompatible with older Mercurial versions.\fP
  .sp
[email protected]@ -9449,12 +9422,12 @@
[email protected]@ -9651,12 +9624,12 @@
  ) delimited list of entries.
  .sp
  Each line in this file defines an available bundle. Lines have the format:
@@ -6826,7 +7087,7 @@
  .sp
  That is, a URL followed by an optional, space\-delimited list of key=value
  pairs describing additional properties of this bundle. Both keys and values
[email protected]@ -9467,7 +9440,7 @@
[email protected]@ -9669,7 +9642,7 @@
  data center closest to them.
  .sp
  The following reserved keys are currently defined:
@@ -6835,7 +7096,7 @@
  .TP
  .B BUNDLESPEC
  .
[email protected]@ -9474,21 +9447,21 @@
[email protected]@ -9676,21 +9649,21 @@
  A "bundle specification" string that describes the type of the bundle.
  .sp
  These are string values that are accepted by the "\-\-type" argument of
@@ -6861,7 +7122,7 @@
  clients will still sniff the bundle type from the header of downloaded
  files.
  .sp
[email protected]@ -9510,10 +9483,10 @@
[email protected]@ -9712,10 +9685,10 @@
  with the clonebundles facility.
  .sp
  Value should be "true".
@@ -6874,7 +7135,7 @@
  entries are optionally sorted by client preferences
  (\fBexperimental.clonebundleprefers\fP config option). The client then attempts
  to fetch the bundle at the first URL in the remaining list.
[email protected]@ -9523,7 +9496,7 @@
[email protected]@ -9725,7 +9698,7 @@
  for this is that if a server is using clone bundles, it is probably doing so
  because the feature is necessary to help it scale. In other words, there
  is an assumption that clone load will be offloaded to another service and
@@ -6883,7 +7144,7 @@
  If that other service experiences issues and clients start mass falling back to
  the original Mercurial server, the added clone load could overwhelm the server
  due to unexpected load and effectively take it offline. Not having clients
[email protected]@ -9556,10 +9529,10 @@
[email protected]@ -9758,10 +9731,10 @@
  available, then effects are rendered with the ECMA\-48 SGR control
  function (aka ANSI escape codes).
  .sp
@@ -6897,8 +7158,22 @@
 +\&'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]@ -9770,19 +9743,19 @@
+ configuration:
+ .sp
+ .nf
+-.ft C
++.ft
+ [color]
+ terminfo.dim = \eE[2m
+-.ft P
++.ft
+ .fi
+ .sp
+-where \(aqE\(aq is substituted with an escape character.
++where 'E' is substituted with an escape character.
  .SS Labels
[email protected]@ -9566,8 +9539,8 @@
  .sp
  Text receives color effects depending on the labels that it has. Many
  default Mercurial commands emit labelled text. You can also define
@@ -6909,7 +7184,7 @@
  that case, effects given to the last label will override any other
  effects. This includes the special "none" effect, which nullifies
  other effects.
[email protected]@ -9575,18 +9548,18 @@
[email protected]@ -9790,18 +9763,18 @@
  Labels are normally invisible. In order to see these labels and their
  position in the text, use the global \-\-color=debug option. The same
  anchor text may be associated to multiple labels, e.g.
@@ -6933,7 +7208,7 @@
  [color]
  status.modified = blue bold underline red_background
  status.added = green bold
[email protected]@ -9595,7 +9568,7 @@
[email protected]@ -9810,7 +9783,7 @@
  status.unknown = magenta bold underline
  status.ignored = black bold
  
@@ -6942,7 +7217,7 @@
  status.clean = none
  status.copied = none
  
[email protected]@ -9640,7 +9613,7 @@
[email protected]@ -9855,7 +9828,7 @@
  shelve.name = blue bold
  
  histedit.remaining = red bold
@@ -6951,7 +7226,7 @@
  .fi
  .SS Custom colors
  .sp
[email protected]@ -9649,18 +9622,18 @@
[email protected]@ -9864,18 +9837,18 @@
  for your terminal type, assuming terminfo mode.  For instance:
  .sp
  .nf
@@ -6976,7 +7251,7 @@
  .SS Modes
  .sp
  By default, the color extension will use ANSI mode (or win32 mode on
[email protected]@ -9668,19 +9641,19 @@
[email protected]@ -9883,19 +9856,19 @@
  terminfo mode, for example), set the following configuration option:
  .sp
  .nf
@@ -7000,7 +7275,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]@ -9691,11 +9664,11 @@
[email protected]@ -9906,11 +9879,11 @@
  the pager is active:
  .sp
  .nf
@@ -7014,7 +7289,7 @@
  .fi
  .sp
  If \fBpagermode\fP is not defined, the \fBmode\fP will be used.
[email protected]@ -9709,13 +9682,13 @@
[email protected]@ -9924,13 +9897,13 @@
  convert a foreign SCM repository to a Mercurial one.:
  .sp
  .nf
@@ -7031,7 +7306,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
[email protected]@ -9743,10 +9716,10 @@
[email protected]@ -9958,10 +9931,10 @@
  .IP \(bu 2
  .
  Perforce [p4]
@@ -7044,7 +7319,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
[email protected]@ -9753,7 +9726,7 @@
[email protected]@ -9968,7 +9941,7 @@
  .IP \(bu 2
  .
  Subversion [svn] (history on branches is not preserved)
@@ -7053,7 +7328,7 @@
  .sp
  If no revision is given, all revisions will be converted.
  Otherwise, convert will only import up to the named revision
[email protected]@ -9761,12 +9734,12 @@
[email protected]@ -9976,12 +9949,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
@@ -7068,7 +7343,7 @@
  .TP
  .B \-\-branchsort
  .
[email protected]@ -9791,21 +9764,21 @@
[email protected]@ -10006,21 +9979,21 @@
  try to move closed revisions as close as possible
  to parent branches, only supported by Mercurial
  sources.
@@ -7096,7 +7371,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]@ -9814,9 +9787,9 @@
[email protected]@ -10029,9 +10002,9 @@
  author mapping and the line format is:
  .sp
  .nf
@@ -7108,7 +7383,7 @@
  .fi
  .sp
  Empty lines and lines starting with a \fB#\fP are ignored.
[email protected]@ -9826,13 +9799,13 @@
[email protected]@ -10041,13 +10014,13 @@
  directives:
  .sp
  .nf
@@ -7124,7 +7399,7 @@
  .fi
  .sp
  Comment lines start with \fB#\fP. A specified path matches if it
[email protected]@ -9865,9 +9838,9 @@
[email protected]@ -10080,9 +10053,9 @@
  comma\-separated values:
  .sp
  .nf
@@ -7136,7 +7411,7 @@
  .fi
  .sp
  The key is the revision ID in the source
[email protected]@ -9887,9 +9860,9 @@
[email protected]@ -10102,9 +10075,9 @@
  lines of the form:
  .sp
  .nf
@@ -7148,7 +7423,7 @@
  .fi
  .sp
  where "original_branch_name" is the name of the branch in the
[email protected]@ -9901,7 +9874,7 @@
[email protected]@ -10116,7 +10089,7 @@
  .sp
  The Mercurial source recognizes the following configuration
  options, which you can set on the command line with \fB\-\-config\fP:
@@ -7157,7 +7432,7 @@
  .TP
  .B convert.hg.ignoreerrors
  .
[email protected]@ -9923,7 +9896,7 @@
[email protected]@ -10138,7 +10111,7 @@
  .B convert.hg.revs
  .
  revset specifying the source revisions to convert.
@@ -7166,7 +7441,7 @@
  .SS CVS Source
  .sp
  CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
[email protected]@ -9937,7 +9910,7 @@
[email protected]@ -10152,7 +10125,7 @@
  sandbox is ignored.
  .sp
  The following options can be used with \fB\-\-config\fP:
@@ -7175,7 +7450,7 @@
  .TP
  .B convert.cvsps.cache
  .
[email protected]@ -9988,7 +9961,7 @@
[email protected]@ -10203,7 +10176,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.
@@ -7184,7 +7459,7 @@
  .sp
  An additional "debugcvsps" Mercurial command allows the builtin
  changeset merging code to be run without doing a conversion. Its
[email protected]@ -10008,7 +9981,7 @@
[email protected]@ -10223,7 +10196,7 @@
  detection.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -7193,7 +7468,7 @@
  .TP
  .B convert.svn.branches
  .
[email protected]@ -10030,28 +10003,28 @@
[email protected]@ -10245,28 +10218,28 @@
  use local time (as determined by the TZ
  environment variable) for changeset date/times. The default
  is False (use UTC).
@@ -7227,7 +7502,7 @@
  .TP
  .B convert.git.similarity
  .
[email protected]@ -10059,7 +10032,7 @@
[email protected]@ -10274,7 +10247,7 @@
  commit must be to be imported as renames or copies, as a
  percentage between \fB0\fP (disabled) and \fB100\fP (files must be
  identical). For example, \fB90\fP means that a delete/add pair will
@@ -7236,14 +7511,16 @@
  changed. The default is \fB50\fP.
  .TP
  .B convert.git.findcopiesharder
[email protected]@ -10073,13 +10046,13 @@
[email protected]@ -10337,7 +10310,7 @@
  .
  remote refs are converted as bookmarks with
  \fBconvert.git.remoteprefix\fP as a prefix followed by a /. The default
 -is \(aqremote\(aq.
 +is 'remote'.
  .TP
- .B convert.git.skipsubmodules
+ .B convert.git.saverev
+ .
[email protected]@ -10348,7 +10321,7 @@
  .
  does not convert root level .gitmodules files
  or files with 160000 mode indicating a submodule. Default is False.
@@ -7252,7 +7529,7 @@
  .SS Perforce Source
  .sp
  The Perforce (P4) importer can be given a p4 depot path or a
[email protected]@ -10090,7 +10063,7 @@
[email protected]@ -10359,7 +10332,7 @@
  target may be named \fB...\-hg\fP.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -7261,7 +7538,7 @@
  .TP
  .B convert.p4.encoding
  .
[email protected]@ -10102,7 +10075,7 @@
[email protected]@ -10371,7 +10344,7 @@
  .
  specify initial Perforce revision (a
  Perforce changelist number).
@@ -7270,7 +7547,7 @@
  .SS Mercurial Destination
  .sp
  The Mercurial destination will recognize Mercurial subrepositories in the
[email protected]@ -10114,7 +10087,7 @@
[email protected]@ -10383,7 +10356,7 @@
  An example showing how to convert a repository with subrepositories:
  .sp
  .nf
@@ -7279,7 +7556,7 @@
  # so convert knows the type when it sees a non empty destination
  $ hg init converted
  
[email protected]@ -10121,11 +10094,11 @@
[email protected]@ -10390,11 +10363,11 @@
  $ hg convert orig/sub1 converted/sub1
  $ hg convert orig/sub2 converted/sub2
  $ hg convert orig converted
@@ -7293,7 +7570,7 @@
  .TP
  .B convert.hg.clonebranches
  .
[email protected]@ -10144,22 +10117,22 @@
[email protected]@ -10413,22 +10386,22 @@
  .TP
  .B convert.hg.sourcename
  .
@@ -7321,7 +7598,7 @@
  .TP
  .BI \-\-authors \ <FILE>
  .
[email protected]@ -10212,7 +10185,7 @@
[email protected]@ -10481,7 +10454,7 @@
  .B \-\-closesort
  .
  try to reorder closed revisions
@@ -7330,7 +7607,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS eol
[email protected]@ -10226,7 +10199,7 @@
[email protected]@ -10495,7 +10468,7 @@
  .sp
  The extension reads its configuration from a versioned \fB.hgeol\fP
  configuration file found in the root of the working directory. The
@@ -7339,7 +7616,7 @@
  configuration files. It uses two sections, \fB[patterns]\fP and
  \fB[repository]\fP.
  .sp
[email protected]@ -10239,9 +10212,9 @@
[email protected]@ -10508,9 +10481,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,
@@ -7351,7 +7628,7 @@
  default behavior; it is only needed if you need to override a later,
  more general pattern.
  .sp
[email protected]@ -10258,7 +10231,7 @@
[email protected]@ -10527,7 +10500,7 @@
  Example versioned \fB.hgeol\fP file:
  .sp
  .nf
@@ -7360,7 +7637,7 @@
  [patterns]
  **.py = native
  **.vcproj = CRLF
[email protected]@ -10268,7 +10241,7 @@
[email protected]@ -10537,7 +10510,7 @@
  
  [repository]
  native = LF
@@ -7369,7 +7646,7 @@
  .fi
  .IP Note
  .
[email protected]@ -10280,12 +10253,12 @@
[email protected]@ -10549,12 +10522,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:
@@ -7384,7 +7661,7 @@
  generate an archive where files have line endings for Windows.
  .IP \(bu 2
  .
[email protected]@ -10299,7 +10272,7 @@
[email protected]@ -10568,7 +10541,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).
@@ -7393,7 +7670,7 @@
  .sp
  The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
  like the deprecated win32text extension does. This means that you can
[email protected]@ -10315,7 +10288,7 @@
[email protected]@ -10584,7 +10557,7 @@
  \fBeol.checkallhook\fP hook. These hooks are best used as
  \fBpretxnchangegroup\fP hooks.
  .sp
@@ -7402,7 +7679,7 @@
  used.
  .SS extdiff
  .sp
[email protected]@ -10328,12 +10301,12 @@
[email protected]@ -10597,12 +10570,12 @@
  files to compare.
  .sp
  The extdiff extension also allows you to configure new diff commands, so
@@ -7418,7 +7695,7 @@
  cdiff = gdiff \-Nprc5
  ## or the old way:
  #cmd.cdiff = gdiff
[email protected]@ -10349,20 +10322,20 @@
[email protected]@ -10618,20 +10591,20 @@
  # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
  # your .vimrc
  vimdiff = gvim \-f "+next" \e
@@ -7443,7 +7720,7 @@
  .fi
  .sp
  The extdiff extension will look in your [diff\-tools] and [merge\-tools]
[email protected]@ -10369,17 +10342,17 @@
[email protected]@ -10638,17 +10611,17 @@
  sections for diff tool arguments, when none are specified in [extdiff].
  .sp
  .nf
@@ -7465,7 +7742,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]@ -10388,9 +10361,9 @@
[email protected]@ -10657,9 +10630,9 @@
  use external program to diff repository (or selected files):
  .sp
  .nf
@@ -7477,7 +7754,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files, using
[email protected]@ -10409,7 +10382,7 @@
[email protected]@ -10678,7 +10651,7 @@
  to its parent.
  .sp
  Options:
@@ -7486,7 +7763,7 @@
  .TP
  .BI \-p,  \-\-program \ <CMD>
  .
[email protected]@ -10442,7 +10415,7 @@
[email protected]@ -10711,7 +10684,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -7495,7 +7772,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS factotum
[email protected]@ -10458,9 +10431,9 @@
[email protected]@ -10727,9 +10700,9 @@
  By default, keys are specified as:
  .sp
  .nf
@@ -7507,7 +7784,7 @@
  .fi
  .sp
  If the factotum extension is unable to read the required key, one will be
[email protected]@ -10470,12 +10443,12 @@
[email protected]@ -10739,12 +10712,12 @@
  default, these entries are:
  .sp
  .nf
@@ -7522,7 +7799,7 @@
  .fi
  .sp
  The executable entry defines the full path to the factotum binary. The
[email protected]@ -10490,9 +10463,9 @@
[email protected]@ -10759,9 +10732,9 @@
  pull changes from a remote repository, merge new changes if needed.:
  .sp
  .nf
@@ -7534,7 +7811,7 @@
  .fi
  .sp
  This finds all changes from the repository at the specified path
[email protected]@ -10507,12 +10480,12 @@
[email protected]@ -10776,12 +10749,12 @@
  the newly pulled changes. Local changes are then merged into the
  pulled changes. To switch the merge order, use \-\-switch\-parent.
  .sp
@@ -7549,7 +7826,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -10557,7 +10530,7 @@
[email protected]@ -10826,7 +10799,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -7557,8 +7834,66 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
- .SS gpg
[email protected]@ -10569,9 +10542,9 @@
+ .SS fsmonitor
[email protected]@ -10841,16 +10814,16 @@
+ system, with fsmonitor it takes about 0.3 seconds.
+ .sp
+ fsmonitor requires no configuration \-\- it will tell Watchman about your
+-repository as necessary. You\(aqll need to install Watchman from
+-\%https://facebook.github.io/watchman/\: and make sure it is in your PATH.
++repository as necessary. You'll need to install Watchman from
++https://facebook.github.io/watchman/ and make sure it is in your PATH.
+ .sp
+ The following configuration options exist:
+ .sp
+ .nf
+-.ft C
++.ft
+ [fsmonitor]
+ mode = {off, on, paranoid}
+-.ft P
++.ft
+ .fi
+ .sp
+ When \fImode = off\fP, fsmonitor will disable itself (similar to not loading the
[email protected]@ -10859,10 +10832,10 @@
+ and ensure that the results are consistent.
+ .sp
+ .nf
+-.ft C
++.ft
+ [fsmonitor]
+ timeout = (float)
+-.ft P
++.ft
+ .fi
+ .sp
+ A value, in seconds, that determines how long fsmonitor will wait for Watchman
[email protected]@ -10869,19 +10842,19 @@
+ to return results. Defaults to \fI2.0\fP.
+ .sp
+ .nf
+-.ft C
++.ft
+ [fsmonitor]
+ blacklistusers = (list of userids)
+-.ft P
++.ft
+ .fi
+ .sp
+ A list of usernames for which fsmonitor will disable itself altogether.
+ .sp
+ .nf
+-.ft C
++.ft
+ [fsmonitor]
+ walk_on_invalidate = (boolean)
+-.ft P
++.ft
+ .fi
+ .sp
+ Whether or not to walk the whole repo ourselves when our cached state has been
[email protected]@ -10903,9 +10876,9 @@
  verify all the signatures there may be for a particular revision:
  .sp
  .nf
@@ -7570,7 +7905,7 @@
  .fi
  .sp
  verify all the signatures there may be for a particular revision
[email protected]@ -10580,9 +10553,9 @@
[email protected]@ -10914,9 +10887,9 @@
  add a signature for the current or given revision:
  .sp
  .nf
@@ -7582,7 +7917,7 @@
  .fi
  .sp
  If no revision is given, the parent of the working directory is used,
[email protected]@ -10591,10 +10564,10 @@
[email protected]@ -10925,10 +10898,10 @@
  The \fBgpg.cmd\fP config setting can be used to specify the command
  to run. A default key can be specified with \fBgpg.key\fP.
  .sp
@@ -7595,7 +7930,7 @@
  .TP
  .B \-l,  \-\-local
  .
[email protected]@ -10627,15 +10600,15 @@
[email protected]@ -10961,15 +10934,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -7614,7 +7949,7 @@
  .fi
  .sp
  list signed changesets
[email protected]@ -10644,7 +10617,7 @@
[email protected]@ -10978,7 +10951,7 @@
  command to view revision graphs from a shell (DEPRECATED)
  .sp
  The functionality of this extension has been include in core Mercurial
@@ -7623,7 +7958,7 @@
  .sp
  This extension adds a \-\-graph option to the incoming, outgoing and log
  commands. When this options is given, an ASCII representation of the
[email protected]@ -10655,9 +10628,9 @@
[email protected]@ -10989,9 +10962,9 @@
  show revision history alongside an ASCII revision graph:
  .sp
  .nf
@@ -7635,7 +7970,7 @@
  .fi
  .sp
  Print a revision history alongside a revision graph drawn with
[email protected]@ -10666,10 +10639,10 @@
[email protected]@ -11000,10 +10973,10 @@
  Nodes printed as an @ character are parents of the working
  directory.
  .sp
@@ -7648,7 +7983,7 @@
  .TP
  .B \-f,  \-\-follow
  .
[email protected]@ -10758,7 +10731,7 @@
[email protected]@ -11092,7 +11065,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7656,26 +7991,8 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
- .SS hgcia
[email protected]@ -10769,7 +10742,7 @@
- configure it, set the following options in your hgrc:
- .sp
- .nf
--.ft C
-+.ft
- [cia]
- # your registered CIA user name
- user = foo
[email protected]@ -10801,7 +10774,7 @@
- [web]
- # If you want hyperlinks (optional)
- baseurl = http://server/path/to/repo
--.ft P
-+.ft
- .fi
  .SS hgk
- .sp
[email protected]@ -10813,19 +10786,18 @@
[email protected]@ -11105,19 +11078,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,
@@ -7702,7 +8019,7 @@
  .fi
  .sp
  hgk can make use of the extdiff extension to visualize revisions.
[email protected]@ -10832,10 +10804,10 @@
[email protected]@ -11124,10 +11096,10 @@
  Assuming you had already configured extdiff vdiff command, just add:
  .sp
  .nf
@@ -7715,7 +8032,7 @@
  .fi
  .sp
  Revisions context menu will now display additional entries to fire
[email protected]@ -10846,36 +10818,36 @@
[email protected]@ -11138,36 +11110,36 @@
  start interactive history viewer:
  .sp
  .nf
@@ -7760,7 +8077,7 @@
  .fi
  .sp
  \fBhighlightonlymatchfilename\fP will only highlight files if their type could
[email protected]@ -10890,7 +10862,7 @@
[email protected]@ -11182,7 +11154,7 @@
  is as follows, assuming the following history:
  .sp
  .nf
@@ -7769,7 +8086,7 @@
  @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
  |    Add delta
  |
[email protected]@ -10902,7 +10874,7 @@
[email protected]@ -11194,7 +11166,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -7778,7 +8095,7 @@
  .fi
  .sp
  If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
[email protected]@ -10909,7 +10881,7 @@
[email protected]@ -11201,7 +11173,7 @@
  file open in your editor:
  .sp
  .nf
@@ -7787,7 +8104,7 @@
  pick c561b4e977df Add beta
  pick 030b686bedc4 Add gamma
  pick 7c2fd3b9020c Add delta
[email protected]@ -10922,11 +10894,11 @@
[email protected]@ -11214,11 +11186,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -7801,7 +8118,7 @@
  .fi
  .sp
  In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
[email protected]@ -10935,7 +10907,7 @@
[email protected]@ -11227,7 +11199,7 @@
  would reorganize the file to look like this:
  .sp
  .nf
@@ -7810,7 +8127,7 @@
  pick 030b686bedc4 Add gamma
  pick c561b4e977df Add beta
  fold 7c2fd3b9020c Add delta
[email protected]@ -10948,11 +10920,11 @@
[email protected]@ -11240,11 +11212,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -7824,7 +8141,7 @@
  .fi
  .sp
  At which point you close the editor and \fBhistedit\fP starts working. When you
[email protected]@ -10960,21 +10932,21 @@
[email protected]@ -11252,21 +11224,21 @@
  those revisions together, offering you a chance to clean up the commit message:
  .sp
  .nf
@@ -7850,7 +8167,7 @@
  @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
  |    Add beta and delta.
  |
[email protected]@ -10983,12 +10955,12 @@
[email protected]@ -11275,12 +11247,12 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -7865,7 +8182,7 @@
  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]@ -10995,20 +10967,20 @@
[email protected]@ -11287,20 +11259,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
@@ -7892,7 +8209,7 @@
  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]@ -11018,7 +10990,7 @@
[email protected]@ -11310,7 +11282,7 @@
  changes, such that we have the following history:
  .sp
  .nf
@@ -7901,7 +8218,7 @@
  @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
  |    Add theta
  |
[email protected]@ -11039,7 +11011,7 @@
[email protected]@ -11331,7 +11303,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -7910,7 +8227,7 @@
  .fi
  .sp
  If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
[email protected]@ -11053,10 +11025,10 @@
[email protected]@ -11345,10 +11317,10 @@
  configuration file:
  .sp
  .nf
@@ -7923,7 +8240,7 @@
  .fi
  .sp
  \fBhg histedit\fP attempts to automatically choose an appropriate base
[email protected]@ -11064,10 +11036,10 @@
[email protected]@ -11356,10 +11328,10 @@
  revset in your configuration file:
  .sp
  .nf
@@ -7936,7 +8253,7 @@
  .fi
  .sp
  By default each edited revision needs to be present in histedit commands.
[email protected]@ -11075,10 +11047,10 @@
[email protected]@ -11367,10 +11339,10 @@
  the drop to be implicit for missing commits by adding:
  .sp
  .nf
@@ -7949,7 +8266,7 @@
  .fi
  .SS Commands
  .SS histedit
[email protected]@ -11086,15 +11058,15 @@
[email protected]@ -11378,15 +11350,15 @@
  interactively edit changeset history:
  .sp
  .nf
@@ -7968,7 +8285,7 @@
  .IP \(bu 2
  .
  \fIpick\fP to [re]order a changeset
[email protected]@ -11109,14 +11081,14 @@
[email protected]@ -11401,14 +11373,14 @@
  \fIfold\fP to combine it with the preceding changeset
  .IP \(bu 2
  .
@@ -7986,16 +8303,16 @@
  .IP \(bu 2
  .
  Specify ANCESTOR directly
[email protected]@ -11123,7 +11095,7 @@
[email protected]@ -11415,7 +11387,7 @@
  .IP \(bu 2
  .
  Use \-\-outgoing \-\- it will be the first linear changeset not
--included in destination. (See \%\fBhg help config.default\-push\fP\:)
-+included in destination. (See \fBhg help config.default\-push\fP)
+-included in destination. (See \%\fBhg help config.paths.default\-push\fP\:)
++included in destination. (See \fBhg help config.paths.default\-push\fP)
  .IP \(bu 2
  .
  Otherwise, the value from the "histedit.defaultrev" config option
[email protected]@ -11131,7 +11103,7 @@
[email protected]@ -11423,7 +11395,7 @@
  specified. The first revision returned by the revset is used. By
  default, this selects the editable history that is unique to the
  ancestry of the working directory.
@@ -8004,7 +8321,7 @@
  .sp
  If you use \-\-outgoing, this command will abort if there are ambiguous
  outgoing revisions. For example, if there are multiple branches
[email protected]@ -11139,13 +11111,13 @@
[email protected]@ -11431,13 +11403,13 @@
  .sp
  Use "min(outgoing() and ::.)" or similar revset specification
  instead of \-\-outgoing to specify edit target revision exactly in
@@ -8022,7 +8339,7 @@
  .IP \(bu 2
  .
  A number of changes have been made.
[email protected]@ -11154,9 +11126,9 @@
[email protected]@ -11446,9 +11418,9 @@
  Start history editing from revision 3:
  .sp
  .nf
@@ -8034,7 +8351,7 @@
  .fi
  .sp
  An editor opens, containing the list of revisions,
[email protected]@ -11163,11 +11135,11 @@
[email protected]@ -11455,11 +11427,11 @@
  with specific actions specified:
  .sp
  .nf
@@ -8048,7 +8365,7 @@
  .fi
  .sp
  Additional information about the possible actions
[email protected]@ -11175,14 +11147,14 @@
[email protected]@ -11467,14 +11439,14 @@
  .sp
  To remove revision 3 from the history,
  its action (at the beginning of the relevant line)
@@ -8066,7 +8383,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -11192,9 +11164,9 @@
[email protected]@ -11484,9 +11456,9 @@
  Start history editing from revision 2:
  .sp
  .nf
@@ -8078,7 +8395,7 @@
  .fi
  .sp
  An editor opens, containing the list of revisions,
[email protected]@ -11201,11 +11173,11 @@
[email protected]@ -11493,11 +11465,11 @@
  with specific actions specified:
  .sp
  .nf
@@ -8092,7 +8409,7 @@
  .fi
  .sp
  To swap revision 2 and 4, its lines are swapped
[email protected]@ -11212,15 +11184,15 @@
[email protected]@ -11504,15 +11476,15 @@
  in the editor:
  .sp
  .nf
@@ -8113,7 +8430,7 @@
  .sp
  Returns 0 on success, 1 if user intervention is required (not only
  for intentional "edit" command, but also for resolving unexpected
[email protected]@ -11227,7 +11199,7 @@
[email protected]@ -11519,7 +11491,7 @@
  conflicts).
  .sp
  Options:
@@ -8122,7 +8439,7 @@
  .TP
  .BI \-\-commands \ <FILE>
  .
[email protected]@ -11243,7 +11215,7 @@
[email protected]@ -11535,7 +11507,7 @@
  .TP
  .B \-k,  \-\-keep
  .
@@ -8131,7 +8448,7 @@
  .TP
  .B \-\-abort
  .
[email protected]@ -11260,7 +11232,7 @@
[email protected]@ -11552,7 +11524,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  first revision to be edited
@@ -8139,8 +8456,47 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
+ .SS journal
[email protected]@ -11567,9 +11539,9 @@
+ show the previous position of bookmarks and the working copy:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg journal [OPTION]... [BOOKMARKNAME]
+-.ft P
++.ft
+ .fi
+ .sp
+ The journal is used to see the previous commits that bookmarks and the
[email protected]@ -11577,7 +11549,7 @@
+ copy.  Passing a bookmark name will show all the previous positions of
+ that bookmark. Use the \-\-all switch to show previous locations for all
+ bookmarks and the working copy; each line will then include the bookmark
+-name, or \(aq.\(aq for the working copy, as well.
++name, or '.' for the working copy, as well.
+ .sp
+ If \fIname\fP starts with \fIre:\fP, the remainder of the name is treated as
+ a regular expression. To match a name that actually starts with \fIre:\fP,
[email protected]@ -11594,7 +11566,7 @@
+ \fIhg journal \-T json\fP can be used to produce machine readable output.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \-\-all
+ .
[email protected]@ -11627,7 +11599,7 @@
+ .BI \-T,  \-\-template \ <TEMPLATE>
+ .
+ display with template
+-.UNINDENT
++.RE
  .SS keyword
[email protected]@ -11283,7 +11255,7 @@
+ .sp
+ expand keywords in tracked files
[email protected]@ -11648,7 +11620,7 @@
  Example:
  .sp
  .nf
@@ -8149,7 +8505,7 @@
  [keyword]
  # expand keywords in every python file except those matching "x*"
  **.py =
[email protected]@ -11292,7 +11264,7 @@
[email protected]@ -11657,7 +11629,7 @@
  [keywordset]
  # prefer svn\- over cvs\-like default keywordmaps
  svn = True
@@ -8158,7 +8514,7 @@
  .fi
  .IP Note
  .
[email protected]@ -11301,11 +11273,11 @@
[email protected]@ -11666,11 +11638,11 @@
  .RE
  .sp
  For [keywordmaps] template mapping and expansion demonstration and
@@ -8172,7 +8528,7 @@
  .TP
  .B \fButcdate\fP
  .sp
[email protected]@ -11318,20 +11290,20 @@
[email protected]@ -11683,20 +11655,20 @@
  .B \fBsvnisodate\fP
  .sp
  "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
@@ -8199,7 +8555,7 @@
  {desc}" expands to the first line of the changeset description.
  .SS Commands
  .SS kwdemo
[email protected]@ -11339,9 +11311,9 @@
[email protected]@ -11704,9 +11676,9 @@
  print [keywordmaps] configuration and an expansion example:
  .sp
  .nf
@@ -8211,7 +8567,7 @@
  .fi
  .sp
  Show current, custom, or default keyword template maps and their
[email protected]@ -11352,10 +11324,10 @@
[email protected]@ -11717,10 +11689,10 @@
  .sp
  Use \-d/\-\-default to disable current configuration.
  .sp
@@ -8224,7 +8580,7 @@
  .TP
  .B \-d,  \-\-default
  .
[email protected]@ -11364,15 +11336,15 @@
[email protected]@ -11729,15 +11701,15 @@
  .BI \-f,  \-\-rcfile \ <FILE>
  .
  read maps from rcfile
@@ -8243,7 +8599,7 @@
  .fi
  .sp
  Run after (re)enabling keyword expansion.
[email protected]@ -11380,7 +11352,7 @@
[email protected]@ -11745,7 +11717,7 @@
  kwexpand refuses to run if given files contain local changes.
  .sp
  Options:
@@ -8252,7 +8608,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -11389,7 +11361,7 @@
[email protected]@ -11754,7 +11726,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8261,7 +8617,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwfiles
[email protected]@ -11397,9 +11369,9 @@
[email protected]@ -11762,9 +11734,9 @@
  show files configured for keyword expansion:
  .sp
  .nf
@@ -8273,7 +8629,7 @@
  .fi
  .sp
  List which files in the working directory are matched by the
[email protected]@ -11409,7 +11381,7 @@
[email protected]@ -11774,7 +11746,7 @@
  execution by including only files that are actual candidates for
  expansion.
  .sp
@@ -8282,7 +8638,7 @@
  inclusion and exclusion of files.
  .sp
  With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
[email protected]@ -11416,16 +11388,16 @@
[email protected]@ -11781,16 +11753,16 @@
  of files are:
  .sp
  .nf
@@ -8302,7 +8658,7 @@
  .TP
  .B \-A,  \-\-all
  .
[email protected]@ -11446,7 +11418,7 @@
[email protected]@ -11811,7 +11783,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8311,7 +8667,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwshrink
[email protected]@ -11454,9 +11426,9 @@
[email protected]@ -11819,9 +11791,9 @@
  revert expanded keywords in the working directory:
  .sp
  .nf
@@ -8323,7 +8679,7 @@
  .fi
  .sp
  Must be run before changing/disabling active keywords.
[email protected]@ -11464,7 +11436,7 @@
[email protected]@ -11829,7 +11801,7 @@
  kwshrink refuses to run if given files contain local changes.
  .sp
  Options:
@@ -8332,7 +8688,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
[email protected]@ -11473,7 +11445,7 @@
[email protected]@ -11838,7 +11810,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8341,7 +8697,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS largefiles
[email protected]@ -11482,10 +11454,10 @@
[email protected]@ -11847,10 +11819,10 @@
  .sp
  Large binary files tend to be not very compressible, not very
  diffable, and not at all mergeable. Such files are not handled
@@ -8354,7 +8710,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]@ -11497,18 +11469,18 @@
[email protected]@ -11862,18 +11834,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
@@ -8371,14 +8727,13 @@
 +.ft
  $ dd if=/dev/urandom of=randomdata count=2000
  $ hg add \-\-large randomdata
--$ hg commit \-m \(aqadd randomdata as a largefile\(aq
--.ft P
-+$ hg commit \-m 'add randomdata as a largefile'
+ $ hg commit \-m "add randomdata as a largefile"
+-.ft P
 +.ft
  .fi
  .sp
  When you push a changeset that adds/modifies largefiles to a remote
[email protected]@ -11525,8 +11497,8 @@
[email protected]@ -11890,8 +11862,8 @@
  copy to the latest pulled revision (and thereby downloading any new
  largefiles).
  .sp
@@ -8389,7 +8744,7 @@
  .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]@ -11545,12 +11517,12 @@
[email protected]@ -11910,12 +11882,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
@@ -8405,7 +8760,7 @@
  .fi
  .sp
  In repositories that already have largefiles in them, any new file
[email protected]@ -11560,20 +11532,20 @@
[email protected]@ -11925,20 +11897,20 @@
  \-\-lfsize option to the add command (also in megabytes):
  .sp
  .nf
@@ -8430,7 +8785,7 @@
  [largefiles]
  patterns =
    *.jpg
[email protected]@ -11580,7 +11552,7 @@
[email protected]@ -11945,7 +11917,7 @@
    re:.*\e.(png|bmp)$
    library.zip
    content/audio/*
@@ -8439,7 +8794,7 @@
  .fi
  .sp
  Files that match one of these patterns will be added as largefiles
[email protected]@ -11589,7 +11561,7 @@
[email protected]@ -11954,7 +11926,7 @@
  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
@@ -8448,7 +8803,7 @@
  command.
  .SS Commands
  .SS lfconvert
[email protected]@ -11597,9 +11569,9 @@
[email protected]@ -11962,9 +11934,9 @@
  convert a normal repository to a largefiles repository:
  .sp
  .nf
@@ -8460,7 +8815,7 @@
  .fi
  .sp
  Convert repository SOURCE to a new repository DEST, identical to
[email protected]@ -11619,7 +11591,7 @@
[email protected]@ -11984,7 +11956,7 @@
  this, the DEST repository can be used without largefiles at all.
  .sp
  Options:
@@ -8469,7 +8824,7 @@
  .TP
  .BI \-s,  \-\-size \ <SIZE>
  .
[email protected]@ -11628,33 +11600,33 @@
[email protected]@ -11993,33 +11965,33 @@
  .B \-\-to\-normal
  .
  convert from a largefiles repo to a normal repo
@@ -8511,7 +8866,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -11661,14 +11633,14 @@
[email protected]@ -12026,14 +11998,14 @@
  pull largefiles on the default branch:
  .sp
  .nf
@@ -8530,7 +8885,7 @@
  .TP
  .BI \-r,  \-\-rev \ <VALUE[+]>
  .
[email protected]@ -11685,7 +11657,7 @@
[email protected]@ -12050,7 +12022,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -8538,8 +8893,30 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
- .SS mq
[email protected]@ -11699,10 +11671,10 @@
+ .SS logtoprocess
[email protected]@ -12066,7 +12038,7 @@
+ prefixed with \fIOPT_\fP). The original event name is passed in the \fIEVENT\fP
+ environment variable, and the process ID of mercurial is given in \fIHGPID\fP.
+ .sp
+-So given a call \fIui.log(\(aqfoo\(aq, \(aqbar\(aq, \(aqbaz\(aq, spam=\(aqeggs\(aq), a script configured
++So given a call \fIui.log('foo', 'bar', 'baz', spam='eggs'), a script configured
+ for the \(gafoo\fP event can expect an environment with \fIMSG1=bar\fP, \fIMSG2=baz\fP, and
+ \fIOPT_SPAM=eggs\fP.
+ .sp
[email protected]@ -12074,10 +12046,10 @@
+ For example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [logtoprocess]
+ commandexception = echo "$MSG2$MSG3" > /var/log/mercurial_exceptions.log
+-.ft P
++.ft
+ .fi
+ .sp
+ would log the warning message and traceback of any failed command dispatch.
[email protected]@ -12095,10 +12067,10 @@
  Known patches are represented as patch files in the .hg/patches
  directory. Applied patches are both patch files and changesets.
  .sp
@@ -8552,7 +8929,7 @@
  create new patch                          qnew
  import existing patch                     qimport
  
[email protected]@ -11712,7 +11684,7 @@
[email protected]@ -12108,7 +12080,7 @@
  add known patch to applied stack          qpush
  remove patch from applied stack           qpop
  refresh contents of top applied patch     qrefresh
@@ -8561,7 +8938,7 @@
  .fi
  .sp
  By default, mq will automatically use git patches when required to
[email protected]@ -11720,29 +11692,29 @@
[email protected]@ -12116,29 +12088,29 @@
  files creations or deletions. This behavior can be configured with:
  .sp
  .nf
@@ -8600,7 +8977,7 @@
  .sp
  If the working directory contains uncommitted files, qpush, qpop and
  qgoto abort immediately. If \-f/\-\-force is used, the changes are
[email protected]@ -11749,10 +11721,10 @@
[email protected]@ -12145,10 +12117,10 @@
  discarded. Setting:
  .sp
  .nf
@@ -8613,7 +8990,7 @@
  .fi
  .sp
  make them behave as if \-\-keep\-changes were passed, and non\-conflicting
[email protected]@ -11767,15 +11739,15 @@
[email protected]@ -12163,15 +12135,15 @@
  print the patches already applied:
  .sp
  .nf
@@ -8632,7 +9009,7 @@
  .TP
  .B \-1,  \-\-last
  .
[email protected]@ -11784,15 +11756,15 @@
[email protected]@ -12180,15 +12152,15 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -8651,7 +9028,7 @@
  .fi
  .sp
  If source is local, destination will have no patches applied. If
[email protected]@ -11805,12 +11777,12 @@
[email protected]@ -12201,12 +12173,12 @@
  default. Use \-p <url> to change.
  .sp
  The patch directory must be a nested Mercurial repository, as
@@ -8666,7 +9043,7 @@
  .TP
  .B \-\-pull
  .
[email protected]@ -11839,21 +11811,21 @@
[email protected]@ -12235,21 +12207,21 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -8693,7 +9070,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -11906,23 +11878,23 @@
[email protected]@ -12302,23 +12274,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -8724,7 +9101,7 @@
  .fi
  .sp
  The patches must not be applied, and at least one patch is required. Exact
[email protected]@ -11930,10 +11902,10 @@
[email protected]@ -12326,10 +12298,10 @@
  preserved in the patch directory.
  .sp
  To stop managing a patch and move it into permanent history,
@@ -8737,7 +9114,7 @@
  .TP
  .B \-k,  \-\-keep
  .
[email protected]@ -11942,23 +11914,23 @@
[email protected]@ -12338,23 +12310,23 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  stop managing a revision (DEPRECATED)
@@ -8768,7 +9145,7 @@
  .fi
  .sp
  Shows a diff which includes the current patch as well as any
[email protected]@ -11966,8 +11938,8 @@
[email protected]@ -12362,8 +12334,8 @@
  last refresh (thus showing what the current patch would become
  after a qrefresh).
  .sp
@@ -8779,7 +9156,7 @@
  made by the current patch without including changes made since the
  qrefresh.
  .sp
[email protected]@ -11974,7 +11946,7 @@
[email protected]@ -12370,7 +12342,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8788,7 +9165,7 @@
  .TP
  .B \-a,  \-\-text
  .
[email protected]@ -12031,7 +12003,7 @@
[email protected]@ -12427,7 +12399,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8797,7 +9174,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qfinish
[email protected]@ -12039,9 +12011,9 @@
[email protected]@ -12435,9 +12407,9 @@
  move applied patches into repository history:
  .sp
  .nf
@@ -8809,7 +9186,7 @@
  .fi
  .sp
  Finishes the specified revisions (corresponding to applied
[email protected]@ -12060,20 +12032,20 @@
[email protected]@ -12456,20 +12428,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8834,7 +9211,7 @@
  .fi
  .sp
  Patches must not yet be applied. Each patch will be successively
[email protected]@ -12089,7 +12061,7 @@
[email protected]@ -12485,7 +12457,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8843,7 +9220,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -12106,21 +12078,21 @@
[email protected]@ -12502,21 +12474,21 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -8869,7 +9246,7 @@
  .TP
  .B \-\-keep\-changes
  .
[email protected]@ -12133,21 +12105,21 @@
[email protected]@ -12529,21 +12501,21 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -8896,7 +9273,7 @@
  has activated it.
  .sp
  With no arguments, print the currently active guards.
[email protected]@ -12154,21 +12126,21 @@
[email protected]@ -12550,21 +12522,21 @@
  With arguments, set guards for the named patch.
  .IP Note
  .
@@ -8922,7 +9299,7 @@
  .TP
  .B \-l,  \-\-list
  .
[email protected]@ -12177,15 +12149,15 @@
[email protected]@ -12573,15 +12545,15 @@
  .B \-n,  \-\-none
  .
  drop all guards
@@ -8941,7 +9318,7 @@
  .fi
  .sp
  Returns 0 on success.
[email protected]@ -12194,9 +12166,9 @@
[email protected]@ -12590,9 +12562,9 @@
  import a patch or existing changeset:
  .sp
  .nf
@@ -8953,7 +9330,7 @@
  .fi
  .sp
  The patch is inserted into the series after the last applied
[email protected]@ -12217,7 +12189,7 @@
[email protected]@ -12613,7 +12585,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
@@ -8962,7 +9339,7 @@
  from mq control.
  .sp
  To import a patch from standard input, pass \- as the patch file.
[email protected]@ -12227,15 +12199,15 @@
[email protected]@ -12623,15 +12595,15 @@
  To import an existing patch while renaming it:
  .sp
  .nf
@@ -8981,7 +9358,7 @@
  .TP
  .B \-e,  \-\-existing
  .
[email protected]@ -12260,7 +12232,7 @@
[email protected]@ -12656,7 +12628,7 @@
  .B \-P,  \-\-push
  .
  qpush after importing
@@ -8990,7 +9367,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qinit
[email protected]@ -12268,9 +12240,9 @@
[email protected]@ -12664,9 +12636,9 @@
  init a new queue repository (DEPRECATED):
  .sp
  .nf
@@ -9002,7 +9379,7 @@
  .fi
  .sp
  The queue repository is unversioned by default. If
[email protected]@ -12279,24 +12251,24 @@
[email protected]@ -12675,24 +12647,24 @@
  an unversioned patch repository into a versioned one). You can use
  qcommit to commit changes to this queue repository.
  .sp
@@ -9033,7 +9410,7 @@
  .fi
  .sp
  qnew creates a new patch on top of the currently\-applied patch (if
[email protected]@ -12312,7 +12284,7 @@
[email protected]@ -12708,7 +12680,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
@@ -9042,7 +9419,7 @@
  .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]@ -12322,7 +12294,7 @@
[email protected]@ -12718,7 +12690,7 @@
  Returns 0 on successful creation of a new patch.
  .sp
  Options:
@@ -9051,7 +9428,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -12367,7 +12339,7 @@
[email protected]@ -12763,7 +12735,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -9060,7 +9437,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qnext
[email protected]@ -12375,28 +12347,28 @@
[email protected]@ -12771,28 +12743,28 @@
  print the name of the next pushable patch:
  .sp
  .nf
@@ -9095,7 +9472,7 @@
  .fi
  .sp
  Without argument, pops off the top of the patch stack. If given a
[email protected]@ -12411,7 +12383,7 @@
[email protected]@ -12807,7 +12779,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -9104,7 +9481,7 @@
  .TP
  .B \-a,  \-\-all
  .
[email protected]@ -12432,34 +12404,34 @@
[email protected]@ -12828,34 +12800,34 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -9146,7 +9523,7 @@
  .fi
  .sp
  By default, abort if the working directory contains uncommitted
[email protected]@ -12470,7 +12442,7 @@
[email protected]@ -12866,7 +12838,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -9155,7 +9532,7 @@
  .TP
  .B \-\-keep\-changes
  .
[email protected]@ -12507,15 +12479,15 @@
[email protected]@ -12903,15 +12875,15 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -9174,7 +9551,7 @@
  .fi
  .sp
  Supports switching between different patch queues, as well as creating
[email protected]@ -12537,7 +12509,7 @@
[email protected]@ -12933,7 +12905,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9183,7 +9560,7 @@
  .TP
  .B \-l,  \-\-list
  .
[email protected]@ -12562,15 +12534,15 @@
[email protected]@ -12958,15 +12930,15 @@
  .B \-\-purge
  .
  delete queue, and remove patch dir
@@ -9202,7 +9579,7 @@
  .fi
  .sp
  If any file patterns are provided, the refreshed patch will
[email protected]@ -12592,7 +12564,7 @@
[email protected]@ -12988,7 +12960,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9211,7 +9588,7 @@
  .TP
  .B \-e,  \-\-edit
  .
[email protected]@ -12637,7 +12609,7 @@
[email protected]@ -13033,7 +13005,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -9220,7 +9597,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qrename
[email protected]@ -12645,9 +12617,9 @@
[email protected]@ -13041,9 +13013,9 @@
  rename a patch:
  .sp
  .nf
@@ -9232,7 +9609,7 @@
  .fi
  .sp
  With one argument, renames the current patch to PATCH1.
[email protected]@ -12654,26 +12626,26 @@
[email protected]@ -13050,26 +13022,26 @@
  With two arguments, renames PATCH1 to PATCH2.
  .sp
  Returns 0 on success.
@@ -9267,7 +9644,7 @@
  .TP
  .B \-d,  \-\-delete
  .
[email protected]@ -12682,21 +12654,21 @@
[email protected]@ -13078,21 +13050,21 @@
  .B \-u,  \-\-update
  .
  update queue working directory
@@ -9294,7 +9671,7 @@
  .TP
  .B \-c,  \-\-copy
  .
[email protected]@ -12721,18 +12693,18 @@
[email protected]@ -13117,18 +13089,18 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -9317,7 +9694,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]@ -12739,11 +12711,11 @@
[email protected]@ -13135,11 +13107,11 @@
  match the current guard. For example:
  .sp
  .nf
@@ -9331,7 +9708,7 @@
  .fi
  .sp
  This activates the "stable" guard. mq will skip foo.patch (because
[email protected]@ -12769,7 +12741,7 @@
[email protected]@ -13165,7 +13137,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9340,7 +9717,7 @@
  .TP
  .B \-n,  \-\-none
  .
[email protected]@ -12786,21 +12758,21 @@
[email protected]@ -13182,21 +13154,21 @@
  .B \-\-reapply
  .
  pop, then reapply patches
@@ -9366,7 +9743,7 @@
  .TP
  .B \-m,  \-\-missing
  .
[email protected]@ -12809,40 +12781,40 @@
[email protected]@ -13205,40 +13177,40 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -9415,7 +9792,7 @@
  .TP
  .B \-1,  \-\-first
  .
[email protected]@ -12851,7 +12823,7 @@
[email protected]@ -13247,7 +13219,7 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -9424,7 +9801,7 @@
  .SS notify
  .sp
  hooks for sending email push notifications
[email protected]@ -12859,13 +12831,13 @@
[email protected]@ -13255,13 +13227,13 @@
  This extension implements hooks to send email notifications when
  changesets are sent from or received by the local repository.
  .sp
@@ -9440,7 +9817,7 @@
  [hooks]
  # one email for each incoming changeset
  incoming.notify = python:hgext.notify.hook
[email protected]@ -12874,7 +12846,7 @@
[email protected]@ -13270,7 +13242,7 @@
  
  # one email for all outgoing changesets
  outgoing.notify = python:hgext.notify.hook
@@ -9449,7 +9826,7 @@
  .fi
  .sp
  This registers the hooks. To enable notification, subscribers must
[email protected]@ -12883,7 +12855,7 @@
[email protected]@ -13279,7 +13251,7 @@
  multiple recipients to a single repository:
  .sp
  .nf
@@ -9458,7 +9835,7 @@
  [usersubs]
  # key is subscriber email, value is a comma\-separated list of repo patterns
  [email protected] = pattern
[email protected]@ -12891,7 +12863,7 @@
[email protected]@ -13287,7 +13259,7 @@
  [reposubs]
  # key is repo pattern, value is a comma\-separated list of subscriber emails
  pattern = [email protected]
@@ -9467,7 +9844,7 @@
  .fi
  .sp
  A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
[email protected]@ -12899,10 +12871,10 @@
[email protected]@ -13295,10 +13267,10 @@
  present, is separated from the glob by a hash. Example:
  .sp
  .nf
@@ -9480,7 +9857,7 @@
  .fi
  .sp
  This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
[email protected]@ -12913,10 +12885,10 @@
[email protected]@ -13309,10 +13281,10 @@
  incorporated by reference:
  .sp
  .nf
@@ -9493,7 +9870,7 @@
  .fi
  .sp
  Notifications will not be sent until the \fBnotify.test\fP value is set
[email protected]@ -12923,7 +12895,7 @@
[email protected]@ -13319,7 +13291,7 @@
  to \fBFalse\fP; see below.
  .sp
  Notifications content can be tweaked with the following configuration entries:
@@ -9502,7 +9879,7 @@
  .TP
  .B notify.test
  .
[email protected]@ -12932,8 +12904,8 @@
[email protected]@ -13328,8 +13300,8 @@
  .B notify.sources
  .
  Space\-separated list of change sources. Notifications are activated only
@@ -9513,7 +9890,7 @@
  .TP
  .B \fBserve\fP
  .sp
[email protected]@ -12954,7 +12926,7 @@
[email protected]@ -13350,7 +13322,7 @@
  .B \fBbundle\fP
  .sp
  changesets sent via \fBhg unbundle\fP
@@ -9522,7 +9899,7 @@
  .sp
  Default: serve.
  .TP
[email protected]@ -12997,7 +12969,7 @@
[email protected]@ -13393,7 +13365,7 @@
  .TP
  .B notify.maxsubject
  .
@@ -9531,7 +9908,7 @@
  .TP
  .B notify.diffstat
  .
[email protected]@ -13016,11 +12988,11 @@
[email protected]@ -13412,11 +13384,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.
@@ -9545,7 +9922,7 @@
  .TP
  .B email.from
  .
[email protected]@ -13031,7 +13003,7 @@
[email protected]@ -13427,7 +13399,7 @@
  .
  Root repository URL to combine with repository paths when making
  references. See also \fBnotify.strip\fP.
@@ -9554,7 +9931,7 @@
  .SS pager
  .sp
  browse command output with an external pager
[email protected]@ -13039,10 +13011,10 @@
[email protected]@ -13435,10 +13407,10 @@
  To set the pager that should be used, set the application variable:
  .sp
  .nf
@@ -9567,7 +9944,7 @@
  .fi
  .sp
  If no pager is set, the pager extensions uses the environment variable
[email protected]@ -13052,10 +13024,10 @@
[email protected]@ -13448,10 +13420,10 @@
  pager.ignore list:
  .sp
  .nf
@@ -9580,7 +9957,7 @@
  .fi
  .sp
  You can also enable the pager only for certain commands using
[email protected]@ -13062,10 +13034,10 @@
[email protected]@ -13458,10 +13430,10 @@
  pager.attend. Below is the default list of commands to be paged:
  .sp
  .nf
@@ -9593,7 +9970,7 @@
  .fi
  .sp
  Setting pager.attend to an empty value will cause all commands to be
[email protected]@ -13078,13 +13050,13 @@
[email protected]@ -13474,13 +13446,13 @@
  existing attend and ignore options and defaults:
  .sp
  .nf
@@ -9610,7 +9987,7 @@
  to specify them in your user configuration file.
  .sp
  To control whether the pager is used at all for an individual command,
[email protected]@ -13091,12 +13063,12 @@
[email protected]@ -13487,12 +13459,12 @@
  you can use \-\-pager=<value>:
  .sp
  .nf
@@ -9625,7 +10002,7 @@
  .fi
  .SS patchbomb
  .sp
[email protected]@ -13108,7 +13080,7 @@
[email protected]@ -13504,7 +13476,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:
@@ -9634,7 +10011,7 @@
  .IP \(bu 2
  .
  The changeset description.
[email protected]@ -13117,8 +13089,8 @@
[email protected]@ -13513,8 +13485,8 @@
  [Optional] The result of running diffstat on the patch.
  .IP \(bu 2
  .
@@ -9645,7 +10022,7 @@
  .sp
  Each message refers to the first in the series using the In\-Reply\-To
  and References headers, so they will show up as a sequence in threaded
[email protected]@ -13128,7 +13100,7 @@
[email protected]@ -13524,7 +13496,7 @@
  configuration file:
  .sp
  .nf
@@ -9654,7 +10031,7 @@
  [email]
  from = My Name <[email protected]>
  to = recipient1, recipient2, ...
[email protected]@ -13135,13 +13107,13 @@
[email protected]@ -13531,13 +13503,13 @@
  cc = cc1, cc2, ...
  bcc = bcc1, bcc2, ...
  reply\-to = address1, address2, ...
@@ -9670,7 +10047,7 @@
  changesets as a patchbomb.
  .sp
  You can also either configure the method option in the email section
[email protected]@ -13150,15 +13122,15 @@
[email protected]@ -13546,15 +13518,15 @@
  directly from the commandline. See the [email] and [smtp] sections in
  hgrc(5) for details.
  .sp
@@ -9689,7 +10066,7 @@
  .fi
  .sp
  You can control the default inclusion of an introduction message with the
[email protected]@ -13166,12 +13138,12 @@
[email protected]@ -13562,12 +13534,12 @@
  overwritten by command line flags like \-\-intro and \-\-desc:
  .sp
  .nf
@@ -9704,7 +10081,7 @@
  .fi
  .sp
  You can set patchbomb to always ask for confirmation by setting
[email protected]@ -13182,13 +13154,13 @@
[email protected]@ -13578,13 +13550,13 @@
  send changesets by email:
  .sp
  .nf
@@ -9721,7 +10098,7 @@
  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]@ -13199,7 +13171,7 @@
[email protected]@ -13595,7 +13567,7 @@
  With the \-d/\-\-diffstat option, if the diffstat program is
  installed, the result of running diffstat on the patch is inserted.
  .sp
@@ -9730,7 +10107,7 @@
  .sp
  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]@ -13219,7 +13191,7 @@
[email protected]@ -13615,7 +13587,7 @@
  With \-b/\-\-bundle, changesets are selected as for \-\-outgoing, but a
  single email containing a binary Mercurial bundle as an attachment
  will be sent. Use the \fBpatchbomb.bundletype\fP config option to
@@ -9739,7 +10116,7 @@
  .sp
  With \-m/\-\-mbox, instead of previewing each patchbomb message in a
  pager or sending the messages directly, it will create a UNIX
[email protected]@ -13238,12 +13210,12 @@
[email protected]@ -13634,12 +13606,12 @@
  introductory message in \fB.hg/last\-email.txt\fP.
  .sp
  The default behavior of this command can be customized through
@@ -9754,7 +10131,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]@ -13264,7 +13236,7 @@
[email protected]@ -13660,7 +13632,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
@@ -9763,7 +10140,7 @@
  .fi
  .sp
  Before using this command, you will need to enable email in your
[email protected]@ -13271,7 +13243,7 @@
[email protected]@ -13667,7 +13639,7 @@
  hgrc. See the [email] section in hgrc(5) for details.
  .sp
  Options:
@@ -9772,7 +10149,7 @@
  .TP
  .B \-g,  \-\-git
  .
[email protected]@ -13388,7 +13360,7 @@
[email protected]@ -13784,7 +13756,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -9781,7 +10158,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS purge
[email protected]@ -13400,9 +13372,9 @@
[email protected]@ -13796,9 +13768,9 @@
  removes files not tracked by Mercurial:
  .sp
  .nf
@@ -9793,7 +10170,7 @@
  .fi
  .sp
  Delete files not known to Mercurial. This is useful to test local
[email protected]@ -13409,18 +13381,18 @@
[email protected]@ -13805,18 +13777,18 @@
  and uncommitted changes in an otherwise\-clean source tree.
  .sp
  This means that purge will delete the following by default:
@@ -9816,7 +10193,7 @@
  .IP \(bu 2
  .
  Modified and unmodified tracked files
[email protected]@ -13429,8 +13401,8 @@
[email protected]@ -13825,8 +13797,8 @@
  Ignored files (unless \-\-all is specified)
  .IP \(bu 2
  .
@@ -9827,7 +10204,7 @@
  .sp
  The \-\-files and \-\-dirs options can be used to direct purge to delete
  only files, only directories, or both. If neither option is given,
[email protected]@ -13445,7 +13417,7 @@
[email protected]@ -13841,7 +13813,7 @@
  option.
  .sp
  Options:
@@ -9836,7 +10213,7 @@
  .TP
  .B \-a,  \-\-abort\-on\-err
  .
[email protected]@ -13478,15 +13450,15 @@
[email protected]@ -13874,15 +13846,15 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9857,7 +10234,7 @@
  .SS rebase
  .sp
  command to move sets of revisions to a different ancestor
[email protected]@ -13495,7 +13467,7 @@
[email protected]@ -13891,7 +13863,7 @@
  repository.
  .sp
  For more information:
@@ -9866,7 +10243,7 @@
  .SS Commands
  .SS rebase
  .sp
[email protected]@ -13502,9 +13474,9 @@
[email protected]@ -13898,9 +13870,9 @@
  move changeset (and descendants) to a different branch:
  .sp
  .nf
@@ -9878,7 +10255,7 @@
  .fi
  .sp
  Rebase uses repeated merging to graft changesets from one part of
[email protected]@ -13512,18 +13484,18 @@
[email protected]@ -13908,11 +13880,11 @@
  useful for linearizing \fIlocal\fP changes relative to a master
  development tree.
  .sp
@@ -9887,11 +10264,15 @@
 +Published commits cannot be rebased (see \fBhg help phases\fP).
 +To copy commits, see \fBhg help graft\fP.
  .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 current branch tip as the destination. (The
- destination changeset is not modified by rebasing, but new
- changesets are added as its descendants.)
+-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP), rebase
+-will use the same logic as \%\fBhg merge\fP\: to pick a destination.  if
++If you don't specify a destination changeset (\fB\-d/\-\-dest\fP), rebase
++will use the same logic as \fBhg merge\fP to pick a destination.  if
+ the current branch contains exactly one other head, the other head
+ is merged with by default.  Otherwise, an explicit revision with
+ which to merge with must be provided.  (destination changeset is not
[email protected]@ -13920,9 +13892,9 @@
+ descendants.)
  .sp
  Here are the ways to select changesets:
 -.INDENT 0.0
@@ -9903,7 +10284,7 @@
  .IP 1. 3
  .
  Explicitly select them using \fB\-\-rev\fP.
[email protected]@ -13539,9 +13511,9 @@
[email protected]@ -13938,9 +13910,9 @@
  .
  If you do not specify any of \fB\-\-rev\fP, \fBsource\fP, or \fB\-\-base\fP,
  rebase will use \fB\-\-base .\fP as above.
@@ -9916,7 +10297,16 @@
  .sp
  Rebase will destroy original changesets unless you use \fB\-\-keep\fP.
  It will also move your bookmarks (even if you do).
[email protected]@ -13557,7 +13529,7 @@
[email protected]@ -13953,7 +13925,7 @@
+ and/or destination.
+ .sp
+ If you need to use a tool to automate merge/conflict decisions, you
+-can specify one with \fB\-\-tool\fP, see \%\fBhg help merge\-tools\fP\:.
++can specify one with \fB\-\-tool\fP, see \fBhg help merge\-tools\fP.
+ As a caveat: the tool will not be used to mediate when a file was
+ deleted, there is no hook presently available for this.
+ .sp
[email protected]@ -13961,7 +13933,7 @@
  continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
  .sp
  Examples:
@@ -9925,7 +10315,7 @@
  .IP \(bu 2
  .
  move "local changes" (current commit back to branching point)
[email protected]@ -13564,9 +13536,9 @@
[email protected]@ -13968,9 +13940,9 @@
  to the current branch tip after a pull:
  .sp
  .nf
@@ -9937,7 +10327,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -13573,9 +13545,9 @@
[email protected]@ -13977,9 +13949,9 @@
  move a single changeset to the stable branch:
  .sp
  .nf
@@ -9949,7 +10339,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -13582,9 +13554,9 @@
[email protected]@ -13986,9 +13958,9 @@
  splice a commit and all its descendants onto another part of history:
  .sp
  .nf
@@ -9961,7 +10351,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -13592,9 +13564,9 @@
[email protected]@ -13996,9 +13968,9 @@
  default branch:
  .sp
  .nf
@@ -9973,7 +10363,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -13601,9 +13573,9 @@
[email protected]@ -14005,9 +13977,9 @@
  collapse a sequence of changes into a single commit:
  .sp
  .nf
@@ -9985,7 +10375,7 @@
  .fi
  .IP \(bu 2
  .
[email protected]@ -13610,17 +13582,17 @@
[email protected]@ -14014,17 +13986,17 @@
  move a named branch while preserving its name:
  .sp
  .nf
@@ -10007,7 +10397,7 @@
  .TP
  .BI \-s,  \-\-source \ <REV>
  .
[email protected]@ -13689,7 +13661,7 @@
[email protected]@ -14093,7 +14065,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -10016,7 +10406,16 @@
  .sp
  [+] marked option can be specified multiple times
  .SS record
[email protected]@ -13701,12 +13673,12 @@
[email protected]@ -14101,7 +14073,7 @@
+ commands to interactively select changes for commit/qrefresh (DEPRECATED)
+ .sp
+ The feature provided by this extension has been moved into core Mercurial as
+-\%\fBhg commit \-\-interactive\fP\:.
++\fBhg commit \-\-interactive\fP.
+ .SS Commands
+ .SS qrecord
+ .sp
[email protected]@ -14108,12 +14080,12 @@
  interactively record a new patch:
  .sp
  .nf
@@ -10032,7 +10431,7 @@
  usage.
  .SS record
  .sp
[email protected]@ -13713,15 +13685,15 @@
[email protected]@ -14120,15 +14092,15 @@
  interactively select changes to commit:
  .sp
  .nf
@@ -10052,7 +10451,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]@ -13729,7 +13701,7 @@
[email protected]@ -14136,7 +14108,7 @@
  possible:
  .sp
  .nf
@@ -10061,7 +10460,7 @@
  y \- record this change
  n \- skip this change
  e \- edit this change manually
[email protected]@ -13742,13 +13714,13 @@
[email protected]@ -14149,13 +14121,13 @@
  q \- quit, recording no changes
  
  ? \- display help
@@ -10077,7 +10476,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -13809,7 +13781,7 @@
[email protected]@ -14216,7 +14188,7 @@
  .B \-B,  \-\-ignore\-blank\-lines
  .
  ignore changes whose lines are all blank
@@ -10086,7 +10485,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS relink
[email protected]@ -13821,9 +13793,9 @@
[email protected]@ -14228,9 +14200,9 @@
  recreate hardlinks between two repositories:
  .sp
  .nf
@@ -10098,7 +10497,7 @@
  .fi
  .sp
  When repositories are cloned locally, their data files will be
[email protected]@ -13855,18 +13827,18 @@
[email protected]@ -14262,18 +14234,18 @@
  lot of repositories to act like a scheme, for example:
  .sp
  .nf
@@ -10121,7 +10520,7 @@
  .fi
  .sp
  Additionally there is support for some more complex schemas, for
[email protected]@ -13873,10 +13845,10 @@
[email protected]@ -14280,10 +14252,10 @@
  example used by Google Code:
  .sp
  .nf
@@ -10134,7 +10533,7 @@
  .fi
  .sp
  The syntax is taken from Mercurial templates, and you have unlimited
[email protected]@ -13888,7 +13860,7 @@
[email protected]@ -14295,7 +14267,7 @@
  For convenience, the extension adds these schemes by default:
  .sp
  .nf
@@ -10143,7 +10542,7 @@
  [schemes]
  py = http://hg.python.org/
  bb = https://bitbucket.org/
[email protected]@ -13895,7 +13867,7 @@
[email protected]@ -14302,7 +14274,7 @@
  bb+ssh = ssh://[email protected]/
  gcode = https://{1}.googlecode.com/hg/
  kiln = https://{1}.kilnhg.com/Repo/
@@ -10152,7 +10551,7 @@
  .fi
  .sp
  You can override a predefined scheme by defining a new scheme with the
[email protected]@ -13905,19 +13877,19 @@
[email protected]@ -14313,19 +14285,19 @@
  share a common history between several working directories
  .SS Automatic Pooled Storage for Clones
  .sp
@@ -10176,7 +10575,7 @@
  storage instead of creating a store inside each clone.
  .TP
  .B \fBshare.poolnaming\fP
[email protected]@ -13929,13 +13901,13 @@
[email protected]@ -14337,13 +14309,13 @@
  root/initial changeset is identical. In this mode, the local shared
  repository is an aggregate of all encountered remote repositories.
  .sp
@@ -10193,7 +10592,7 @@
  .SS Commands
  .SS share
  .sp
[email protected]@ -13942,9 +13914,9 @@
[email protected]@ -14350,9 +14322,9 @@
  create a new shared repository:
  .sp
  .nf
@@ -10205,7 +10604,7 @@
  .fi
  .sp
  Initialize a new repository and working directory that shares its
[email protected]@ -13962,7 +13934,7 @@
[email protected]@ -14370,7 +14342,7 @@
  .RE
  .sp
  Options:
@@ -10214,7 +10613,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
[email protected]@ -13971,15 +13943,15 @@
[email protected]@ -14379,15 +14351,15 @@
  .B \-B,  \-\-bookmarks
  .
  also share bookmarks
@@ -10233,7 +10632,7 @@
  .fi
  .sp
  Copy the store data to the repo and remove the sharedpath data.
[email protected]@ -13993,7 +13965,7 @@
[email protected]@ -14401,7 +14373,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
@@ -10242,7 +10641,7 @@
  conflicts if necessary.
  .sp
  You can have more than one shelved change outstanding at a time; each
[email protected]@ -14005,9 +13977,9 @@
[email protected]@ -14413,9 +14385,9 @@
  save and set aside changes from the working directory:
  .sp
  .nf
@@ -10254,7 +10653,7 @@
  .fi
  .sp
  Shelving takes files that "hg status" reports as not clean, saves
[email protected]@ -14035,7 +14007,7 @@
[email protected]@ -14449,7 +14421,7 @@
  all shelved changes, use \fB\-\-cleanup\fP.
  .sp
  Options:
@@ -10263,7 +10662,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
[email protected]@ -14092,7 +14064,7 @@
[email protected]@ -14506,7 +14478,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -10272,7 +10671,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS unshelve
[email protected]@ -14100,9 +14072,9 @@
[email protected]@ -14514,9 +14486,9 @@
  restore a shelved change to the working directory:
  .sp
  .nf
@@ -10284,7 +10683,7 @@
  .fi
  .sp
  This command accepts an optional name of a shelved change to
[email protected]@ -14133,7 +14105,7 @@
[email protected]@ -14551,7 +14523,7 @@
  prevents from deciding exact order of them, for safety.
  .sp
  Options:
@@ -10293,7 +10692,7 @@
  .TP
  .B \-a,  \-\-abort
  .
[email protected]@ -14154,7 +14126,7 @@
[email protected]@ -14572,7 +14544,7 @@
  .BI \-\-date \ <DATE>
  .
  set date for temporary commits (DEPRECATED)
@@ -10302,7 +10701,7 @@
  .SS strip
  .sp
  strip changesets and their descendants from history
[email protected]@ -14167,9 +14139,9 @@
[email protected]@ -14585,9 +14557,9 @@
  strip changesets and all their descendants from the repository:
  .sp
  .nf
@@ -10314,7 +10713,7 @@
  .fi
  .sp
  The strip command removes the specified changesets and all their
[email protected]@ -14183,8 +14155,8 @@
[email protected]@ -14601,8 +14573,8 @@
  completes.
  .sp
  Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
@@ -10325,7 +10724,7 @@
  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]@ -14199,7 +14171,7 @@
[email protected]@ -14617,7 +14589,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -10334,7 +10733,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
[email protected]@ -14228,7 +14200,7 @@
[email protected]@ -14646,7 +14618,7 @@
  .BI \-B,  \-\-bookmark \ <VALUE[+]>
  .
  remove revs only reachable from given bookmark
@@ -10343,7 +10742,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS transplant
[email protected]@ -14236,7 +14208,7 @@
[email protected]@ -14654,7 +14626,7 @@
  command to transplant changesets from another branch
  .sp
  This extension allows you to transplant changes to another parent revision,
@@ -10352,7 +10751,7 @@
  .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]@ -14246,9 +14218,9 @@
[email protected]@ -14664,9 +14636,9 @@
  transplant changesets from another branch:
  .sp
  .nf
@@ -10364,7 +10763,7 @@
  .fi
  .sp
  Selected changesets will be applied on top of the current working
[email protected]@ -14265,9 +14237,9 @@
[email protected]@ -14683,9 +14655,9 @@
  of the form:
  .sp
  .nf
@@ -10376,7 +10775,7 @@
  .fi
  .sp
  You can rewrite the changelog message with the \-\-filter option.
[email protected]@ -14283,17 +14255,17 @@
[email protected]@ -14701,17 +14673,17 @@
  with \-\-branch will be transplanted.
  .sp
  Example:
@@ -10398,7 +10797,7 @@
  .sp
  You can optionally mark selected transplanted changesets as merge
  changesets. You will not be prompted to transplant any ancestors
[email protected]@ -14301,17 +14273,17 @@
[email protected]@ -14719,17 +14691,17 @@
  normally instead of transplanting them.
  .sp
  Merge changesets may be transplanted directly by specifying the
@@ -10421,7 +10820,7 @@
  .TP
  .BI \-s,  \-\-source \ <REPO>
  .
[email protected]@ -14352,7 +14324,7 @@
[email protected]@ -14770,7 +14742,7 @@
  .BI \-\-filter \ <CMD>
  .
  filter changesets through command
@@ -10430,7 +10829,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS win32mbcs
[email protected]@ -14367,7 +14339,7 @@
[email protected]@ -14785,7 +14757,7 @@
  operation.
  .sp
  This extension is useful for:
@@ -10439,7 +10838,7 @@
  .IP \(bu 2
  .
  Japanese Windows users using shift_jis encoding.
[email protected]@ -14378,10 +14350,10 @@
[email protected]@ -14796,10 +14768,10 @@
  .
  All users who use a repository with one of problematic encodings on
  case\-insensitive file system.
@@ -10452,7 +10851,7 @@
  .IP \(bu 2
  .
  Any user who use only ASCII chars in path.
[email protected]@ -14388,10 +14360,10 @@
[email protected]@ -14806,10 +14778,10 @@
  .IP \(bu 2
  .
  Any user who do not use any of problematic encodings.
@@ -10465,7 +10864,7 @@
  .IP \(bu 2
  .
  You should use single encoding in one repository.
[email protected]@ -14401,16 +14373,16 @@
[email protected]@ -14819,16 +14791,16 @@
  .IP \(bu 2
  .
  win32mbcs is not compatible with fixutf8 extension.
@@ -10485,7 +10884,7 @@
  .fi
  .sp
  It is useful for the users who want to commit with UTF\-8 log message.
[email protected]@ -14417,8 +14389,8 @@
[email protected]@ -14835,8 +14807,8 @@
  .SS win32text
  .sp
  perform automatic newline conversion (DEPRECATED)
@@ -10496,7 +10895,7 @@
  .sp
  Deprecation: The win32text extension requires each user to configure
  the extension again and again for each clone since the configuration
[email protected]@ -14427,13 +14399,13 @@
[email protected]@ -14845,13 +14817,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.
@@ -10513,7 +10912,7 @@
  [extensions]
  win32text =
  [encode]
[email protected]@ -14443,17 +14415,17 @@
[email protected]@ -14861,17 +14833,17 @@
  [decode]
  ** = cleverdecode:
  # or ** = macdecode:
@@ -10534,7 +10933,7 @@
  .fi
  .sp
  To do the same check on a server to prevent CRLF/CR from being
[email protected]@ -14460,11 +14432,11 @@
[email protected]@ -14878,11 +14850,11 @@
  pushed or pulled:
  .sp
  .nf
@@ -10548,7 +10947,7 @@
  .fi
  .SS zeroconf
  .sp
[email protected]@ -14475,33 +14447,33 @@
[email protected]@ -14893,33 +14865,33 @@
  without knowing their actual IP address.
  .sp
  To allow other people to discover your repository using run
@@ -10591,7 +10990,7 @@
  files.
  .TP
  .B \fB.hgignore\fP
[email protected]@ -14508,13 +14480,13 @@
[email protected]@ -14926,13 +14898,13 @@
  .sp
  This file contains regular expressions (one per line) that
  describe file names that should be ignored by \fBhg\fP. For details,
@@ -10607,7 +11006,7 @@
  .TP
  .B \fB.hgsubstate\fP
  .sp
[email protected]@ -14529,7 +14501,7 @@
[email protected]@ -14947,7 +14919,7 @@
  .TP
  .B \fB.hg/last\-message.txt\fP
  .sp
@@ -10616,7 +11015,7 @@
  in case the commit fails.
  .TP
  .B \fB.hg/localtags\fP
[email protected]@ -14537,28 +14509,34 @@
[email protected]@ -14955,28 +14927,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.
@@ -10650,16 +11049,16 @@
 -Main Web Site: \%https://mercurial\-scm.org/\:
 +Main Web Site: https://mercurial\-scm.org/
  .sp
--Source code repository: \%http://selenic.com/hg\:
-+Source code repository: http://selenic.com/hg
- .sp
--Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
-+Mailing list: http://selenic.com/mailman/listinfo/mercurial
+-Source code repository: \%https://www.mercurial\-scm.org/repo/hg\:
++Source code repository: https://www.mercurial\-scm.org/repo/hg
+ .sp
+-Mailing list: \%https://www.mercurial\-scm.org/mailman/listinfo/mercurial/\:
++Mailing list: https://www.mercurial\-scm.org/mailman/listinfo/mercurial/
  .SH COPYING
  .sp
  Copyright (C) 2005\-2016 Matt Mackall.
---- mercurial-3.7.3/doc/hgignore.5.~1~	Tue Mar 29 09:54:51 2016
-+++ mercurial-3.7.3/doc/hgignore.5	Tue Mar 29 10:26:27 2016
+--- mercurial-4.1/doc/hgignore.5	2017-02-01 08:19:55.000000000 -0800
++++ mercurial-4.1/doc/hgignore.5	2017-02-03 11:20:03.473564965 -0800
 @@ -3,33 +3,6 @@
  .TH HGIGNORE 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -10785,8 +11184,8 @@
  .SH COPYING
  .sp
  This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-3.7.3/doc/hgrc.5.~1~	Tue Mar 29 09:54:48 2016
-+++ mercurial-3.7.3/doc/hgrc.5	Tue Mar 29 10:26:32 2016
+--- mercurial-4.1/doc/hgrc.5	2017-02-01 08:19:56.000000000 -0800
++++ mercurial-4.1/doc/hgrc.5	2017-02-03 11:20:07.405927763 -0800
 @@ -3,33 +3,6 @@
  .TH HGRC 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -11179,7 +11578,7 @@
  against the URI with its scheme stripped as well, and the schemes
  argument, q.v., is then subsequently consulted.
  .TP
[email protected]@ -496,195 +399,195 @@
[email protected]@ -496,70 +399,70 @@
  .B \fBschemes\fP
  .sp
  Optional. Space separated list of URI schemes to use this
@@ -11244,6 +11643,49 @@
 -.ft P
 +.ft
  .fi
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBdiff()\fP
+ .sp
+-String: show the diff (see \%\fBhg help templates\fP\: for detail)
+-.UNINDENT
++String: show the diff (see \fBhg help templates\fP for detail)
++.RE
+ .sp
+ Sometimes it is helpful to show the diff of the changeset in the editor without
+-having to prefix \(aqHG: \(aq to each line so that highlighting works correctly. For
++having to prefix 'HG: ' to each line so that highlighting works correctly. For
+ this, Mercurial provides a special string which will ignore everything below
+ it:
+ .sp
+ .nf
+-.ft C
++.ft
+ HG: \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- >8 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+-.ft P
++.ft
+ .fi
+ .sp
+ For example, the template configuration below will show the diff below the
[email protected]@ -566,158 +469,158 @@
+ extra message:
+ .sp
+ .nf
+-.ft C
++.ft
+ [committemplate]
+ changeset = {desc}\en\en
+-    HG: Enter commit message.  Lines beginning with \(aqHG:\(aq are removed.
++    HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+     HG: {extramsg}
+     HG: \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- >8 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+     HG: Do not touch the line above.
+     HG: Everything below will be removed.
+     {diff()}
+-.ft P
++.ft
+ .fi
  .IP Note
  .
 -For some problematic encodings (see \%\fBhg help win32mbcs\fP\: for
@@ -11435,7 +11877,7 @@
  .sp
  When the external editor is invoked for a commit, the corresponding
  dot\-separated list of names without the \fBchangeset.\fP prefix
[email protected]@ -696,7 +599,7 @@
[email protected]@ -729,7 +632,7 @@
  below can be referred as \fB{listupfiles}\fP:
  .sp
  .nf
@@ -11444,7 +11886,7 @@
  [committemplate]
  listupfiles = {file_adds %
     "HG: added {file}\en"     }{file_mods %
[email protected]@ -703,7 +606,7 @@
[email protected]@ -736,7 +639,7 @@
     "HG: changed {file}\en"   }{file_dels %
     "HG: removed {file}\en"   }{if(files, "",
     "HG: no files changed\en")}
@@ -11453,7 +11895,7 @@
  .fi
  .SS \fBdecode/encode\fP
  .sp
[email protected]@ -727,7 +630,7 @@
[email protected]@ -760,7 +663,7 @@
  Pipe example:
  .sp
  .nf
@@ -11462,7 +11904,7 @@
  [encode]
  # uncompress gzip files on checkin to improve delta compression
  # note: not necessarily a good idea, just an example
[email protected]@ -735,9 +638,9 @@
[email protected]@ -768,9 +671,9 @@
  
  [decode]
  # recompress gzip files when writing them to the working dir (we
@@ -11474,7 +11916,7 @@
  .fi
  .sp
  A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
[email protected]@ -745,12 +648,6 @@
[email protected]@ -778,12 +681,6 @@
  filtered by the command. The string \fBOUTFILE\fP is replaced with the name
  of an empty temporary file, where the filtered data must be written by
  the command.
@@ -11487,7 +11929,7 @@
  .sp
  This filter mechanism is used internally by the \fBeol\fP extension to
  translate line ending characters between Windows (CRLF) and Unix (LF)
[email protected]@ -757,20 +654,20 @@
[email protected]@ -790,20 +687,20 @@
  format. We suggest you use the \fBeol\fP extension for convenience.
  .SS \fBdefaults\fP
  .sp
@@ -11513,7 +11955,7 @@
  .fi
  .sp
  The actual commands, instead of their aliases, must be used when
[email protected]@ -779,9 +676,9 @@
[email protected]@ -812,9 +709,9 @@
  .SS \fBdiff\fP
  .sp
  Settings used when displaying diffs. Everything except for \fBunified\fP
@@ -11525,7 +11967,7 @@
  .TP
  .B \fBgit\fP
  .sp
[email protected]@ -793,11 +690,11 @@
[email protected]@ -826,11 +723,11 @@
  .TP
  .B \fBnodates\fP
  .sp
@@ -11539,7 +11981,7 @@
  .TP
  .B \fBshowfunc\fP
  .sp
[email protected]@ -818,11 +715,11 @@
[email protected]@ -851,11 +748,11 @@
  .B \fBunified\fP
  .sp
  Number of lines of context to show.
@@ -11553,7 +11995,7 @@
  .TP
  .B \fBfrom\fP
  .sp
[email protected]@ -831,16 +728,16 @@
[email protected]@ -864,16 +761,16 @@
  .TP
  .B \fBto\fP
  .sp
@@ -11573,7 +12015,7 @@
  email addresses.
  .TP
  .B \fBmethod\fP
[email protected]@ -860,10 +757,10 @@
[email protected]@ -893,10 +790,10 @@
  first character set to which conversion from local encoding
  (\fB$HGENCODING\fP, \fBui.fallbackencoding\fP) succeeds. If correct
  conversion fails, the text in question is sent as is.
@@ -11586,7 +12028,7 @@
  .IP 1. 3
  .
  \fBus\-ascii\fP: always first, regardless of settings
[email protected]@ -879,13 +776,13 @@
[email protected]@ -912,13 +809,13 @@
  .IP 5. 3
  .
  \fButf\-8\fP: always last, regardless of settings
@@ -11603,7 +12045,7 @@
  [email]
  from = Joseph User <[email protected]>
  method = /usr/sbin/sendmail
[email protected]@ -892,7 +789,7 @@
[email protected]@ -925,7 +822,7 @@
  # charsets for western Europeans
  # us\-ascii, utf\-8 omitted, as they are tried first and last
  charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
@@ -11612,7 +12054,7 @@
  .fi
  .SS \fBextensions\fP
  .sp
[email protected]@ -899,7 +796,7 @@
[email protected]@ -932,7 +829,7 @@
  Mercurial has an extension mechanism for adding new features. To
  enable an extension, create an entry for it in this section.
  .sp
@@ -11621,7 +12063,7 @@
  you can give the name of the module, followed by \fB=\fP, with nothing
  after the \fB=\fP.
  .sp
[email protected]@ -914,16 +811,16 @@
[email protected]@ -947,16 +844,16 @@
  Example for \fB~/.hgrc\fP:
  .sp
  .nf
@@ -11642,7 +12084,7 @@
  .TP
  .B \fBusegeneraldelta\fP
  .sp
[email protected]@ -968,7 +865,7 @@
[email protected]@ -1001,7 +898,7 @@
  Repositories with this on\-disk format require Mercurial version 0.9.4.
  .sp
  Enabled by default.
@@ -11651,7 +12093,7 @@
  .SS \fBgraph\fP
  .sp
  Web graph view configuration. This section let you change graph
[email protected]@ -978,9 +875,9 @@
[email protected]@ -1011,9 +908,9 @@
  Each line has the following format:
  .sp
  .nf
@@ -11663,7 +12105,7 @@
  .fi
  .sp
  where \fB<branch>\fP is the name of the branch being
[email protected]@ -987,17 +884,17 @@
[email protected]@ -1020,17 +917,17 @@
  customized. Example:
  .sp
  .nf
@@ -11684,7 +12126,7 @@
  .TP
  .B \fBwidth\fP
  .sp
[email protected]@ -1006,7 +903,7 @@
[email protected]@ -1039,7 +936,7 @@
  .B \fBcolor\fP
  .sp
  Set branch edges color in hexadecimal RGB notation.
@@ -11693,7 +12135,7 @@
  .SS \fBhooks\fP
  .sp
  Commands or Python functions that get automatically executed by
[email protected]@ -1020,7 +917,7 @@
[email protected]@ -1053,7 +950,7 @@
  Example \fB.hg/hgrc\fP:
  .sp
  .nf
@@ -11702,7 +12144,7 @@
  [hooks]
  # update working directory after adding changesets
  changegroup.update = hg update
[email protected]@ -1030,13 +927,13 @@
[email protected]@ -1063,13 +960,13 @@
  incoming.autobuild = /my/build/hook
  # force autobuild hook to run before other incoming hooks
  priority.incoming.autobuild = 1
@@ -11718,16 +12160,16 @@
  .TP
  .B \fBchangegroup\fP
  .sp
[email protected]@ -1060,7 +957,7 @@
[email protected]@ -1093,7 +990,7 @@
  .sp
  Run after sending changes from local repository to another. ID of
  first changeset sent is in \fB$HG_NODE\fP. Source of operation is in
--\fB$HG_SOURCE\fP; Also see \%\fBhg help config.preoutgoing\fP\: hook.
-+\fB$HG_SOURCE\fP; Also see \fBhg help config.preoutgoing\fP hook.
+-\fB$HG_SOURCE\fP; Also see \%\fBhg help config.hooks.preoutgoing\fP\: hook.
++\fB$HG_SOURCE\fP; Also see \fBhg help config.hooks.preoutgoing\fP hook.
  .TP
  .B \fBpost\-<command>\fP
  .sp
[email protected]@ -1080,7 +977,7 @@
[email protected]@ -1123,7 +1020,7 @@
  representations of the data internally passed to <command>. \fB$HG_OPTS\fP
  is a dictionary of options (with unspecified options set to their
  defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
@@ -11736,22 +12178,22 @@
  code.
  .TP
  .B \fBprechangegroup\fP
[email protected]@ -1152,12 +1049,12 @@
[email protected]@ -1195,12 +1092,12 @@
  .sp
  Run after any repository transaction has been committed. At this
  point, the transaction can no longer be rolled back. The hook will run
--after the lock is released. See \%\fBhg help config.pretxnclose\fP\: docs for
-+after the lock is released. See \fBhg help config.pretxnclose\fP docs for
+-after the lock is released. See \%\fBhg help config.hooks.pretxnclose\fP\: docs for
++after the lock is released. See \fBhg help config.hooks.pretxnclose\fP docs for
  details about available variables.
  .TP
  .B \fBtxnabort\fP
  .sp
--Run when a transaction is aborted. See \%\fBhg help config.pretxnclose\fP\:
-+Run when a transaction is aborted. See \fBhg help config.pretxnclose\fP
+-Run when a transaction is aborted. See \%\fBhg help config.hooks.pretxnclose\fP\:
++Run when a transaction is aborted. See \fBhg help config.hooks.pretxnclose\fP
  docs for details about available variables.
  .TP
  .B \fBpretxnchangegroup\fP
[email protected]@ -1211,7 +1108,7 @@
[email protected]@ -1254,7 +1151,7 @@
  new parent is in \fB$HG_PARENT1\fP. If merge, ID of second new parent is
  in \fB$HG_PARENT2\fP. If the update succeeded, \fB$HG_ERROR=0\fP. If the
  update failed (e.g. because conflicts not resolved), \fB$HG_ERROR=1\fP.
@@ -11760,7 +12202,7 @@
  .IP Note
  .
  It is generally better to use standard hooks rather than the
[email protected]@ -1220,21 +1117,14 @@
[email protected]@ -1263,21 +1160,14 @@
  Also, hooks like "commit" will be called in all contexts that
  generate a commit (e.g. tag) and not just the commit command.
  .RE
@@ -11784,7 +12226,16 @@
  .fi
  .sp
  Python hooks are run within the Mercurial process. Each hook is
[email protected]@ -1258,11 +1148,11 @@
[email protected]@ -1291,7 +1181,7 @@
+ is treated as a failure.
+ .SS \fBhostfingerprints\fP
+ .sp
+-(Deprecated. Use \fB[hostsecurity]\fP\(aqs \fBfingerprints\fP options instead.)
++(Deprecated. Use \fB[hostsecurity]\fP\&'s \fBfingerprints\fP options instead.)
+ .sp
+ Fingerprints of the certificates of known HTTPS servers.
+ .sp
[email protected]@ -1309,11 +1199,11 @@
  For example:
  .sp
  .nf
@@ -11796,9 +12247,99 @@
 -.ft P
 +.ft
  .fi
- .sp
- This feature is only supported when using Python 2.6 or later.
[email protected]@ -1270,7 +1160,7 @@
+ .SS \fBhostsecurity\fP
+ .sp
[email protected]@ -1321,7 +1211,7 @@
+ other machines.
+ .sp
+ The following options control default behavior for all hosts.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBciphers\fP
+ .sp
[email protected]@ -1328,7 +1218,7 @@
+ Defines the cryptographic ciphers to use for connections.
+ .sp
+ Value must be a valid OpenSSL Cipher List Format as documented at
+-\%https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER\-LIST\-FORMAT\:.
++https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER\-LIST\-FORMAT.
+ .sp
+ This setting is for advanced users only. Setting to incorrect values
+ can significantly lower connection security or decrease performance.
[email protected]@ -1352,7 +1242,7 @@
+ \fBtls1.1\fP. \fBtls1.0\fP can still be used to allow TLS 1.0. However, this
+ weakens security and should only be used as a feature of last resort if
+ a server does not support TLS 1.1+.
+-.UNINDENT
++.RE
+ .sp
+ Options in the \fB[hostsecurity]\fP section can have the form
+ \fBhostname\fP:\fBsetting\fP. This allows multiple settings to be defined on a
[email protected]@ -1359,7 +1249,7 @@
+ per\-host basis.
+ .sp
+ The following per\-host settings can be defined.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBciphers\fP
+ .sp
[email protected]@ -1397,7 +1287,7 @@
+ verify the server certificate. Environment variables and \fB~user\fP
+ constructs are expanded in the filename.
+ .sp
+-The server certificate or the certificate\(aqs certificate authority (CA)
++The server certificate or the certificate's certificate authority (CA)
+ must match a certificate from this file or certificate verification
+ will fail and connections to the server will be refused.
+ .sp
[email protected]@ -1411,7 +1301,7 @@
+ The format of the file is as follows:
+ .sp
+ .nf
+-.ft C
++.ft
+ \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
+ \&... (certificate in base64 PEM encoding) ...
+ \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
[email protected]@ -1418,19 +1308,19 @@
+ \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
+ \&... (certificate in base64 PEM encoding) ...
+ \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+ For example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [hostsecurity]
+ hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
+ hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
+ foo.example.com:verifycertsfile = /etc/ssl/trusted\-ca\-certs.pem
+-.ft P
++.ft
+ .fi
+ .sp
+ To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
[email protected]@ -1437,17 +1327,17 @@
+ when connecting to \fBhg.example.com\fP:
+ .sp
+ .nf
+-.ft C
++.ft
+ [hostsecurity]
+ minimumprotocol = tls1.2
+ hg.example.com:minimumprotocol = tls1.1
+-.ft P
++.ft
+ .fi
+ .SS \fBhttp_proxy\fP
  .sp
  Used to access web\-based Mercurial repositories through a HTTP
  proxy.
@@ -11807,16 +12348,42 @@
  .TP
  .B \fBhost\fP
  .sp
[email protected]@ -1294,7 +1184,7 @@
[email protected]@ -1471,11 +1361,11 @@
  .sp
  Optional. Always use the proxy, even for localhost and any entries
  in \fBhttp_proxy.no\fP. (default: False)
 -.UNINDENT
 +.RE
+ .SS \fBmerge\fP
+ .sp
+ This section specifies behavior during merges and updates.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBcheckignored\fP
+ .sp
[email protected]@ -1483,16 +1373,16 @@
+ file in the changeset being merged or updated to, and has different
+ contents. Options are \fBabort\fP, \fBwarn\fP and \fBignore\fP. With \fBabort\fP,
+ abort on such files. With \fBwarn\fP, warn on such files and back them up as
+-\fB.orig\fP. With \fBignore\fP, don\(aqt print a warning and back them up as
+-\fB.orig\fP. (default: \fBabort\fP)
++\fB\&.orig\fP. With \fBignore\fP, don't print a warning and back them up as
++\fB\&.orig\fP. (default: \fBabort\fP)
+ .TP
+ .B \fBcheckunknown\fP
+ .sp
+-Controls behavior when an unknown file that isn\(aqt ignored has the same name
++Controls behavior when an unknown file that isn't ignored has the same name
+ as a tracked file in the changeset being merged or updated to, and has
+ different contents. Similar to \fBmerge.checkignored\fP, except for files that
+ are not ignored. (default: \fBabort\fP)
+-.UNINDENT
++.RE
  .SS \fBmerge\-patterns\fP
  .sp
  This section specifies merge tools to associate with particular file
[email protected]@ -1305,23 +1195,23 @@
[email protected]@ -1503,23 +1393,23 @@
  Example:
  .sp
  .nf
@@ -11845,7 +12412,7 @@
  [merge\-tools]
  # Override stock tool location
  kdiff3.executable = ~/bin/kdiff3
[email protected]@ -1338,13 +1228,12 @@
[email protected]@ -1536,13 +1426,12 @@
  
  # Define new tool
  myHtmlTool.args = \-m $local $other $base $output
@@ -11861,7 +12428,7 @@
  .TP
  .B \fBpriority\fP
  .sp
[email protected]@ -1355,9 +1244,6 @@
[email protected]@ -1553,9 +1442,6 @@
  .sp
  Either just the name of the executable or its pathname.
  .sp
@@ -11871,7 +12438,7 @@
  (default: the tool name)
  .TP
  .B \fBargs\fP
[email protected]@ -1380,7 +1266,7 @@
[email protected]@ -1578,7 +1464,7 @@
  \fBkeep\-merge3\fP. The \fBkeep\fP option will leave markers in the file if the
  premerge fails. The \fBkeep\-merge3\fP will do the same but include information
  about the base of the merge in the marker (see internal :merge3 in
@@ -11880,7 +12447,7 @@
  (default: True)
  .TP
  .B \fBbinary\fP
[email protected]@ -1395,7 +1281,7 @@
[email protected]@ -1593,7 +1479,7 @@
  .B \fBcheck\fP
  .sp
  A list of merge success\-checking options:
@@ -11889,7 +12456,7 @@
  .TP
  .B \fBchanged\fP
  .sp
[email protected]@ -1408,7 +1294,7 @@
[email protected]@ -1606,7 +1492,7 @@
  .B \fBprompt\fP
  .sp
  Always prompt for merge success, regardless of success reported by tool.
@@ -11898,7 +12465,7 @@
  .TP
  .B \fBfixeol\fP
  .sp
[email protected]@ -1418,44 +1304,16 @@
[email protected]@ -1616,44 +1502,16 @@
  .B \fBgui\fP
  .sp
  This tool requires a graphical interface to run. (default: False)
@@ -11947,7 +12514,7 @@
  are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
  lines are ignored when patching and the result line endings are
  normalized to either LF (Unix) or CRLF (Windows). When set to
[email protected]@ -1467,11 +1325,11 @@
[email protected]@ -1665,11 +1523,11 @@
  .TP
  .B \fBfuzz\fP
  .sp
@@ -11961,7 +12528,7 @@
  .SS \fBpaths\fP
  .sp
  Assigns symbolic names and behavior to repositories.
[email protected]@ -1480,57 +1338,57 @@
[email protected]@ -1678,70 +1536,70 @@
  location of the repository. Example:
  .sp
  .nf
@@ -12001,8 +12568,23 @@
  .sp
  The URL to use for push operations. If not defined, the location
 -defined by the path\(aqs main entry is used.
--.UNINDENT
 +defined by the path's main entry is used.
+ .TP
+ .B \fBpushrev\fP
+ .sp
+ A revset defining which revisions to push by default.
+ .sp
+-When \%\fBhg push\fP\: is executed without a \fB\-r\fP argument, the revset
++When \fBhg push\fP is executed without a \fB\-r\fP argument, the revset
+ defined by this sub\-option is evaluated to determine what to push.
+ .sp
+-For example, a value of \fB.\fP will push the working directory\(aqs
++For example, a value of \fB.\fP will push the working directory's
+ revision by default.
+ .sp
+ Revsets specifying bookmarks will not result in the bookmark being
+ pushed.
+-.UNINDENT
 +.RE
  .sp
  The following special named paths exist:
@@ -12034,7 +12616,7 @@
  .TP
  .B \fBpublish\fP
  .sp
[email protected]@ -1555,7 +1413,7 @@
[email protected]@ -1766,7 +1624,7 @@
  either aborted (if checksubrepos is set to "abort") or the higher phase is
  used for the parent repository commit (if set to "follow").
  (default: follow)
@@ -12043,7 +12625,7 @@
  .SS \fBprofiling\fP
  .sp
  Specifies profiling type, format, and file output. Two profilers are
[email protected]@ -1562,21 +1420,21 @@
[email protected]@ -1773,11 +1631,11 @@
  supported: an instrumenting profiler (named \fBls\fP), and a sampling
  profiler (named \fBstat\fP).
  .sp
@@ -12056,10 +12638,12 @@
 -.INDENT 0.0
 +.RS 0
  .TP
- .B \fBtype\fP
+ .B \fBenabled\fP
+ .sp
[email protected]@ -1790,11 +1648,11 @@
  .sp
  The type of profiler to use.
- (default: ls)
+ (default: stat)
 -.INDENT 7.0
 +.RS 7
  .TP
@@ -12070,10 +12654,10 @@
  works on all platforms, but each line number it reports is the
  first line of a function. This restriction makes it difficult to
  identify the expensive parts of a non\-trivial function.
[email protected]@ -1586,13 +1444,13 @@
- Use a third\-party statistical profiler, statprof. This profiler
- currently runs only on Unix systems, and is most useful for
- profiling commands that run for longer than about 0.1 seconds.
[email protected]@ -1804,13 +1662,13 @@
+ Use a statistical profiler, statprof. This profiler is most
+ useful for profiling commands that run for longer than about 0.1
+ seconds.
 -.UNINDENT
 +.RE
  .TP
@@ -12086,16 +12670,32 @@
  .TP
  .B \fBtext\fP
  .sp
[email protected]@ -1605,7 +1463,7 @@
[email protected]@ -1823,13 +1681,13 @@
  Format profiling data for kcachegrind use: when saving to a
  file, the generated file can directly be loaded into
  kcachegrind.
 -.UNINDENT
 +.RE
  .TP
+ .B \fBstatformat\fP
+ .sp
+ Profiling format for the \fBstat\fP profiler.
+ (default: hotpath)
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B \fBhotpath\fP
+ .sp
[email protected]@ -1847,7 +1705,7 @@
+ .B \fBjson\fP
+ .sp
+ Render profiling data as JSON.
+-.UNINDENT
++.RE
+ .TP
  .B \fBfrequency\fP
  .sp
[email protected]@ -1636,13 +1494,13 @@
[email protected]@ -1878,13 +1736,13 @@
  This can help explain the difference between Total and Inline.
  Specific to the \fBls\fP instrumenting profiler.
  (default: 5)
@@ -12111,7 +12711,7 @@
  .TP
  .B \fBdelay\fP
  .sp
[email protected]@ -1676,31 +1534,31 @@
[email protected]@ -1918,31 +1776,31 @@
  .TP
  .B \fBclear\-complete\fP
  .sp
@@ -12148,12 +12748,25 @@
 -.INDENT 0.0
 +.RS 0
  .TP
- .B \fBuncompressed\fP
- .sp
[email protected]@ -1765,11 +1623,11 @@
- consider setting this option because converting \fIgeneraldelta\fP
- repositories to the exchange format required by the bundle1 data
- format can consume a lot of CPU.
+ .B \fBcompressionengines\fP
+ .sp
[email protected]@ -1951,10 +1809,10 @@
+ .sp
+ The order of compression engines determines their priority, the first
+ having the highest priority. If a compression engine is not listed
+-here, it won\(aqt be advertised to clients.
++here, it won't be advertised to clients.
+ .sp
+ If not set (the default), built\-in defaults are used. Run
+-\%\fBhg debuginstall\fP\: to list available compression engines and their
++\fBhg debuginstall\fP to list available compression engines and their
+ default wire protocol priority.
+ .sp
+ Older Mercurial clients only support zlib compression and this setting
[email protected]@ -2052,11 +1910,11 @@
+ This option only impacts the HTTP server.
+ .sp
+ See also \fBserver.zliblevel\fP.
 -.UNINDENT
 +.RE
  .SS \fBsmtp\fP
@@ -12164,16 +12777,7 @@
  .TP
  .B \fBhost\fP
  .sp
[email protected]@ -1794,7 +1652,7 @@
- \fB[web] cacerts\fP also). For "strict", sending email is also
- aborted, if there is no configuration for mail server in
- \fB[hostfingerprints]\fP and \fB[web] cacerts\fP.  \-\-insecure for
--\%\fBhg email\fP\: overwrites this as "loose". (default: strict)
-+\fBhg email\fP overwrites this as "loose". (default: strict)
- .TP
- .B \fBusername\fP
- .sp
[email protected]@ -1811,7 +1669,7 @@
[email protected]@ -2087,7 +1945,7 @@
  .sp
  Optional. The hostname that the sender can use to identify
  itself to the MTA.
@@ -12182,7 +12786,7 @@
  .SS \fBsubpaths\fP
  .sp
  Subrepository source URLs can go stale if a remote server changes name
[email protected]@ -1819,9 +1677,9 @@
[email protected]@ -2095,9 +1953,9 @@
  rewrite rules of the form:
  .sp
  .nf
@@ -12194,7 +12798,7 @@
  .fi
  .sp
  where \fBpattern\fP is a regular expression matching a subrepository
[email protected]@ -1830,9 +1688,9 @@
[email protected]@ -2106,9 +1964,9 @@
  \fBreplacements\fP. For instance:
  .sp
  .nf
@@ -12206,7 +12810,22 @@
  .fi
  .sp
  rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
[email protected]@ -1843,7 +1701,7 @@
[email protected]@ -2115,19 +1973,19 @@
+ .sp
+ Relative subrepository paths are first made absolute, and the
+ rewrite rules are then applied on the full (absolute) path. If \fBpattern\fP
+-doesn\(aqt match the full path, an attempt is made to apply it on the
++doesn't match the full path, an attempt is made to apply it on the
+ relative path alone. The rules are applied in definition order.
+ .SS \fBtemplatealias\fP
+ .sp
+-Alias definitions for templates. See \%\fBhg help templates\fP\: for details.
++Alias definitions for templates. See \fBhg help templates\fP for details.
+ .SS \fBtemplates\fP
+ .sp
+ Use the \fB[templates]\fP section to define template strings.
+-See \%\fBhg help templates\fP\: for details.
++See \fBhg help templates\fP for details.
  .SS \fBtrusted\fP
  .sp
  Mercurial will not use the settings in the
@@ -12215,7 +12834,7 @@
  user or to a trusted group, as various hgrc features allow arbitrary
  commands to be run. This issue is often encountered when configuring
  hooks or extensions for shared repositories or servers. However,
[email protected]@ -1855,7 +1713,7 @@
[email protected]@ -2139,7 +1997,7 @@
  group with name \fB*\fP. These settings must be placed in an
  \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
  user or service running Mercurial.
@@ -12224,7 +12843,7 @@
  .TP
  .B \fBusers\fP
  .sp
[email protected]@ -1864,17 +1722,17 @@
[email protected]@ -2148,17 +2006,17 @@
  .B \fBgroups\fP
  .sp
  Comma\-separated list of trusted groups.
@@ -12245,7 +12864,7 @@
  (default: True)
  .TP
  .B \fBaskusername\fP
[email protected]@ -1889,7 +1747,7 @@
[email protected]@ -2173,7 +2031,7 @@
  .sp
  Whether the "clone bundles" feature is enabled.
  .sp
@@ -12254,7 +12873,7 @@
  bundle file from a URL instead of using the normal exchange mechanism.
  .sp
  This can likely result in faster and more reliable clones.
[email protected]@ -1907,7 +1765,7 @@
[email protected]@ -2191,7 +2049,7 @@
  clone, this would add significant and unexpected load to the server
  since the server is expecting clone operations to be offloaded to
  pre\-generated bundles. Failing fast (the default behavior) ensures
@@ -12263,7 +12882,7 @@
  fails.
  .sp
  (default: False)
[email protected]@ -1922,17 +1780,17 @@
[email protected]@ -2206,17 +2064,17 @@
  bundle over another.
  .sp
  The following keys are defined by Mercurial:
@@ -12284,7 +12903,7 @@
  .sp
  Server operators may define custom keys.
  .sp
[email protected]@ -1958,7 +1816,7 @@
[email protected]@ -2242,7 +2100,7 @@
  .TP
  .B \fBfallbackencoding\fP
  .sp
@@ -12293,7 +12912,23 @@
  UTF\-8. (default: ISO\-8859\-1)
  .TP
  .B \fBgraphnodetemplate\fP
[email protected]@ -1986,7 +1844,7 @@
[email protected]@ -2266,12 +2124,12 @@
+ .B \fBinterface\fP
+ .sp
+ Select the default interface for interactive features (default: text).
+-Possible values are \(aqtext\(aq and \(aqcurses\(aq.
++Possible values are 'text' and 'curses'.
+ .TP
+ .B \fBinterface.chunkselector\fP
+ .sp
+-Select the interface for change recording (e.g. \%\fBhg commit \-i\fP\:).
+-Possible values are \(aqtext\(aq and \(aqcurses\(aq.
++Select the interface for change recording (e.g. \fBhg commit \-i\fP).
++Possible values are 'text' and 'curses'.
+ This config overrides the interface specified by ui.interface.
+ .TP
+ .B \fBlogtemplate\fP
[email protected]@ -2281,7 +2139,7 @@
  .B \fBmerge\fP
  .sp
  The conflict resolution program to use during a manual merge.
@@ -12302,7 +12937,7 @@
  For configuring merge tools see the \fB[merge\-tools]\fP section.
  .TP
  .B \fBmergemarkers\fP
[email protected]@ -1993,7 +1851,7 @@
[email protected]@ -2288,7 +2146,7 @@
  .sp
  Sets the merge conflict marker label styling. The \fBdetailed\fP
  style uses the \fBmergemarkertemplate\fP setting to style the labels.
@@ -12311,7 +12946,7 @@
  One of \fBbasic\fP or \fBdetailed\fP.
  (default: \fBbasic\fP)
  .TP
[email protected]@ -2000,7 +1858,7 @@
[email protected]@ -2295,7 +2153,7 @@
  .B \fBmergemarkertemplate\fP
  .sp
  The template used to print the commit description next to each conflict
@@ -12320,7 +12955,7 @@
  format.
  .sp
  Defaults to showing the hash, tags, branches, bookmarks, author, and
[email protected]@ -2037,12 +1895,12 @@
[email protected]@ -2332,12 +2190,12 @@
  .sp
  Check for portable filenames. Can be \fBwarn\fP, \fBignore\fP or \fBabort\fP.
  (default: \fBwarn\fP)
@@ -12335,7 +12970,7 @@
  Windows because it contains reserved parts like \fBAUX\fP, reserved
  characters like \fB:\fP, or would cause a case collision with an existing
  file).
[email protected]@ -2049,7 +1907,7 @@
[email protected]@ -2344,7 +2202,7 @@
  .TP
  .B \fBignore\fP
  .sp
@@ -12344,7 +12979,7 @@
  .TP
  .B \fBabort\fP
  .sp
[email protected]@ -2062,9 +1920,7 @@
[email protected]@ -2357,9 +2215,7 @@
  .B \fBfalse\fP
  .sp
  Alias for \fBignore\fP.
@@ -12355,7 +12990,7 @@
  .TP
  .B \fBquiet\fP
  .sp
[email protected]@ -2128,7 +1984,7 @@
[email protected]@ -2431,7 +2287,7 @@
  .B \fBusername\fP
  .sp
  The committer of a changeset created when running "commit".
@@ -12364,7 +12999,7 @@
  <[email protected]>\fP. Environment variables in the
  username are expanded.
  .sp
[email protected]@ -2140,11 +1996,11 @@
[email protected]@ -2443,11 +2299,11 @@
  .B \fBverbose\fP
  .sp
  Increase the amount of output printed. (default: False)
@@ -12378,7 +13013,7 @@
  run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
  and WSGI).
  .sp
[email protected]@ -2160,9 +2016,9 @@
[email protected]@ -2463,9 +2319,9 @@
  command line:
  .sp
  .nf
@@ -12390,7 +13025,7 @@
  .fi
  .sp
  Note that this will allow anybody to push anything to the server and
[email protected]@ -2169,7 +2025,7 @@
[email protected]@ -2472,7 +2328,7 @@
  that this should not be used for public servers.
  .sp
  The full set of options is:
@@ -12399,7 +13034,7 @@
  .TP
  .B \fBaccesslog\fP
  .sp
[email protected]@ -2254,13 +2110,13 @@
[email protected]@ -2552,13 +2408,13 @@
  To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
  command line.
  .sp
@@ -12415,7 +13050,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
[email protected]@ -2267,7 +2123,7 @@
[email protected]@ -2565,7 +2421,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
@@ -12424,7 +13059,7 @@
  .fi
  .TP
  .B \fBcache\fP
[email protected]@ -2276,7 +2132,7 @@
[email protected]@ -2574,7 +2430,7 @@
  .TP
  .B \fBcertificate\fP
  .sp
@@ -12433,7 +13068,7 @@
  .TP
  .B \fBcollapse\fP
  .sp
[email protected]@ -2333,7 +2189,7 @@
[email protected]@ -2646,7 +2502,7 @@
  .TP
  .B \fBdescription\fP
  .sp
@@ -12442,7 +13077,7 @@
  (default: "unknown")
  .TP
  .B \fBencoding\fP
[email protected]@ -2398,7 +2254,7 @@
[email protected]@ -2720,7 +2576,7 @@
  .TP
  .B \fBprefix\fP
  .sp
@@ -12451,7 +13086,7 @@
  .TP
  .B \fBpush_ssl\fP
  .sp
[email protected]@ -2437,7 +2293,7 @@
[email protected]@ -2759,7 +2615,7 @@
  .sp
  Where to find the HTML templates. The default path to the HTML templates
  can be obtained from \fBhg debuginstall\fP.
@@ -12460,7 +13095,7 @@
  .SS \fBwebsub\fP
  .sp
  Web substitution filter definition. You can use this section to
[email protected]@ -2459,9 +2315,9 @@
[email protected]@ -2781,9 +2637,9 @@
  which in turn imitates the Unix sed replacement syntax:
  .sp
  .nf
@@ -12472,7 +13107,7 @@
  .fi
  .sp
  You can use any separator other than "/". The final "i" is optional
[email protected]@ -2470,12 +2326,12 @@
[email protected]@ -2792,12 +2648,12 @@
  Examples:
  .sp
  .nf
@@ -12487,7 +13122,7 @@
  .fi
  .SS \fBworker\fP
  .sp
[email protected]@ -2482,7 +2338,7 @@
[email protected]@ -2804,7 +2660,7 @@
  Parallel master/worker configuration. We currently perform working
  directory updates in parallel on Unix\-like systems, which greatly
  helps performance.
@@ -12496,7 +13131,7 @@
  .TP
  .B \fBnumcpus\fP
  .sp
[email protected]@ -2493,7 +2349,7 @@
[email protected]@ -2815,7 +2671,7 @@
  .B \fBbackgroundclose\fP
  .sp
  Whether to enable closing file handles on background threads during certain
@@ -12505,7 +13140,7 @@
  handles that have been written or appended to. By performing file closing
  on background threads, file write rate can increase substantially.
  (default: true on Windows, false elsewhere)
[email protected]@ -2501,7 +2357,7 @@
[email protected]@ -2823,7 +2679,7 @@
  .B \fBbackgroundcloseminfilecount\fP
  .sp
  Minimum number of files required to trigger background file closing.
@@ -12514,7 +13149,7 @@
  threads.
  (default: 2048)
  .TP
[email protected]@ -2517,18 +2373,18 @@
[email protected]@ -2839,18 +2695,18 @@
  Number of threads to process background file closes. Only relevant if
  \fBbackgroundclose\fP is enabled.
  (default: 4)
@@ -12535,6 +13170,6 @@
  .sp
 -This manual page is copyright 2005 Bryan O\(aqSullivan.
 +This manual page is copyright 2005 Bryan O'Sullivan.
- Mercurial is copyright 2005\-2016 Matt Mackall.
+ Mercurial is copyright 2005\-2017 Matt Mackall.
  Free use of this software is granted under the terms of the GNU General
  Public License version 2 or any later version.