facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Matt Mackall 2014-04-04 14:01:25 -05:00
commit e10cab8769
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/shelve.py
View File

@ -149,7 +149,7 @@ def createcmd(ui, repo, pats, opts):
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

2
mercurial/changegroup.py
View File

@ -360,7 +360,7 @@ class bundle10(object):
def linknodes(filerevlog, fname):
if fastpathlinkrev:
ln, llr = filerevlog.node, filerevlog.linkrev
llr = filerevlog.linkrev
def genfilenodes():
for r in filerevlog:
linkrev = llr(r)

1
tests/test-pathencode.py
View File

@ -143,7 +143,6 @@ def genpath(rng, count):
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():