Patchwork posix: fix split() for the case where the path is at the root of the filesystem

login
register
mail settings
Submitter Remy Blank
Date Jan. 9, 2013, 7:33 p.m.
Message ID <8e96659eec9e524c08f5.1357759991@pat.athome>
Download mbox | patch
Permalink /patch/515/
State Accepted
Commit 0d5a22f73a1f8d7b871c51bc8426264e8c629ce4
Headers show

Comments

Remy Blank - Jan. 9, 2013, 7:33 p.m.
# HG changeset patch
# User Remy Blank <remy.blank@pobox.com>
# Date 1357759637 -3600
# Node ID 8e96659eec9e524c08f5a4a604e5e2dfd1879ed3
# Parent  83aa4359c49f67bcb98fb9c7d885ed4ac7443239
posix: fix split() for the case where the path is at the root of the filesystem

posixpath.split() strips '/' from the dirname *unless it is the root*. This
patch reproduces this behavior in posix.split(). The old behavior causes a
crash when creating a file at the root of the repo with localrepo.wfile()
when the repo is at the root of the filesystem.
Bryan O'Sullivan - Jan. 9, 2013, 9:38 p.m.
On Wed, Jan 9, 2013 at 11:33 AM, Remy Blank <remy.blank@pobox.com> wrote:

> posix: fix split() for the case where the path is at the root of the
> filesystem
>

Pushed to crew, thanks.

Patch

diff --git a/mercurial/posix.py b/mercurial/posix.py
--- a/mercurial/posix.py
+++ b/mercurial/posix.py
@@ -21,14 +21,26 @@  umask = os.umask(0)
 os.umask(umask)
 
 def split(p):
-    '''Same as os.path.split, but faster'''
+    '''Same as posixpath.split, but faster
+
+    >>> import posixpath
+    >>> for f in ['/absolute/path/to/file',
+    ...           'relative/path/to/file',
+    ...           'file_alone',
+    ...           'path/to/directory/',
+    ...           '/multiple/path//separators',
+    ...           '/file_at_root',
+    ...           '///multiple_leading_separators_at_root',
+    ...           '']:
+    ...     assert split(f) == posixpath.split(f), f
+    '''
     ht = p.rsplit('/', 1)
     if len(ht) == 1:
         return '', p
     nh = ht[0].rstrip('/')
     if nh:
         return nh, ht[1]
-    return ht
+    return ht[0] + '/', ht[1]
 
 def openhardlinks():
     '''return true if it is safe to hold open file handles to hardlinks'''
diff --git a/tests/test-doctest.py b/tests/test-doctest.py
--- a/tests/test-doctest.py
+++ b/tests/test-doctest.py
@@ -6,6 +6,8 @@  import doctest
 
 import mercurial.util
 doctest.testmod(mercurial.util)
+# Only run doctests for the current platform
+doctest.testmod(mercurial.util.platform)
 
 import mercurial.changelog
 doctest.testmod(mercurial.changelog)