# HG changeset patch # User Matt Harbison # Date 2017-10-28 03:48:38 # Node ID 362096cfdb1f13a1c230be9f64a7964dfdec7b85 # Parent c2695cbb5fb1c3adc5f517b1ac84581038bf54b9 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 @@ def dorecord(ui, repo, commitfunc, cmdsu 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 @@ class dirnode(object): # 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 '/' in filename: + subdir, filep = filename.split('/', 1) # does the dirnode object for subdir exists if subdir not in self.subdirs: