# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1471278362 14400
# Node ID 531e85eec23ca0fc0bc24274a76b890257c2bdbb
# Parent  997e8cf4d0a29d28759e38659736cb3d1cf9ef3f# Parent  5004ef47f437b3bafdd3800551c638a0bf4bb99b
merge with stable

diff -r 997e8cf4d0a2 -r 531e85eec23c contrib/debian/copyright
--- a/contrib/debian/copyright	Sat Aug 13 04:21:42 2016 +0530
+++ b/contrib/debian/copyright	Mon Aug 15 12:26:02 2016 -0400
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mercurial
-Source: http://www.selenic.com/mercurial/
+Source: https://www.mercurial-scm.org/
 
 Files: *
 Copyright: 2005-2015, Matt Mackall <mpm@selenic.com> and others.
diff -r 997e8cf4d0a2 -r 531e85eec23c contrib/macosx/Readme.html
--- a/contrib/macosx/Readme.html	Sat Aug 13 04:21:42 2016 +0530
+++ b/contrib/macosx/Readme.html	Mon Aug 15 12:26:02 2016 -0400
@@ -32,6 +32,6 @@
 <p class="p1"><b>Reporting problems</b></p>
 <p class="p2"><br></p>
 <p class="p3">If you run into any problems, please file a bug online:</p>
-<p class="p3"><a href="http://bz.selenic.com/">http://bz.selenic.com/</a></p>
+<p class="p3"><a href="https://bz.mercurial-scm.org/">https://bz.mercurial-scm.org/</a></p>
 </body>
 </html>
diff -r 997e8cf4d0a2 -r 531e85eec23c contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html	Sat Aug 13 04:21:42 2016 +0530
+++ b/contrib/win32/ReadMe.html	Mon Aug 15 12:26:02 2016 -0400
@@ -117,7 +117,7 @@
     <p>
       If you cannot find an answer to your question, please feel free
       to send mail to the Mercurial mailing list, at <a
-      href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
+      href="mailto:mercurial@mercurial-scm.org">mercurial@mercurial-scm.org</a>.
       <b>Remember</b>, the more useful information you include in your
       report, the easier it will be for us to help you!
     </p>
diff -r 997e8cf4d0a2 -r 531e85eec23c contrib/win32/mercurial.ini
--- a/contrib/win32/mercurial.ini	Sat Aug 13 04:21:42 2016 +0530
+++ b/contrib/win32/mercurial.ini	Mon Aug 15 12:26:02 2016 -0400
@@ -30,7 +30,7 @@
 
 ;
 ; For more information about mercurial extensions, start here
-; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
+; https://www.mercurial-scm.org/wiki/UsingExtensions
 ;
 ; Extensions shipped with Mercurial
 ;
diff -r 997e8cf4d0a2 -r 531e85eec23c hgext/convert/transport.py
--- a/hgext/convert/transport.py	Sat Aug 13 04:21:42 2016 +0530
+++ b/hgext/convert/transport.py	Mon Aug 15 12:26:02 2016 -0400
@@ -34,8 +34,7 @@
 # won't work worth a darn against those libraries anyway!
 svn.ra.initialize()
 
-svn_config = svn.core.svn_config_get_config(None)
-
+svn_config = None
 
 def _create_auth_baton(pool):
     """Create a Subversion authentication baton. """
@@ -88,6 +87,9 @@
                 svn.core.svn_auth_set_parameter(
                     ab, svn.core.SVN_AUTH_PARAM_DEFAULT_PASSWORD, self.password)
             self.client.auth_baton = ab
+            global svn_config
+            if svn_config is None:
+                svn_config = svn.core.svn_config_get_config(None)
             self.client.config = svn_config
             try:
                 self.ra = svn.client.open_ra_session(
diff -r 997e8cf4d0a2 -r 531e85eec23c mercurial/exchange.py
--- a/mercurial/exchange.py	Sat Aug 13 04:21:42 2016 +0530
+++ b/mercurial/exchange.py	Mon Aug 15 12:26:02 2016 -0400
@@ -864,7 +864,8 @@
     stream = util.chunkbuffer(bundler.getchunks())
     try:
         try:
-            reply = pushop.remote.unbundle(stream, ['force'], 'push')
+            reply = pushop.remote.unbundle(
+                stream, ['force'], pushop.remote.url())
         except error.BundleValueError as exc:
             raise error.Abort(_('missing support for %s') % exc)
         try:
diff -r 997e8cf4d0a2 -r 531e85eec23c mercurial/help/config.txt
--- a/mercurial/help/config.txt	Sat Aug 13 04:21:42 2016 +0530
+++ b/mercurial/help/config.txt	Mon Aug 15 12:26:02 2016 -0400
@@ -1630,6 +1630,12 @@
 
 Alias definitions for templates. See :hg:`help templates` for details.
 
+``templates``
+-------------
+
+Use the ``[templates]`` section to define template strings.
+See :hg:`help templates` for details.
+
 ``trusted``
 -----------
 
diff -r 997e8cf4d0a2 -r 531e85eec23c mercurial/help/scripting.txt
--- a/mercurial/help/scripting.txt	Sat Aug 13 04:21:42 2016 +0530
+++ b/mercurial/help/scripting.txt	Mon Aug 15 12:26:02 2016 -0400
@@ -22,7 +22,7 @@
 :hg:`serve` 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://www.mercurial-scm.org/wiki/CommandServer.
 
 :hg:`serve` based interfaces (the hgweb and command servers) have the
 advantage over simple ``hg`` process invocations in that they are
diff -r 997e8cf4d0a2 -r 531e85eec23c mercurial/help/templates.txt
--- a/mercurial/help/templates.txt	Sat Aug 13 04:21:42 2016 +0530
+++ b/mercurial/help/templates.txt	Mon Aug 15 12:26:02 2016 -0400
@@ -71,6 +71,20 @@
 defines two symbol aliases, ``r`` and ``rn``, and a function alias
 ``leftpad()``.
 
+It's also possible to specify complete template strings, using the
+``templates`` section. The syntax used is the general template string syntax.
+
+For example,
+
+::
+
+  [templates]
+  nodedate = "{node|short}: {date(date, "%Y-%m-%d")}\n"
+
+defines a template, ``nodedate``, which can be called like::
+
+  $ hg log -r . -Tnodedate
+
 Some sample command line templates:
 
 - Format lists, e.g. files::
diff -r 997e8cf4d0a2 -r 531e85eec23c mercurial/revset.py
--- a/mercurial/revset.py	Sat Aug 13 04:21:42 2016 +0530
+++ b/mercurial/revset.py	Mon Aug 15 12:26:02 2016 -0400
@@ -2433,6 +2433,9 @@
     elif op == 'list':
         ws, ts = zip(*(_optimize(y, small) for y in x[1:]))
         return sum(ws), (op,) + ts
+    elif op == 'keyvalue':
+        w, t = _optimize(x[2], small)
+        return w, (op, x[1], t)
     elif op == 'func':
         f = getsymbol(x[1])
         wa, ta = _optimize(x[2], small)
diff -r 997e8cf4d0a2 -r 531e85eec23c tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t	Sat Aug 13 04:21:42 2016 +0530
+++ b/tests/test-bundle2-exchange.t	Mon Aug 15 12:26:02 2016 -0400
@@ -256,7 +256,7 @@
   remote: lock:  free
   remote: wlock: free
   remote: postclose-tip:eea13746799a public book_eea1
-  remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+  remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/other (glob)
   updating bookmark book_eea1
   pre-close-tip:02de42196ebe draft book_02de
   postclose-tip:02de42196ebe draft book_02de
diff -r 997e8cf4d0a2 -r 531e85eec23c tests/test-hook.t
--- a/tests/test-hook.t	Sat Aug 13 04:21:42 2016 +0530
+++ b/tests/test-hook.t	Mon Aug 15 12:26:02 2016 -0400
@@ -230,9 +230,9 @@
   searching for changes
   no changes found
   pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob)
-  pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+  pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob)
   pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
-  txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob)
+  txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob)
   exporting bookmark foo
   [1]
   $ cd ../a
@@ -265,7 +265,7 @@
   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   no changes found
   pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob)
-  prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=push (glob)
+  prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/a (glob)
   pushkey-abort: prepushkey hook exited with status 1
   abort: exporting bookmark baz failed!
   [255]
diff -r 997e8cf4d0a2 -r 531e85eec23c tests/test-revset.t
--- a/tests/test-revset.t	Sat Aug 13 04:21:42 2016 +0530
+++ b/tests/test-revset.t	Mon Aug 15 12:26:02 2016 -0400
@@ -470,6 +470,25 @@
   hg: parse error: can't use a key-value pair in this context
   [255]
 
+ right-hand side should be optimized recursively
+
+  $ try --optimize 'foo=(not public())'
+  (keyvalue
+    ('symbol', 'foo')
+    (group
+      (not
+        (func
+          ('symbol', 'public')
+          None))))
+  * optimized:
+  (keyvalue
+    ('symbol', 'foo')
+    (func
+      ('symbol', '_notpublic')
+      None))
+  hg: parse error: can't use a key-value pair in this context
+  [255]
+
 Test that symbols only get parsed as functions if there's an opening
 parenthesis.
 
@@ -1801,6 +1820,11 @@
   hg: parse error: topo.firstbranch can only be used when using the topo sort key
   [255]
 
+topo.firstbranch should accept any kind of expressions:
+
+  $ hg log -r 'sort(0, topo, topo.firstbranch=(book1))'
+  0 b12  m111 u112 111 10800
+
   $ cd ..
   $ cd repo