threads / patch / 28730

patchgit-gui: guitools: add the path in the confirmation dialog for tools which needs one

Subject: [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one

## tl;dr

3 messages between Oct 20, 2011 and Oct 21, 2011. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Bert Wesarg· Oct 20, 2011, 19:32 UTC · lore

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
 lib/tools.tcl |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Show changes to lib/tools.tcl +8 −2

diff --git a/lib/tools.tcl b/lib/tools.tcl
index 95e6e55..39e08f0 100644
--- a/lib/tools.tcl
+++ b/lib/tools.tcl
@@ -87,8 +87,14 @@ proc tools_exec {fullname} {
 			return
 		}
 	} elseif {[is_config_true "guitool.$fullname.confirm"]} {
-		if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
-			return
+		if {[is_config_true "guitool.$fullname.needsfile"]} {
+			if {[ask_popup [mc "Are you sure you want to run %s on file \"%s\"?" $fullname $current_diff_path]] ne {yes}} {
+				return
+			}
+		} else {
+			if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
+				return
+			}
 		}
 	}

-- 
1.7.7.759.gfc8c6

Pat Thoyts· Oct 21, 2011, 22:19 UTC · re: Bert Wesarg · lore

Re: [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one

Bert Wesarg <bert.wesarg@googlemail.com> writes:

Show 25 quoted lines

>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>---
> lib/tools.tcl |   10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/lib/tools.tcl b/lib/tools.tcl
>index 95e6e55..39e08f0 100644
>--- a/lib/tools.tcl
>+++ b/lib/tools.tcl
>@@ -87,8 +87,14 @@ proc tools_exec {fullname} {
> 			return
> 		}
> 	} elseif {[is_config_true "guitool.$fullname.confirm"]} {
>-		if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
>-			return
>+		if {[is_config_true "guitool.$fullname.needsfile"]} {
>+			if {[ask_popup [mc "Are you sure you want to run %s on file \"%s\"?" $fullname $current_diff_path]] ne {yes}} {
>+				return
>+			}
>+		} else {
>+			if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
>+				return
>+			}
> 		}
> 	}

This looks good. I modified the string there to use positional parameters as sometimes translations need to re-order things and the msgcat format can support this using [mc {%2$s and %1$d} $first $second]

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

Junio C Hamano· Oct 21, 2011, 22:43 UTC · re: Pat Thoyts · lore

Re: [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one

Pat Thoyts <patthoyts@users.sourceforge.net> writes:

> .... I modified the string there to use positional
> parameters as sometimes translations need to re-order things and the
> msgcat format can support this using [mc {%2$s and %1$d} $first $second]

Good catch.