Show More
@@ -711,6 +711,8 b' class savedcmd(object):' | |||||
711 |
|
711 | |||
712 | def uisetup(ui): |
|
712 | def uisetup(ui): | |
713 | for cmd, path in ui.configitems(b'extdiff'): |
|
713 | for cmd, path in ui.configitems(b'extdiff'): | |
|
714 | if cmd.startswith(b'opts.') or cmd.startswith(b'gui.'): | |||
|
715 | continue | |||
714 | path = util.expandpath(path) |
|
716 | path = util.expandpath(path) | |
715 | if cmd.startswith(b'cmd.'): |
|
717 | if cmd.startswith(b'cmd.'): | |
716 | cmd = cmd[4:] |
|
718 | cmd = cmd[4:] | |
@@ -723,8 +725,6 b' def uisetup(ui):' | |||||
723 | if diffopts: |
|
725 | if diffopts: | |
724 | cmdline += b' ' + diffopts |
|
726 | cmdline += b' ' + diffopts | |
725 | isgui = ui.configbool(b'extdiff', b'gui.' + cmd) |
|
727 | isgui = ui.configbool(b'extdiff', b'gui.' + cmd) | |
726 | elif cmd.startswith(b'opts.') or cmd.startswith(b'gui.'): |
|
|||
727 | continue |
|
|||
728 | else: |
|
728 | else: | |
729 | if path: |
|
729 | if path: | |
730 | # case "cmd = path opts" |
|
730 | # case "cmd = path opts" |
General Comments 0
You need to be logged in to leave comments.
Login now