This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4248

mq: use stringutil.pprint instead of pycompat.byterepr
ClosedPublic

Authored by durin42 on Aug 10 2018, 2:07 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb53ec524420b: mq: use stringutil.pprint instead of pycompat.byterepr
Summary

Resolves a few output changes on Python 3 in test-mq.t, and gets us
two new passing tests.

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

durin42 created this revision.Aug 10 2018, 2:07 AM
durin42 edited the summary of this revision. (Show Details)Aug 10 2018, 3:34 AM
durin42 updated this revision to Diff 10285.
pulkit accepted this revision.Aug 10 2018, 8:08 AM
Closed by commit rHGb53ec524420b: mq: use stringutil.pprint instead of pycompat.byterepr (authored by durin42). · Explain WhyAug 10 2018, 8:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (2 lines)
Mhgext/mq.py (6 lines)

Diff 10294

contrib/python3-whitelist

test-merge5.t test-merge5.t
test-merge6.t test-merge6.t
test-merge7.t test-merge7.t
test-merge8.t test-merge8.t
test-merge9.t test-merge9.t
test-minifileset.py test-minifileset.py
test-minirst.py test-minirst.py
test-mq-git.t test-mq-git.t
test-mq-guards.t
test-mq-header-date.t test-mq-header-date.t
test-mq-header-from.t test-mq-header-from.t
test-mq-merge.t test-mq-merge.t
test-mq-pull-from-bundle.t test-mq-pull-from-bundle.t
test-mq-qclone-http.t test-mq-qclone-http.t
test-mq-qdelete.t test-mq-qdelete.t
test-mq-qdiff.t test-mq-qdiff.t
test-mq-qfold.t test-mq-qfold.t
test-mq-qgoto.t test-mq-qgoto.t
test-mq-qimport-fail-cleanup.t test-mq-qimport-fail-cleanup.t
test-mq-qnew.t test-mq-qnew.t
test-mq-qpush-exact.t test-mq-qpush-exact.t
test-mq-qpush-fail.t
test-mq-qqueue.t test-mq-qqueue.t
test-mq-qrefresh-interactive.t test-mq-qrefresh-interactive.t
test-mq-qrefresh-replace-log-message.t test-mq-qrefresh-replace-log-message.t
test-mq-qrefresh.t test-mq-qrefresh.t
test-mq-qrename.t test-mq-qrename.t
test-mq-qsave.t test-mq-qsave.t
test-mq-safety.t test-mq-safety.t
test-mq-subrepo.t test-mq-subrepo.t

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, pycompat.byterepr(exactneg[0]) return False, stringutil.pprint(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, pycompat.byterepr(exactpos[0]) return True, stringutil.pprint(exactpos[0])
return False, ' '.join([pycompat.byterepr(p) for p in pos]) return False, ' '.join([stringutil.pprint(p) for p in pos])
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