This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3300

fix: port most of the way to python 3
ClosedPublic

Authored by durin42 on Apr 12 2018, 5:16 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1edf3738e000: fix: port most of the way to python 3
Summary

Only most of the way because we now have to decide: if we want to keep
the current .format() interface for the config in hgrc, we have to use
unicodes to do formatting in Python 3, rather than bytes. I'm
basically fine with that, so a follow-up patch will do so.

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.Apr 12 2018, 5:16 PM
pulkit accepted this revision.Apr 13 2018, 3:57 AM
Closed by commit rHG1edf3738e000: fix: port most of the way to python 3 (authored by durin42). · Explain WhyApr 13 2018, 4:22 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (5 lines)

Diff 8108

hgext/fix.py

from mercurial import ( from mercurial import (
cmdutil, cmdutil,
context, context,
copies, copies,
error, error,
mdiff, mdiff,
merge, merge,
obsolete, obsolete,
pycompat,
registrar, registrar,
scmutil, scmutil,
util, util,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
will be fixed. If the checked-out revision is also fixed, the working will be fixed. If the checked-out revision is also fixed, the working
directory will update to the replacement revision. directory will update to the replacement revision.
When determining what lines of each file to fix at each revision, the whole When determining what lines of each file to fix at each revision, the whole
set of revisions being fixed is considered, so that fixes to earlier set of revisions being fixed is considered, so that fixes to earlier
revisions are not forgotten in later ones. The --base flag can be used to revisions are not forgotten in later ones. The --base flag can be used to
override this default behavior, though it is not usually desirable to do so. override this default behavior, though it is not usually desirable to do so.
""" """
opts = pycompat.byteskwargs(opts)
if opts['all']: if opts['all']:
if opts['rev']: if opts['rev']:
raise error.Abort(_('cannot specify both "--rev" and "--all"')) raise error.Abort(_('cannot specify both "--rev" and "--all"'))
opts['rev'] = ['not public() and not obsolete()'] opts['rev'] = ['not public() and not obsolete()']
opts['working_dir'] = True opts['working_dir'] = True
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
revstofix = getrevstofix(ui, repo, opts) revstofix = getrevstofix(ui, repo, opts)
basectxs = getbasectxs(repo, opts, revstofix) basectxs = getbasectxs(repo, opts, revstofix)
Each value is a Fixer object with methods that implement the behavior of the Each value is a Fixer object with methods that implement the behavior of the
fixer's config suboptions. Does not validate the config values. fixer's config suboptions. Does not validate the config values.
""" """
result = {} result = {}
for name in fixernames(ui): for name in fixernames(ui):
result[name] = Fixer() result[name] = Fixer()
attrs = ui.configsuboptions('fix', name)[1] attrs = ui.configsuboptions('fix', name)[1]
for key in FIXER_ATTRS: for key in FIXER_ATTRS:
setattr(result[name], '_' + key, attrs.get(key, '')) setattr(result[name], pycompat.sysstr('_' + key),
attrs.get(key, ''))
return result return result
def fixernames(ui): def fixernames(ui):
"""Returns the names of [fix] config options that have suboptions""" """Returns the names of [fix] config options that have suboptions"""
names = set() names = set()
for k, v in ui.configitems('fix'): for k, v in ui.configitems('fix'):
if ':' in k: if ':' in k:
names.add(k.split(':', 1)[0]) names.add(k.split(':', 1)[0])