mercurial: 2.2.3 -> 2.3.1

3 files changed, 21 insertions, 24 deletions

diff --git a/mercurial/.footprint b/mercurial/.footprint
index 053c2ec73..8ad815285 100644
--- a/mercurial/.footprint
+++ b/mercurial/.footprint
@@ -69,6 +69,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/hgext/highlight/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/highlight/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/highlight/highlight.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/highlight/highlight.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/histedit.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/histedit.pyc
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/hgext/inotify/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/inotify/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/inotify/__init__.pyc
@@ -146,7 +148,7 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/Zeroconf.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial-2.2.3-py2.7.egg-info
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial-2.3.1-py2.7.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/__init__.py (EMPTY)
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/__init__.pyc
@@ -262,27 +264,14 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/hgweb/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/_readers.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/_readers.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/socketutil.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/socketutil.pyc
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/simple_http_test.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/simple_http_test.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_bogus_responses.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_bogus_responses.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_chunked_transfer.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_chunked_transfer.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_proxy_support.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_proxy_support.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_ssl.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/test_ssl.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/util.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/util.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpconnection.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httpconnection.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httprepo.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httprepo.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httppeer.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/httppeer.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/i18n.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/i18n.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/ignore.py
@@ -312,12 +301,16 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/mpatch.so
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/node.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/node.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/obsolete.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/obsolete.pyc
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/osutil.so
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/parser.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/parser.pyc
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/parsers.so
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/patch.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/patch.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/peer.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/peer.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/phases.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/phases.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/posix.py
@@ -330,8 +323,6 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/py3kcompat.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/repair.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/repair.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/repo.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/repo.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/revlog.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/revlog.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/revset.py
@@ -344,8 +335,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/httpclient/tests/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/similar.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/simplemerge.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/simplemerge.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshrepo.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshrepo.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshpeer.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshpeer.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshserver.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sshserver.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/sslutil.py
@@ -389,6 +380,7 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/changeset.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/error.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/fileannotate.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/filecomparison.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/filediff.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/filelog.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/gitweb/filerevision.tmpl
@@ -418,6 +410,7 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblu
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/changeset.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/error.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/fileannotate.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/filecomparison.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/filediff.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/filelog.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/monoblue/filerevision.tmpl
@@ -441,6 +434,7 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/diffstat.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/error.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/fileannotate.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/filecomparison.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/filediff.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/filelog.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/paper/filelogentry.tmpl
@@ -463,6 +457,9 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/error.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/fileannotate.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/filediff.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/graph.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/graphedge.tmpl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/graphnode.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/index.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/manifest.tmpl
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/mercurial/templates/raw/map
diff --git a/mercurial/.md5sum b/mercurial/.md5sum
index c59df12d9..1fc898e47 100644
--- a/mercurial/.md5sum
+++ b/mercurial/.md5sum
@@ -1 +1 @@
-f4c70af3892d964b83b2718bde44c2f8  mercurial-2.2.3.tar.gz
+22a46a3ae64a5d625f068e588b4d6ec2  mercurial-2.3.1.tar.gz
diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile
index 55e08f87a..57420c258 100644
--- a/mercurial/Pkgfile
+++ b/mercurial/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: python
 
 name=mercurial
-version=2.2.3
+version=2.3.1
 release=1
 source=(http://www.selenic.com/$name/release/$name-$version.tar.gz)