This is an archive of the discontinued Mercurial Phabricator instance.

Differential D584

tweakdefaults: remove order from analyze function
ClosedPublic

Authored by durham on Aug 31 2017, 2:28 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX1b7c64257c2d: tweakdefaults: remove order from analyze function
Summary

This broke working with upstream hg.

Test Plan

Ran the tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durham created this revision.Aug 31 2017, 2:28 PM
ryanmce accepted this revision.Aug 31 2017, 2:30 PM
This revision is now accepted and ready to land.Aug 31 2017, 2:30 PM
Closed by commit rFBHGX1b7c64257c2d: tweakdefaults: remove order from analyze function (authored by durham). · Explain WhyAug 31 2017, 2:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/tweakdefaults.py (8 lines)

Diff 1500

hgext3rd/tweakdefaults.py

wrapcommand(rebase.cmdtable, 'rebase', opawarerebase) wrapcommand(rebase.cmdtable, 'rebase', opawarerebase)
wrapfunction(scmutil, 'cleanupnodes', cleanupnodeswrapper) wrapfunction(scmutil, 'cleanupnodes', cleanupnodeswrapper)
entry = wrapcommand(commands.table, 'pull', pull) entry = wrapcommand(commands.table, 'pull', pull)
options = entry[1] options = entry[1]
options.append( options.append(
('d', 'dest', '', _('destination for rebase or update'))) ('d', 'dest', '', _('destination for rebase or update')))
# anonymous function to pass ui object to _analyzewrapper # anonymous function to pass ui object to _analyzewrapper
def _analyzewrap(orig, x, order='define'): def _analyzewrap(orig, x):
return _analyzewrapper(orig, x, order, ui) return _analyzewrapper(orig, x, ui)
wrapfunction(revsetlang, '_analyze', _analyzewrap) wrapfunction(revsetlang, '_analyze', _analyzewrap)
try: try:
rebaseext = extensions.find('rebase') rebaseext = extensions.find('rebase')
# tweakdefaults is already loaded before other extensions # tweakdefaults is already loaded before other extensions
# (see tweakorder() function) so if these functions are wrapped # (see tweakorder() function) so if these functions are wrapped
# by something else, it's not a problem. # by something else, it's not a problem.
wrapfunction(rebaseext, '_computeobsoletenotrebased', wrapfunction(rebaseext, '_computeobsoletenotrebased',
def cmd(*args, **kwargs): def cmd(*args, **kwargs):
repo = args[repo_index] repo = args[repo_index]
overrides = {(globaldata, createmarkersoperation): operationame} overrides = {(globaldata, createmarkersoperation): operationame}
with repo.ui.configoverride(overrides, 'tweakdefaults'): with repo.ui.configoverride(overrides, 'tweakdefaults'):
return origcmd(*args, **kwargs) return origcmd(*args, **kwargs)
return cmd return cmd
def _analyzewrapper(orig, x, order, ui): def _analyzewrapper(orig, x, ui):
"""Wraps analyzer to detect the use of colons in the revisions """Wraps analyzer to detect the use of colons in the revisions
""" """
result = orig(x, order) result = orig(x)
if isinstance(x, tuple) and \ if isinstance(x, tuple) and \
(x[0] in ('range', 'rangepre', 'rangepost')) and \ (x[0] in ('range', 'rangepre', 'rangepost')) and \
x != ('rangepre', ('symbol', '.')): x != ('rangepre', ('symbol', '.')):
# The last condition is added so that warnings are not shown if # The last condition is added so that warnings are not shown if
# hg log --follow is invoked w/o arguments # hg log --follow is invoked w/o arguments
ui.develwarn("use of ':' is deprecated\n") ui.develwarn("use of ':' is deprecated\n")