merge with stable

hgext/convert/p4.py

@@ -108,7 +108,7 b' class p4_source(converter_source):'
             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')

mercurial/exchange.py

@@ -281,7 +281,7 b' def _pushchangeset(pushop):'
         # 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

mercurial/hgweb/hgweb_mod.py

@@ -109,8 +109,6 b' class hgweb(object):'
         # 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 b' class hgweb(object):'
             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
 

tests/test-fncache.t

@@ -227,7 +227,7 b' Aborting transaction prevents fncache ch'
   > cmdtable = {}
   > 
   > EOF
-  $ rm "${extpath}c"
+  $ rm -f "${extpath}c"
   $ touch z
   $ hg ci -qAm z
   transaction abort!