This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3216

py3: use pycompat.byterepr() instead of repr()
ClosedPublic

Authored by pulkit on Apr 10 2018, 10:15 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG58230f4fcc0b: py3: use pycompat.byterepr() instead of repr()
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Apr 10 2018, 10:15 AM
yuja requested changes to this revision.Apr 10 2018, 11:16 AM
yuja added a subscriber: yuja.
yuja added inline comments.
hgext/mq.py
670

Maybe these three should be byterepr().

This revision now requires changes to proceed.Apr 10 2018, 11:16 AM
pulkit retitled this revision from py3: use pycompat.bytestr() where repr in involved to py3: use pycompat.byterepr() instead of repr().Apr 11 2018, 5:25 AM
pulkit added a child revision: D3244: py3: use pycompat.bytestr() where repr in involved.
pulkit updated this revision to Diff 7962.
Closed by commit rHG58230f4fcc0b: py3: use pycompat.byterepr() instead of repr() (authored by pulkit). · Explain WhyApr 11 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (8 lines)

Diff 7928

hgext/mq.py

idx = self.series.index(idx) idx = self.series.index(idx)
patchguards = self.seriesguards[idx] patchguards = self.seriesguards[idx]
if not patchguards: if not patchguards:
return True, None return True, None
guards = self.active() guards = self.active()
exactneg = [g for g in patchguards exactneg = [g for g in patchguards
if g.startswith('-') and g[1:] in guards] if g.startswith('-') and g[1:] in guards]
if exactneg: if exactneg:
return False, repr(exactneg[0]) return False, pycompat.bytestr(repr(exactneg[0]))
pos = [g for g in patchguards if g.startswith('+')] pos = [g for g in patchguards if g.startswith('+')]
exactpos = [g for g in pos if g[1:] in guards] exactpos = [g for g in pos if g[1:] in guards]
if pos: if pos:
if exactpos: if exactpos:
return True, repr(exactpos[0]) return True, pycompat.bytestr(repr(exactpos[0]))
return False, ' '.join(map(repr, pos)) return False, ' '.join([pycompat.bytestr(repr(p)) for p in pos])
yujaUnsubmitted
Not Done

Maybe these three should be byterepr().

yuja: Maybe these three should be `byterepr()`.
return True, '' return True, ''
def explainpushable(self, idx, all_patches=False): def explainpushable(self, idx, all_patches=False):
if all_patches: if all_patches:
write = self.ui.write write = self.ui.write
else: else:
write = self.ui.warn write = self.ui.warn
'whitespace')) 'whitespace'))
for prefix in ('.hg', '.mq'): for prefix in ('.hg', '.mq'):
if name.startswith(prefix): if name.startswith(prefix):
raise error.Abort(_('patch name cannot begin with "%s"') raise error.Abort(_('patch name cannot begin with "%s"')
% prefix) % prefix)
for c in ('#', ':', '\r', '\n'): for c in ('#', ':', '\r', '\n'):
if c in name: if c in name:
raise error.Abort(_('%r cannot be used in the name of a patch') raise error.Abort(_('%r cannot be used in the name of a patch')
% c) % pycompat.bytestr(c))
def checkpatchname(self, name, force=False): def checkpatchname(self, name, force=False):
self.checkreservedname(name) self.checkreservedname(name)
if not force and os.path.exists(self.join(name)): if not force and os.path.exists(self.join(name)):
if os.path.isdir(self.join(name)): if os.path.isdir(self.join(name)):
raise error.Abort(_('"%s" already exists as a directory') raise error.Abort(_('"%s" already exists as a directory')
% name) % name)
else: else: