Show More
@@ -3537,13 +3537,12 b' def revsetmq(repo, subset, x):' | |||||
3537 | applied = set([repo[r.node].rev() for r in repo.mq.applied]) |
|
3537 | applied = set([repo[r.node].rev() for r in repo.mq.applied]) | |
3538 | return [r for r in subset if r in applied] |
|
3538 | return [r for r in subset if r in applied] | |
3539 |
|
3539 | |||
3540 | def extsetup(ui): |
|
|||
3541 | revset.symbols['mq'] = revsetmq |
|
|||
3542 |
|
||||
3543 | # tell hggettext to extract docstrings from these functions: |
|
3540 | # tell hggettext to extract docstrings from these functions: | |
3544 | i18nfunctions = [revsetmq] |
|
3541 | i18nfunctions = [revsetmq] | |
3545 |
|
3542 | |||
3546 |
def |
|
3543 | def extsetup(ui): | |
|
3544 | # Ensure mq wrappers are called first, regardless of extension load order by | |||
|
3545 | # NOT wrapping in uisetup() and instead deferring to init stage two here. | |||
3547 | mqopt = [('', 'mq', None, _("operate on patch repository"))] |
|
3546 | mqopt = [('', 'mq', None, _("operate on patch repository"))] | |
3548 |
|
3547 | |||
3549 | extensions.wrapcommand(commands.table, 'import', mqimport) |
|
3548 | extensions.wrapcommand(commands.table, 'import', mqimport) | |
@@ -3568,6 +3567,7 b' def uisetup(ui):' | |||||
3568 | if extmodule.__file__ != __file__: |
|
3567 | if extmodule.__file__ != __file__: | |
3569 | dotable(getattr(extmodule, 'cmdtable', {})) |
|
3568 | dotable(getattr(extmodule, 'cmdtable', {})) | |
3570 |
|
3569 | |||
|
3570 | revset.symbols['mq'] = revsetmq | |||
3571 |
|
3571 | |||
3572 | colortable = {'qguard.negative': 'red', |
|
3572 | colortable = {'qguard.negative': 'red', | |
3573 | 'qguard.positive': 'yellow', |
|
3573 | 'qguard.positive': 'yellow', |
General Comments 0
You need to be logged in to leave comments.
Login now