This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2152

py3: compare against bytes instead of str
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHGc33a99506e13: py3: compare against bytes instead of str
Summary

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

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:15 AM
durin42 accepted this revision.Feb 12 2018, 9:25 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:25 PM
Closed by commit rHGc33a99506e13: py3: compare against bytes instead of str (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (2 lines)

Diff 5577

hgext/mq.py

if bad: if bad:
raise error.Abort(bad) raise error.Abort(bad)
drop = self.guard_re.sub('', self.fullseries[idx]) drop = self.guard_re.sub('', self.fullseries[idx])
self.fullseries[idx] = drop + ''.join([' #' + g for g in guards]) self.fullseries[idx] = drop + ''.join([' #' + g for g in guards])
self.parseseries() self.parseseries()
self.seriesdirty = True self.seriesdirty = True
def pushable(self, idx): def pushable(self, idx):
if isinstance(idx, str): if isinstance(idx, bytes):
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 if g[0] == '-' and g[1:] in guards] exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards]
if exactneg: if exactneg:
return False, repr(exactneg[0]) return False, repr(exactneg[0])