From e11601381e384898418c30bd537a9daa1210c300 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 18 Nov 2008 21:40:32 +1100 Subject: gitk: Fix context menu items for generating diffs when in tree mode Currently, if you invoke the "diff this -> selected" or "diff selected -> this" and gitk is in "Tree" mode rather than "Patch" mode, the diff display pane will just show the header but not the actual diff, unless gitk has done the diff before and thus has the list of files that differ. This was because the logic in gettreediffline that checked whether we had moved on to doing something else checked the mode (Tree or Patch) before checking whether the ids we're diffing had changed. This fixes it. The new logic in gettreediffline is slightly hacky and relies on the fact that the Tree/Patch mode only applies when we're looking at a single commit, not at the diff between two commits. Signed-off-by: Paul Mackerras --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index f7f177621ce..9bdaafe4082 100755 --- a/gitk +++ b/gitk @@ -7129,7 +7129,7 @@ proc gettreediffline {gdtf ids} { set treediffs($ids) $treediff } unset treepending - if {$cmitmode eq "tree"} { + if {$cmitmode eq "tree" && [llength $diffids] == 1} { gettree $diffids } elseif {$ids != $diffids} { if {![info exists diffmergeid]} { -- cgit v1.2.3 From 8b39e04f39c287d8c66b24cc4f6c72916831455c Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 2 Dec 2008 09:02:46 +1100 Subject: gitk: Highlight only when search type is "containing:". When the search type is "touching paths" or "adding/removing string", it's not very useful to highlight instances of the search string in the commit message, headline or author name, so this disables the highlighting in those cases. This was suggested by Mark Burton , but the implementation is different to his patch, which tested $gdttype at each place where $markingmatches was tested. Signed-off-by: Paul Mackerras --- gitk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gitk b/gitk index 9bdaafe4082..52d8aaef895 100755 --- a/gitk +++ b/gitk @@ -4121,7 +4121,7 @@ proc askvhighlight {row id} { proc hfiles_change {} { global highlight_files filehighlight fhighlights fh_serial - global highlight_paths gdttype + global highlight_paths if {[info exists filehighlight]} { # delete previous highlights @@ -6286,10 +6286,11 @@ proc findmore {} { proc findselectline {l} { global findloc commentend ctext findcurline markingmatches gdttype - set markingmatches 1 + set markingmatches [expr {$gdttype eq [mc "containing:"]}] set findcurline $l selectline $l 1 - if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} { + if {$markingmatches && + ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { # highlight the matches in the comments set f [$ctext get 1.0 $commentend] set matches [findmatches $f] -- cgit v1.2.3 From 6e7e87c762fb0d8aa21c96c1d2c4596e46f2ab7b Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 2 Dec 2008 09:17:46 +1100 Subject: gitk: Fix bug in accessing undefined "notflag" variable As pointed out by Johannes Sixt and Alexander Gavrilov, commit 2958228430b63f2e38c55519d1f98d8d6d9e23f3 ("gitk: Fix switch statement in parseviewargs") exposed a latent bug in that $notflag was never initialized. Since it isn't used either, this removes it entirely. Signed-off-by: Paul Mackerras --- gitk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gitk b/gitk index 52d8aaef895..b7447f91c0a 100755 --- a/gitk +++ b/gitk @@ -199,11 +199,7 @@ proc parseviewargs {n arglist} { set nextisval 1 lappend glflags $arg } - "--not" { - set notflag [expr {!$notflag}] - lappend revargs $arg - } - "--all" { + "--not" - "--all" { lappend revargs $arg } "--merge" { -- cgit v1.2.3 From a8833ef5404a07983d8eed0a9582c2e19e437b78 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 25 Oct 2008 13:25:35 +0200 Subject: gitk: Update German translation This takes into account the most recent po file merge. Signed-off-by: Christian Stimming Signed-off-by: Paul Mackerras --- po/de.po | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index c86cc2df5ea..e0a6deedede 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" -"PO-Revision-Date: 2008-05-24 22:40+0200\n" +"POT-Creation-Date: 2008-10-25 13:18+0200\n" +"PO-Revision-Date: 2008-10-25 13:23+0200\n" "Last-Translator: Christian Stimming \n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -19,6 +19,14 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:" +#: gitk:272 +msgid "Error parsing revisions:" +msgstr "Fehler beim Laden der Versionen:" + +#: gitk:327 +msgid "Error executing --argscmd command:" +msgstr "Fehler beim --argscmd Kommando:" + #: gitk:340 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" @@ -283,9 +291,9 @@ msgstr "Nur diesen hervorheben" msgid "External diff" msgstr "Externer Vergleich" -#: gitk:2245 +#: gitk:2255 msgid "Blame parent commit" -msgstr "" +msgstr "Annotieren der Elternversion" #: gitk:2488 msgid "" @@ -471,7 +479,33 @@ msgstr "<%s-Minus>\tSchriftgröße verkleinern" msgid "\t\tUpdate" msgstr "\t\tAktualisieren" -#: gitk:3200 +#: gitk:2979 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3036 gitk:3045 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fehler beim Erzeugen eines temporären Verzeichnisses »%s«:" + +#: gitk:3058 +msgid "command failed:" +msgstr "Kommando fehlgeschlagen:" + +#: gitk:3078 +msgid "No such commit" +msgstr "Version nicht gefunden" + +#: gitk:3083 +msgid "git gui blame: command failed:" +msgstr "git gui blame: Kommando fehlgeschlagen:" + +#: gitk:3092 +msgid "External diff viewer failed:" +msgstr "Externes Vergleich-(Diff-)Programm fehlgeschlagen:" + +#: gitk:3210 msgid "Gitk view definition" msgstr "Gitk Ansichten" @@ -692,9 +726,10 @@ msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " +"eintragen?" -#: gitk:7708 +#: gitk:7718 msgid "Cherry-picking" msgstr "Version pflücken" @@ -836,7 +871,7 @@ msgstr "Vergleich nur für angezeigte Pfade" #: gitk:9414 msgid "Support per-file encodings" -msgstr "" +msgstr "Zeichenkodierung pro Datei ermitteln" #: gitk:9421 msgid "External diff tool" -- cgit v1.2.3 From f3413079d6a0d3d3cbeb506e81e647772b857f81 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Mon, 1 Dec 2008 20:30:09 +0300 Subject: gitk: Make line origin search update the busy status Currently the 'show origin of this line' feature does not update the status field of the gitk window, so it is not evident that any processing is going on. It may seem at first that clicking the item had no effect. This commit adds calls to set and clear the busy status with an appropriate title, similar to other search commands. Signed-off-by: Alexander Gavrilov Signed-off-by: Paul Mackerras --- gitk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitk b/gitk index b7447f91c0a..b8b5e809271 100755 --- a/gitk +++ b/gitk @@ -3402,6 +3402,7 @@ proc show_line_source {} { error_popup [mc "Couldn't start git blame: %s" $err] return } + nowbusy blaming [mc "Searching"] fconfigure $f -blocking 0 set i [reg_instance $f] set blamestuff($i) {} @@ -3415,6 +3416,7 @@ proc stopblaming {} { if {[info exists blameinst]} { stop_instance $blameinst unset blameinst + notbusy blaming } } @@ -3429,6 +3431,7 @@ proc read_line_source {fd inst} { } unset commfd($inst) unset blameinst + notbusy blaming fconfigure $fd -blocking 1 if {[catch {close $fd} err]} { error_popup [mc "Error running git blame: %s" $err] -- cgit v1.2.3 From 7fb0abb19563d36d8e210198b6c2debbf3362812 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 13 Nov 2008 23:12:42 +0300 Subject: gitk: Add a menu option to start git gui Git gui already has menu commands to start gitk, and this makes the relation symmetric. [paulus@samba.org - changed "Git Gui" in the menu item to "git gui"] Signed-off-by: Alexander Gavrilov Signed-off-by: Paul Mackerras --- gitk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitk b/gitk index b8b5e809271..64a873d2efa 100755 --- a/gitk +++ b/gitk @@ -1911,6 +1911,9 @@ proc makewindow {} { {mc "Reload" command reloadcommits -accelerator Meta1-F5} {mc "Reread references" command rereadrefs} {mc "List references" command showrefs -accelerator F2} + {xx "" separator} + {mc "Start git gui" command {exec git gui &}} + {xx "" separator} {mc "Quit" command doquit -accelerator Meta1-Q} }} {mc "Edit" cascade { -- cgit v1.2.3