# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1403143176 18000
# Node ID cd3c79392056a0d965236e4986a7a4b5d580f3e5
# Parent  84cd5ee787ed1f5d37674690d90e49a1b67e3e1f# Parent  b2dc026a9bd2620a0b8c1f28caf5a608352960ab
merge with stable

diff -r 84cd5ee787ed -r cd3c79392056 hgext/convert/p4.py
--- a/hgext/convert/p4.py	Wed Jun 18 20:51:49 2014 -0500
+++ b/hgext/convert/p4.py	Wed Jun 18 20:59:36 2014 -0500
@@ -108,7 +108,7 @@
             cmd = "p4 -G describe -s %s" % change
             stdout = util.popen(cmd, mode='rb')
             d = marshal.load(stdout)
-            desc = self.recode(d["desc"])
+            desc = self.recode(d.get("desc", ""))
             shortdesc = desc.split("\n", 1)[0]
             t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
             ui.status(util.ellipsis(t, 80) + '\n')
diff -r 84cd5ee787ed -r cd3c79392056 mercurial/exchange.py
--- a/mercurial/exchange.py	Wed Jun 18 20:51:49 2014 -0500
+++ b/mercurial/exchange.py	Wed Jun 18 20:59:36 2014 -0500
@@ -281,7 +281,7 @@
         # ssh: return remote's addchangegroup()
         # http: return remote's addchangegroup() or 0 for error
         pushop.ret = pushop.remote.unbundle(cg, remoteheads,
-                                            'push')
+                                            pushop.repo.url())
     else:
         # we return an integer indicating remote head count
         # change
diff -r 84cd5ee787ed -r cd3c79392056 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Wed Jun 18 20:51:49 2014 -0500
+++ b/mercurial/hgweb/hgweb_mod.py	Wed Jun 18 20:59:36 2014 -0500
@@ -109,8 +109,6 @@
         # compare changelog size in addition to mtime to catch
         # rollbacks made less than a second ago
         if st.st_mtime != self.mtime or st.st_size != self.size:
-            self.mtime = st.st_mtime
-            self.size = st.st_size
             r = hg.repository(self.repo.baseui, self.repo.root)
             self.repo = self._getview(r)
             self.maxchanges = int(self.config("web", "maxchanges", 10))
@@ -121,6 +119,9 @@
             self.allowpull = self.configbool("web", "allowpull", True)
             encoding.encoding = self.config("web", "encoding",
                                             encoding.encoding)
+            # update these last to avoid threads seeing empty settings
+            self.mtime = st.st_mtime
+            self.size = st.st_size
         if request:
             self.repo.ui.environ = request.env
 
diff -r 84cd5ee787ed -r cd3c79392056 tests/test-fncache.t
--- a/tests/test-fncache.t	Wed Jun 18 20:51:49 2014 -0500
+++ b/tests/test-fncache.t	Wed Jun 18 20:59:36 2014 -0500
@@ -227,7 +227,7 @@
   > cmdtable = {}
   > 
   > EOF
-  $ rm "${extpath}c"
+  $ rm -f "${extpath}c"
   $ touch z
   $ hg ci -qAm z
   transaction abort!