[PATCH 1 of 2 STABLE] terse: split on repo separator instead of os.sep (issue5715)
Matt Harbison
mharbison72 at gmail.com
Sat Oct 28 04:24:56 UTC 2017
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1509162518 14400
# Fri Oct 27 23:48:38 2017 -0400
# Branch stable
# Node ID f5cdf17fe89faac2439732269e3988cb05134b0a
# Parent ea8d40bbb945a15df07a93164ec244a5f6e8d26e
terse: split on repo separator instead of os.sep (issue5715)
The paths being processed are from scmutil.status, and therefore normalized to
'/' separators.
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -404,11 +404,6 @@
return commit(ui, repo, recordinwlock, pats, opts)
-
-# extracted at module level as it's required each time a file will be added
-# to dirnode class object below
-pathsep = pycompat.ossep
-
class dirnode(object):
"""
Represent a directory in user working copy with information required for
@@ -446,8 +441,8 @@
# the filename contains a path separator, it means it's not the direct
# child of this directory
- if pathsep in filename:
- subdir, filep = filename.split(pathsep, 1)
+ if r'/' in filename:
+ subdir, filep = filename.split(r'/', 1)
# does the dirnode object for subdir exists
if subdir not in self.subdirs:
More information about the Mercurial-devel
mailing list