undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/gitk/gitk

Browse Source 
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update cherry-pick error message parsing
  gitk: Quote tag names in event bindings to avoid problems with % chars
  gitk: Allow user to control how much of the SHA1 ID gets auto-selected
  gitk: spelling fixes in Russian translation
  gitk: Take only numeric version components when computing $git_version
This commit is contained in:
Junio C Hamano 2011-04-11 09:33:06 -07:00
commit 2dbae5acc7
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gitk-git/gitk
View File

@ -2652,7 +2652,7 @@ proc savestuff {w} {
global viewname viewfiles viewargs viewargscmd viewperm nextviewnum global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
global cmitmode wrapcomment datetimeformat limitdiffs global cmitmode wrapcomment datetimeformat limitdiffs
global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
global autoselect extdifftool perfile_attrs markbgcolor use_ttk global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk
global hideremotes want_ttk global hideremotes want_ttk
if {$stuffsaved} return if {$stuffsaved} return
@ -2673,6 +2673,7 @@ proc savestuff {w} {
puts $f [list set cmitmode $cmitmode] puts $f [list set cmitmode $cmitmode]
puts $f [list set wrapcomment $wrapcomment] puts $f [list set wrapcomment $wrapcomment]
puts $f [list set autoselect $autoselect] puts $f [list set autoselect $autoselect]
puts $f [list set autosellen $autosellen]
puts $f [list set showneartags $showneartags] puts $f [list set showneartags $showneartags]
puts $f [list set hideremotes $hideremotes] puts $f [list set hideremotes $hideremotes]
puts $f [list set showlocalchanges $showlocalchanges] puts $f [list set showlocalchanges $showlocalchanges]
@ -6300,6 +6301,7 @@ proc drawtags {id x xt y1} {
-width $lthickness -fill black -tags tag.$id] -width $lthickness -fill black -tags tag.$id]
$canv lower $t $canv lower $t
foreach tag $marks x $xvals wid $wvals { foreach tag $marks x $xvals wid $wvals {
set tag_quoted [string map {% %%} $tag]
set xl [expr {$x + $delta}] set xl [expr {$x + $delta}]
set xr [expr {$x + $delta + $wid + $lthickness}] set xr [expr {$x + $delta + $wid + $lthickness}]
set font mainfont set font mainfont
@ -6308,7 +6310,7 @@ proc drawtags {id x xt y1} {
set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \ set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
$xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \ $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
-width 1 -outline black -fill yellow -tags tag.$id] -width 1 -outline black -fill yellow -tags tag.$id]
$canv bind $t <1> [list showtag $tag 1] $canv bind $t <1> [list showtag $tag_quoted 1]
set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}] set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
} else { } else {
# draw a head or other ref # draw a head or other ref
@ -6335,9 +6337,9 @@ proc drawtags {id x xt y1} {
set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \ set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
-font $font -tags [list tag.$id text]] -font $font -tags [list tag.$id text]]
if {$ntags >= 0} { if {$ntags >= 0} {
$canv bind $t <1> [list showtag $tag 1] $canv bind $t <1> [list showtag $tag_quoted 1]
} elseif {$nheads >= 0} { } elseif {$nheads >= 0} {
$canv bind $t $ctxbut [list headmenu %X %Y $id $tag] $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
} }
} }
return $xt return $xt
@ -6896,7 +6898,7 @@ proc selectline {l isnew {desired_loc {}}} {
global mergemax numcommits pending_select global mergemax numcommits pending_select
global cmitmode showneartags allcommits global cmitmode showneartags allcommits
global targetrow targetid lastscrollrows global targetrow targetid lastscrollrows
global autoselect jump_to_here global autoselect autosellen jump_to_here
catch {unset pending_select} catch {unset pending_select}
$canv delete hover $canv delete hover
@ -6958,7 +6960,7 @@ proc selectline {l isnew {desired_loc {}}} {
$sha1entry delete 0 end $sha1entry delete 0 end
$sha1entry insert 0 $id $sha1entry insert 0 $id
if {$autoselect} { if {$autoselect} {
$sha1entry selection range 0 end $sha1entry selection range 0 $autosellen
} }
rhighlight_sel $id rhighlight_sel $id
@ -9063,7 +9065,7 @@ proc cherrypick {} {
to file '%s'.\nPlease commit, reset or stash\ to file '%s'.\nPlease commit, reset or stash\
your changes and try again." $fname] your changes and try again." $fname]
} elseif {[regexp -line \ } elseif {[regexp -line \
{^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \ {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
$err]} { $err]} {
if {[confirm_popup [mc "Cherry-pick failed because of merge\ if {[confirm_popup [mc "Cherry-pick failed because of merge\
conflict.\nDo you wish to run git citool to\ conflict.\nDo you wish to run git citool to\
@ -10756,7 +10758,7 @@ proc doprefs {} {
global maxwidth maxgraphpct use_ttk NS global maxwidth maxgraphpct use_ttk NS
global oldprefs prefstop showneartags showlocalchanges global oldprefs prefstop showneartags showlocalchanges
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
global tabstop limitdiffs autoselect extdifftool perfile_attrs global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
global hideremotes want_ttk have_ttk global hideremotes want_ttk have_ttk
set top .gitkprefs set top .gitkprefs
@ -10784,9 +10786,10 @@ proc doprefs {} {
${NS}::checkbutton $top.showlocal -text [mc "Show local changes"] \ ${NS}::checkbutton $top.showlocal -text [mc "Show local changes"] \
-variable showlocalchanges -variable showlocalchanges
grid x $top.showlocal -sticky w grid x $top.showlocal -sticky w
${NS}::checkbutton $top.autoselect -text [mc "Auto-select SHA1"] \ ${NS}::checkbutton $top.autoselect -text [mc "Auto-select SHA1 (length)"] \
-variable autoselect -variable autoselect
grid x $top.autoselect -sticky w spinbox $top.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
grid x $top.autoselect $top.autosellen -sticky w
${NS}::checkbutton $top.hideremotes -text [mc "Hide remote refs"] \ ${NS}::checkbutton $top.hideremotes -text [mc "Hide remote refs"] \
-variable hideremotes -variable hideremotes
grid x $top.hideremotes -sticky w grid x $top.hideremotes -sticky w
@ -11428,6 +11431,7 @@ set showlocalchanges 1
set limitdiffs 1 set limitdiffs 1
set datetimeformat "%Y-%m-%d %H:%M:%S" set datetimeformat "%Y-%m-%d %H:%M:%S"
set autoselect 1 set autoselect 1
set autosellen 40
set perfile_attrs 0 set perfile_attrs 0
set want_ttk 1 set want_ttk 1
@ -11581,7 +11585,7 @@ if {![info exists have_ttk]} {
set use_ttk [expr {$have_ttk && $want_ttk}] set use_ttk [expr {$have_ttk && $want_ttk}]
set NS [expr {$use_ttk ? "ttk" : ""}] set NS [expr {$use_ttk ? "ttk" : ""}]
set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .] regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
set show_notes {} set show_notes {}
if {[package vcompare $git_version "1.6.6.2"] >= 0} { if {[package vcompare $git_version "1.6.6.2"] >= 0} {

24
gitk-git/po/ru.po
View File

@ -24,7 +24,7 @@ msgstr "Ошибка в идентификаторе версии:"
#: gitk:323 #: gitk:323
msgid "Error executing --argscmd command:" msgid "Error executing --argscmd command:"
msgstr "Ошибка выполнения команды заданой --argscmd:" msgstr "Ошибка выполнения команды заданной --argscmd:"
#: gitk:336 #: gitk:336
msgid "No files selected: --merge specified but no files are unmerged." msgid "No files selected: --merge specified but no files are unmerged."
@ -37,7 +37,7 @@ msgid ""
"No files selected: --merge specified but no unmerged files are within file " "No files selected: --merge specified but no unmerged files are within file "
"limit." "limit."
msgstr "" msgstr ""
"Файлы не выбраны: указан --merge, но в рамках указаного " "Файлы не выбраны: указан --merge, но в рамках указанного "
"ограничения на имена файлов нет ни одного " "ограничения на имена файлов нет ни одного "
"где эта операция должна быть завершена." "где эта операция должна быть завершена."
@ -246,11 +246,11 @@ msgstr "Файлы"
#: gitk:2326 gitk:2339 #: gitk:2326 gitk:2339
msgid "Diff this -> selected" msgid "Diff this -> selected"
msgstr "Сравнить это состояние с выделеным" msgstr "Сравнить это состояние с выделенным"
#: gitk:2327 gitk:2340 #: gitk:2327 gitk:2340
msgid "Diff selected -> this" msgid "Diff selected -> this"
msgstr "Сравнить выделеное с этим состоянием" msgstr "Сравнить выделенное с этим состоянием"
#: gitk:2328 gitk:2341 #: gitk:2328 gitk:2341
msgid "Make patch" msgid "Make patch"
@ -440,11 +440,11 @@ msgstr "<%s-F>\t\tПоиск"
#: gitk:2666 #: gitk:2666
#, tcl-format #, tcl-format
msgid "<%s-G>\t\tMove to next find hit" msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tПерейти к следующему найденому состоянию" msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию"
#: gitk:2667 #: gitk:2667
msgid "<Return>\tMove to next find hit" msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tПерейти к следующему найденому состоянию" msgstr "<Return>\tПерейти к следующему найденному состоянию"
#: gitk:2668 #: gitk:2668
msgid "/\t\tFocus the search box" msgid "/\t\tFocus the search box"
@ -452,7 +452,7 @@ msgstr "/\t\tПерейти к полю поиска"
#: gitk:2669 #: gitk:2669
msgid "?\t\tMove to previous find hit" msgid "?\t\tMove to previous find hit"
msgstr "?\t\tПерейти к предыдущему найденому состоянию" msgstr "?\t\tПерейти к предыдущему найденному состоянию"
#: gitk:2670 #: gitk:2670
msgid "f\t\tScroll diff view to next file" msgid "f\t\tScroll diff view to next file"
@ -466,7 +466,7 @@ msgstr "<%s-S>\t\tПродолжить поиск в списке изменен
#: gitk:2672 #: gitk:2672
#, tcl-format #, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view" msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tПерейти к предыдущему найденому тексту в списке изменений" msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
#: gitk:2673 #: gitk:2673
#, tcl-format #, tcl-format
@ -855,7 +855,7 @@ msgstr "Лёгкий: оставить рабочий каталог и инде
#: gitk:8472 #: gitk:8472
msgid "Mixed: Leave working tree untouched, reset index" msgid "Mixed: Leave working tree untouched, reset index"
msgstr "" msgstr ""
"Смешаный: оставить рабочий каталог неизменным, установить индекс" "Смешанный: оставить рабочий каталог неизменным, установить индекс"
#: gitk:8475 #: gitk:8475
msgid "" msgid ""
@ -962,7 +962,7 @@ msgstr "Показывать близкие метки"
#: gitk:10126 #: gitk:10126
msgid "Limit diffs to listed paths" msgid "Limit diffs to listed paths"
msgstr "Ограничить показ изменений выбраными файлами" msgstr "Ограничить показ изменений выбранными файлами"
#: gitk:10129 #: gitk:10129
msgid "Support per-file encodings" msgid "Support per-file encodings"
@ -1022,11 +1022,11 @@ msgstr "заголовок блока изменений"
#: gitk:10169 #: gitk:10169
msgid "Marked line bg" msgid "Marked line bg"
msgstr "Фон выбраной строки" msgstr "Фон выбранной строки"
#: gitk:10171 #: gitk:10171
msgid "marked line background" msgid "marked line background"
msgstr "фон выбраной строки" msgstr "фон выбранной строки"
#: gitk:10175 #: gitk:10175
msgid "Select bg" msgid "Select bg"