This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1258

tersestatus: make sure we use os.path.* to split paths (issue5715)
AbandonedPublic

Authored by durin42 on Oct 27 2017, 4:40 PM.

Details

Reviewers
yuja
pulkit
Group Reviewers
hg-reviewers
Summary

Not using os.path.* functions can cause problem on windows which led to failure
of test-status-terse.t on windows. This patch make sure we use them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 27 2017, 4:40 PM
pulkit added a subscriber: mharbison72.Oct 27 2017, 4:42 PM

@mharbison72 I didn't has access to windows machine but I think this should solve the issue, apart from test failure related to different separator which we can glob out. Please test it and let me know whether it works or not.

mharbison72 added a comment.Oct 27 2017, 11:34 PM

No joy. But it looks like you can use '/' unconditionally, because scmutil.status paths are in repo normalized format. I'll send a patch.

I think there's something else goofy here:

$ ../hg st -c --terse c ../mercurial/help/
C ..\mercurial\

I'd expect the output to be:

$ ../hg st -c --terse c ../mercurial/help/
C ..\mercurial\help

I can write up another bug if you don't have any ideas off the top of your head.

yuja requested changes to this revision.Oct 28 2017, 3:59 AM
yuja added a subscriber: yuja.

New patch landed.

This revision now requires changes to proceed.Oct 28 2017, 3:59 AM
durin42 added a reviewer: pulkit.Oct 30 2017, 5:01 PM
durin42 commandeered this revision.
durin42 added a subscriber: durin42.

Obsoleted by 362096 as far as I can tell.

durin42 abandoned this revision.Oct 30 2017, 5:02 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (22 lines)

Diff 3137

mercurial/cmdutil.py

pass pass
def recordinwlock(ui, repo, message, match, opts): def recordinwlock(ui, repo, message, match, opts):
with repo.wlock(): with repo.wlock():
return recordfunc(ui, repo, message, match, opts) return recordfunc(ui, repo, message, match, opts)
return commit(ui, repo, recordinwlock, pats, opts) 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): class dirnode(object):
""" """
Represent a directory in user working copy with information required for Represent a directory in user working copy with information required for
the purpose of tersing its status. the purpose of tersing its status.
path is the path to the directory path is the path to the directory
statuses is a set of statuses of all files in this directory (this includes statuses is a set of statuses of all files in this directory (this includes
self.statuses = set([]) self.statuses = set([])
self.files = [] self.files = []
self.subdirs = {} self.subdirs = {}
def _addfileindir(self, filename, status): def _addfileindir(self, filename, status):
"""Add a file in this directory as a direct child.""" """Add a file in this directory as a direct child."""
self.files.append((filename, status)) self.files.append((filename, status))
def _splitbyroot(self, path):
"""
splits the path from the first occurence of os.sep and returns a tuple
(rootdirectory, restofthepath)
"""
#XXX: must be replaced with pathlib once we drop Py2.7
parentdir = os.path.dirname(path)
temp = path
while parentdir:
temp = parentdir
parentdir = os.path.dirname(parentdir)
return temp, path[len(temp) + 1:]
def addfile(self, filename, status): def addfile(self, filename, status):
""" """
Add a file to this directory or to its direct parent directory. Add a file to this directory or to its direct parent directory.
If the file is not direct child of this directory, we traverse to the If the file is not direct child of this directory, we traverse to the
directory of which this file is a direct child of and add the file directory of which this file is a direct child of and add the file
there. there.
""" """
# the filename contains a path separator, it means it's not the direct # the filename contains a path separator, it means it's not the direct
# child of this directory # child of this directory
if pathsep in filename: if pycompat.ossep in filename:
subdir, filep = filename.split(pathsep, 1) subdir, filep = self._splitbyroot(filename)
# does the dirnode object for subdir exists # does the dirnode object for subdir exists
if subdir not in self.subdirs: if subdir not in self.subdirs:
subdirpath = os.path.join(self.path, subdir) subdirpath = os.path.join(self.path, subdir)
self.subdirs[subdir] = dirnode(subdirpath) self.subdirs[subdir] = dirnode(subdirpath)
# try adding the file in subdir # try adding the file in subdir
self.subdirs[subdir].addfile(filep, status) self.subdirs[subdir].addfile(filep, status)