# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1396638085 18000
# Node ID 3737e653dcbeb61ec9dd65b61347ee2ecf4040a0
# Parent  c79503f7adac7b656eca715bca48503b0232876f# Parent  e9725e18bdf8eaebbdd3a5a4b4dba66e615d5574
merge with stable

diff -r c79503f7adac -r 3737e653dcbe hgext/shelve.py
--- a/hgext/shelve.py	Fri Mar 28 12:51:05 2014 -0500
+++ b/hgext/shelve.py	Fri Apr 04 14:01:25 2014 -0500
@@ -149,7 +149,7 @@
     label = repo._bookmarkcurrent or parent.branch() or 'default'
 
     # slashes aren't allowed in filenames, therefore we rename it
-    origlabel, label = label, label.replace('/', '_')
+    label = label.replace('/', '_')
 
     def gennames():
         yield label
diff -r c79503f7adac -r 3737e653dcbe mercurial/changegroup.py
--- a/mercurial/changegroup.py	Fri Mar 28 12:51:05 2014 -0500
+++ b/mercurial/changegroup.py	Fri Apr 04 14:01:25 2014 -0500
@@ -360,7 +360,7 @@
 
         def linknodes(filerevlog, fname):
             if fastpathlinkrev:
-                ln, llr = filerevlog.node, filerevlog.linkrev
+                llr = filerevlog.linkrev
                 def genfilenodes():
                     for r in filerevlog:
                         linkrev = llr(r)
diff -r c79503f7adac -r 3737e653dcbe tests/test-pathencode.py
--- a/tests/test-pathencode.py	Fri Mar 28 12:51:05 2014 -0500
+++ b/tests/test-pathencode.py	Fri Apr 04 14:01:25 2014 -0500
@@ -143,7 +143,6 @@
 
     mink, maxk = 1, 4096
     def steps():
-        x, k = 0, mink
         for i in xrange(count):
             yield mink + int(round(math.sqrt((maxk - mink) * float(i) / count)))
     for k in steps():