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

merge with stable

Browse Source
This commit is contained in:
Matt Mackall 2011-12-15 14:37:36 -06:00
commit 03f5247248
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/merge.py
View File

@ -7,7 +7,7 @@
from node import nullid, nullrev, hex, bin
from i18n import _
import scmutil, util, filemerge, copies, subrepo, encoding
import scmutil, util, filemerge, copies, subrepo
import errno, os, shutil
class mergestate(object):
@ -100,7 +100,7 @@ def _checkcollision(mctx):
"check for case folding collisions in the destination context"
folded = {}
for fn in mctx:
fold = encoding.lower(fn)
fold = util.normcase(fn)
if fold in folded:
raise util.Abort(_("case-folding collision between %s and %s")
% (fn, folded[fold]))

7
mercurial/windows.py
View File

@ -140,7 +140,7 @@ def realpath(path):
'''
# TODO: There may be a more clever way to do this that also handles other,
# less common file systems.
return os.path.normpath(os.path.normcase(os.path.realpath(path)))
return os.path.normpath(normcase(os.path.realpath(path)))
def samestat(s1, s2):
return False
@ -216,17 +216,16 @@ def findexe(command):
def statfiles(files):
'''Stat each file in files and yield stat or None if file does not exist.
Cluster and cache stat per directory to minimize number of OS stat calls.'''
ncase = os.path.normcase
dircache = {} # dirname -> filename -> status | None if file does not exist
for nf in files:
nf = ncase(nf)
nf = normcase(nf)
dir, base = os.path.split(nf)
if not dir:
dir = '.'
cache = dircache.get(dir, None)
if cache is None:
try:
dmap = dict([(ncase(n), s)
dmap = dict([(normcase(n), s)
for n, k, s in osutil.listdir(dir, True)])
except OSError, err:
# handle directory not found in Python version prior to 2.5