##// END OF EJS Templates
cmdutil: remove forwarding methods per deprecation policy
Augie Fackler -
r30877:8d7e4052 default
parent child Browse files
Show More
@@ -26,14 +26,12 b' from . import ('
26 changelog,
26 changelog,
27 copies,
27 copies,
28 crecord as crecordmod,
28 crecord as crecordmod,
29 dirstateguard as dirstateguardmod,
30 encoding,
29 encoding,
31 error,
30 error,
32 formatter,
31 formatter,
33 graphmod,
32 graphmod,
34 lock as lockmod,
33 lock as lockmod,
35 match as matchmod,
34 match as matchmod,
36 mergeutil,
37 obsolete,
35 obsolete,
38 patch,
36 patch,
39 pathutil,
37 pathutil,
@@ -3366,11 +3364,6 b' def command(table):'
3366
3364
3367 return cmd
3365 return cmd
3368
3366
3369 def checkunresolved(ms):
3370 ms._repo.ui.deprecwarn('checkunresolved moved from cmdutil to mergeutil',
3371 '4.1')
3372 return mergeutil.checkunresolved(ms)
3373
3374 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3367 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3375 # commands.outgoing. "missing" is "missing" of the result of
3368 # commands.outgoing. "missing" is "missing" of the result of
3376 # "findcommonoutgoing()"
3369 # "findcommonoutgoing()"
@@ -3477,10 +3470,3 b' def wrongtooltocontinue(repo, task):'
3477 if after[1]:
3470 if after[1]:
3478 hint = after[0]
3471 hint = after[0]
3479 raise error.Abort(_('no %s in progress') % task, hint=hint)
3472 raise error.Abort(_('no %s in progress') % task, hint=hint)
3480
3481 class dirstateguard(dirstateguardmod.dirstateguard):
3482 def __init__(self, repo, name):
3483 dirstateguardmod.dirstateguard.__init__(self, repo, name)
3484 repo.ui.deprecwarn(
3485 'dirstateguard has moved from cmdutil to dirstateguard',
3486 '4.1')
General Comments 0
You need to be logged in to leave comments. Login now