Mercurial > hg
changeset 20942:3737e653dcbe
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 04 Apr 2014 14:01:25 -0500 |
| parents | c79503f7adac (current diff) e9725e18bdf8 (diff) |
| children | 003cb972178d |
| files | hgext/shelve.py mercurial/changegroup.py |
| diffstat | 3 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)
--- 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():