equal
deleted
inserted
replaced
24 from . import ( |
24 from . import ( |
25 bookmarks, |
25 bookmarks, |
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, |
40 phases, |
38 phases, |
41 pycompat, |
39 pycompat, |
3364 return func |
3362 return func |
3365 return decorator |
3363 return decorator |
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()" |
3377 outgoinghooks = util.hooks() |
3370 outgoinghooks = util.hooks() |
3378 |
3371 |
3475 after = howtocontinue(repo) |
3468 after = howtocontinue(repo) |
3476 hint = None |
3469 hint = None |
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') |
|