This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1791

tests: make autodiff.py work on Python 3
ClosedPublic

Authored by pulkit on Dec 28 2017, 7:48 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG154754d1f137: tests: make autodiff.py work on Python 3
Summary

This patch adds b'' to string literal to make it compatible with in-core Python
3 compatibility.

  1. skip-blame because we are just adding b''

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.Dec 28 2017, 7:48 PM
durin42 added a subscriber: durin42.Dec 28 2017, 8:51 PM

For patches like this that are just adding bytes prefixes, let's go ahead and do a '# skip-blame' as in d92dc725223bbde09963fc431e57d32a40c4167d (aka D1170) so that blame is cleaner in the future.

pulkit edited the summary of this revision. (Show Details)Dec 29 2017, 1:24 PM
durin42 accepted this revision.Jan 10 2018, 5:56 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:56 PM
Closed by commit rHG154754d1f137: tests: make autodiff.py work on Python 3 (authored by pulkit). · Explain WhyJan 10 2018, 6:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/autodiff.py (24 lines)

Diff 4774

tests/autodiff.py

# Extension dedicated to test patch.diff() upgrade modes # Extension dedicated to test patch.diff() upgrade modes
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
error, error,
patch, patch,
registrar, registrar,
scmutil, scmutil,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
@command('autodiff', @command(b'autodiff',
[('', 'git', '', 'git upgrade mode (yes/no/auto/warn/abort)')], [(b'', b'git', b'', b'git upgrade mode (yes/no/auto/warn/abort)')],
'[OPTION]... [FILE]...') b'[OPTION]... [FILE]...')
def autodiff(ui, repo, *pats, **opts): def autodiff(ui, repo, *pats, **opts):
diffopts = patch.difffeatureopts(ui, opts) diffopts = patch.difffeatureopts(ui, opts)
git = opts.get('git', 'no') git = opts.get(b'git', b'no')
brokenfiles = set() brokenfiles = set()
losedatafn = None losedatafn = None
if git in ('yes', 'no'): if git in (b'yes', b'no'):
diffopts.git = git == 'yes' diffopts.git = git == b'yes'
diffopts.upgrade = False diffopts.upgrade = False
elif git == 'auto': elif git == b'auto':
diffopts.git = False diffopts.git = False
diffopts.upgrade = True diffopts.upgrade = True
elif git == 'warn': elif git == b'warn':
diffopts.git = False diffopts.git = False
diffopts.upgrade = True diffopts.upgrade = True
def losedatafn(fn=None, **kwargs): def losedatafn(fn=None, **kwargs):
brokenfiles.add(fn) brokenfiles.add(fn)
return True return True
elif git == 'abort': elif git == b'abort':
diffopts.git = False diffopts.git = False
diffopts.upgrade = True diffopts.upgrade = True
def losedatafn(fn=None, **kwargs): def losedatafn(fn=None, **kwargs):
raise error.Abort('losing data for %s' % fn) raise error.Abort(b'losing data for %s' % fn)
else: else:
raise error.Abort('--git must be yes, no or auto') raise error.Abort(b'--git must be yes, no or auto')
node1, node2 = scmutil.revpair(repo, []) node1, node2 = scmutil.revpair(repo, [])
m = scmutil.match(repo[node2], pats, opts) m = scmutil.match(repo[node2], pats, opts)
it = patch.diff(repo, node1, node2, match=m, opts=diffopts, it = patch.diff(repo, node1, node2, match=m, opts=diffopts,
losedatafn=losedatafn) losedatafn=losedatafn)
for chunk in it: for chunk in it:
ui.write(chunk) ui.write(chunk)
for fn in sorted(brokenfiles): for fn in sorted(brokenfiles):
ui.write(('data lost for: %s\n' % fn)) ui.write((b'data lost for: %s\n' % fn))