Skip to content
Snippets Groups Projects
Commit 25ea33fe authored by Matt Mackall's avatar Matt Mackall
Browse files

merge with stable

parents 1eefa445 6eff984d
No related branches found
No related tags found
No related merge requests found
......@@ -376,7 +376,7 @@
del self._map[f]
def _normalize(self, path, isknown):
normed = os.path.normcase(path)
normed = util.normcase(path)
folded = self._foldmap.get(normed, None)
if folded is None:
if isknown or not os.path.lexists(os.path.join(self._root, path)):
......
......@@ -164,6 +164,10 @@
st2 = os.lstat(fpath2)
return st1.st_dev == st2.st_dev
# os.path.normcase is a no-op, which doesn't help us on non-native filesystems
def normcase(path):
return path.lower()
if sys.platform == 'darwin':
import fcntl # only needed on darwin, missing on jython
def realpath(path):
......
......@@ -44,6 +44,7 @@
makedir = platform.makedir
nlinks = platform.nlinks
normpath = platform.normpath
normcase = platform.normcase
nulldev = platform.nulldev
openhardlinks = platform.openhardlinks
oslink = platform.oslink
......
......@@ -131,6 +131,8 @@
def normpath(path):
return pconvert(os.path.normpath(path))
normcase = os.path.normcase
def realpath(path):
'''
Returns the true, canonical file system path equivalent to the given
......
......@@ -165,10 +165,10 @@
a => b
$ mkdir a
$ bzr add a
adding a
add(ed|ing) a (re)
$ bzr mv b/c a/c
b/c => a/c
$ bzr status
added:
a/
renamed:
......@@ -169,11 +169,11 @@
$ bzr mv b/c a/c
b/c => a/c
$ bzr status
added:
a/
renamed:
a/ => b/
a/c/ => a/c/
a/? => b/? (re)
a/c/? => a/c/? (re)
$ bzr commit -q -m 'Divergent renames'
$ cd ..
$ hg convert source source-hg
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment