Show More
@@ -218,12 +218,8 b' def colordiff(orig, ui, repo, *pats, **o' | |||
|
218 | 218 | 'changed': ['white'], |
|
219 | 219 | 'trailingwhitespace': ['bold', 'red_background']} |
|
220 | 220 | |
|
221 | _ui = None | |
|
222 | ||
|
223 | 221 | def uisetup(ui): |
|
224 | 222 | '''Initialize the extension.''' |
|
225 | global _ui | |
|
226 | _ui = ui | |
|
227 | 223 | _setupcmd(ui, 'diff', commands.table, colordiff, _diff_effects) |
|
228 | 224 | _setupcmd(ui, 'incoming', commands.table, None, _diff_effects) |
|
229 | 225 | _setupcmd(ui, 'log', commands.table, None, _diff_effects) |
@@ -231,17 +227,10 b' def uisetup(ui):' | |||
|
231 | 227 | _setupcmd(ui, 'tip', commands.table, None, _diff_effects) |
|
232 | 228 | _setupcmd(ui, 'status', commands.table, colorstatus, _status_effects) |
|
233 | 229 | |
|
234 | def extsetup(): | |
|
235 | 230 | try: |
|
236 | 231 | mq = extensions.find('mq') |
|
237 | try: | |
|
238 | # If we are loaded after mq, we must wrap commands.table | |
|
239 | _setupcmd(_ui, 'qdiff', commands.table, colordiff, _diff_effects) | |
|
240 | _setupcmd(_ui, 'qseries', commands.table, colorqseries, _patch_effects) | |
|
241 | except error.UnknownCommand: | |
|
242 | # Otherwise we wrap mq.cmdtable | |
|
243 | _setupcmd(_ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects) | |
|
244 | _setupcmd(_ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects) | |
|
232 | _setupcmd(ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects) | |
|
233 | _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects) | |
|
245 | 234 | except KeyError: |
|
246 | 235 | # The mq extension is not enabled |
|
247 | 236 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now