Show More
@@ -4051,13 +4051,15 b' proc doquit {} {' | |||||
4051 |
|
4051 | |||
4052 | proc getconfig {} { |
|
4052 | proc getconfig {} { | |
4053 | global env |
|
4053 | global env | |
4054 |
|
||||
4055 | set lines [exec $env(HG) debug-config] |
|
|||
4056 | regsub -all "\r\n" $lines "\n" config |
|
|||
4057 | set config {} |
|
4054 | set config {} | |
4058 | foreach line [split $lines "\n"] { |
|
4055 | ||
4059 | regsub "^(k|v)=" $line "" line |
|
4056 | set lines [exec $env(HG) debugconfig] | |
4060 | lappend config $line |
|
4057 | foreach line [split $lines \n] { | |
|
4058 | set line [string trimright $line \r] | |||
|
4059 | if {[string match hgk.* $line]} { | |||
|
4060 | regexp {(.*)=(.*)} $line - k v | |||
|
4061 | lappend config $k $v | |||
|
4062 | } | |||
4061 | } |
|
4063 | } | |
4062 | return $config |
|
4064 | return $config | |
4063 | } |
|
4065 | } | |
@@ -4121,8 +4123,9 b' set redisplaying 0' | |||||
4121 | set stuffsaved 0 |
|
4123 | set stuffsaved 0 | |
4122 | set patchnum 0 |
|
4124 | set patchnum 0 | |
4123 |
|
4125 | |||
|
4126 | set config(hgk.vdiff) "" | |||
4124 | array set config [getconfig] |
|
4127 | array set config [getconfig] | |
4125 | set hgvdiff $config(vdiff) |
|
4128 | set hgvdiff $config(hgk.vdiff) | |
4126 | setcoords |
|
4129 | setcoords | |
4127 | makewindow |
|
4130 | makewindow | |
4128 | readrefs |
|
4131 | readrefs |
@@ -335,15 +335,6 b' def revlist(ui, repo, *revs, **opts):' | |||||
335 | copy = [x for x in revs] |
|
335 | copy = [x for x in revs] | |
336 | revtree(ui, copy, repo, full, opts['max_count'], opts['parents']) |
|
336 | revtree(ui, copy, repo, full, opts['max_count'], opts['parents']) | |
337 |
|
337 | |||
338 | @command('debug-config', [], _('hg debug-config')) |
|
|||
339 | def config(ui, repo, **opts): |
|
|||
340 | """print extension options""" |
|
|||
341 | def writeopt(name, value): |
|
|||
342 | ui.write(('k=%s\nv=%s\n' % (name, value))) |
|
|||
343 |
|
||||
344 | writeopt('vdiff', ui.config('hgk', 'vdiff', '')) |
|
|||
345 |
|
||||
346 |
|
||||
347 | @command('view', |
|
338 | @command('view', | |
348 | [('l', 'limit', '', |
|
339 | [('l', 'limit', '', | |
349 | _('limit number of changes displayed'), _('NUM'))], |
|
340 | _('limit number of changes displayed'), _('NUM'))], |
General Comments 0
You need to be logged in to leave comments.
Login now