This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2894

py3: use pycompat.bytestr() in dirstate.py
ClosedPublic

Authored by pulkit on Mar 19 2018, 3:31 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGd5d42c170f4d: py3: use pycompat.bytestr() in dirstate.py
Summary

This prevents extra b'' prefixes in output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 19 2018, 3:31 AM
yuja accepted this revision.Mar 19 2018, 9:34 AM
This revision is now accepted and ready to land.Mar 19 2018, 9:34 AM
Closed by commit rHGd5d42c170f4d: py3: use pycompat.bytestr() in dirstate.py (authored by pulkit). · Explain WhyMar 19 2018, 9:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (6 lines)

Diff 7112

mercurial/dirstate.py

def copies(self): def copies(self):
return self._map.copymap return self._map.copymap
def _addpath(self, f, state, mode, size, mtime): def _addpath(self, f, state, mode, size, mtime):
oldstate = self[f] oldstate = self[f]
if state == 'a' or oldstate == 'r': if state == 'a' or oldstate == 'r':
scmutil.checkfilename(f) scmutil.checkfilename(f)
if self._map.hastrackeddir(f): if self._map.hastrackeddir(f):
raise error.Abort(_('directory %r already in dirstate') % f) raise error.Abort(_('directory %r already in dirstate') %
pycompat.bytestr(f))
# shadows # shadows
for d in util.finddirs(f): for d in util.finddirs(f):
if self._map.hastrackeddir(d): if self._map.hastrackeddir(d):
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and entry[0] != 'r': if entry is not None and entry[0] != 'r':
raise error.Abort( raise error.Abort(
_('file %r in dirstate clashes with %r') % (d, f)) _('file %r in dirstate clashes with %r') %
(pycompat.bytestr(d), pycompat.bytestr(f)))
self._dirty = True self._dirty = True
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._map.addfile(f, oldstate, state, mode, size, mtime) self._map.addfile(f, oldstate, state, mode, size, mtime)
def normal(self, f): def normal(self, f):
'''Mark a file normal and clean.''' '''Mark a file normal and clean.'''
s = os.lstat(self._join(f)) s = os.lstat(self._join(f))
mtime = s[stat.ST_MTIME] mtime = s[stat.ST_MTIME]