* [PATCH] gitk: catch mkdtemp errors
@ 2014-06-19 2:53 David Aguilar
2014-06-26 20:42 ` Junio C Hamano
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: David Aguilar @ 2014-06-19 2:53 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git, Junio C Hamano, brian m. carlson, Pat Thoyts
105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
on mkdtemp, which is not available on Windows.
Use the original temporary directory behavior when mkdtemp fails.
This makes the code use mkdtemp when available and gracefully
fallback to the existing behavior when it is not available.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
gitk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gitk b/gitk
index 41e5071..9237830 100755
--- a/gitk
+++ b/gitk
@@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} {
set tmpdir $gitdir
}
set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
- set gitktmpdir [exec mktemp -d $gitktmpformat]
+ if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
+ set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
+ }
if {[catch {file mkdir $gitktmpdir} err]} {
error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
unset gitktmpdir
--
2.0.0.257.g75cc6c6
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-19 2:53 [PATCH] gitk: catch mkdtemp errors David Aguilar
@ 2014-06-26 20:42 ` Junio C Hamano
2014-06-27 3:05 ` David Aguilar
2014-06-26 20:47 ` Junio C Hamano
2014-06-27 6:58 ` Paul Mackerras
2 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2014-06-26 20:42 UTC (permalink / raw)
To: David Aguilar; +Cc: Paul Mackerras, git, brian m. carlson, Pat Thoyts
David Aguilar <davvid@gmail.com> writes:
> 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> on mkdtemp, which is not available on Windows.
>
> Use the original temporary directory behavior when mkdtemp fails.
> This makes the code use mkdtemp when available and gracefully
> fallback to the existing behavior when it is not available.
>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
Does this still need to be applied before I can pull from Paulus?
> gitk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gitk b/gitk
> index 41e5071..9237830 100755
> --- a/gitk
> +++ b/gitk
> @@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} {
> set tmpdir $gitdir
> }
> set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
> - set gitktmpdir [exec mktemp -d $gitktmpformat]
> + if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
> + set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
> + }
> if {[catch {file mkdir $gitktmpdir} err]} {
> error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
> unset gitktmpdir
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-26 20:42 ` Junio C Hamano
@ 2014-06-27 3:05 ` David Aguilar
0 siblings, 0 replies; 7+ messages in thread
From: David Aguilar @ 2014-06-27 3:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Paul Mackerras, git, brian m. carlson, Pat Thoyts
On Thu, Jun 26, 2014 at 01:42:04PM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> > on mkdtemp, which is not available on Windows.
> >
> > Use the original temporary directory behavior when mkdtemp fails.
> > This makes the code use mkdtemp when available and gracefully
> > fallback to the existing behavior when it is not available.
> >
> > Helped-by: Junio C Hamano <gitster@pobox.com>
> > Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
> > Signed-off-by: David Aguilar <davvid@gmail.com>
> > ---
>
> Does this still need to be applied before I can pull from Paulus?
Yes, it would be nice to have this, especially for Windows users.
--
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-19 2:53 [PATCH] gitk: catch mkdtemp errors David Aguilar
2014-06-26 20:42 ` Junio C Hamano
@ 2014-06-26 20:47 ` Junio C Hamano
2014-06-27 6:59 ` Paul Mackerras
2014-06-27 6:58 ` Paul Mackerras
2 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2014-06-26 20:47 UTC (permalink / raw)
To: Paul Mackerras; +Cc: David Aguilar, git, brian m. carlson, Pat Thoyts
David Aguilar <davvid@gmail.com> writes:
> 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> on mkdtemp, which is not available on Windows.
>
> Use the original temporary directory behavior when mkdtemp fails.
> This makes the code use mkdtemp when available and gracefully
> fallback to the existing behavior when it is not available.
>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
In the meantime, I've fetched from you and merged up to your
master~2 aka 17f9836c (gitk: Show staged submodules regardless of
ignore config, 2014-04-08).
Thanks.
> gitk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gitk b/gitk
> index 41e5071..9237830 100755
> --- a/gitk
> +++ b/gitk
> @@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} {
> set tmpdir $gitdir
> }
> set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
> - set gitktmpdir [exec mktemp -d $gitktmpformat]
> + if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
> + set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
> + }
> if {[catch {file mkdir $gitktmpdir} err]} {
> error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
> unset gitktmpdir
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-26 20:47 ` Junio C Hamano
@ 2014-06-27 6:59 ` Paul Mackerras
2014-06-27 17:16 ` Junio C Hamano
0 siblings, 1 reply; 7+ messages in thread
From: Paul Mackerras @ 2014-06-27 6:59 UTC (permalink / raw)
To: Junio C Hamano; +Cc: David Aguilar, git, brian m. carlson, Pat Thoyts
On Thu, Jun 26, 2014 at 01:47:36PM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> > on mkdtemp, which is not available on Windows.
> >
> > Use the original temporary directory behavior when mkdtemp fails.
> > This makes the code use mkdtemp when available and gracefully
> > fallback to the existing behavior when it is not available.
> >
> > Helped-by: Junio C Hamano <gitster@pobox.com>
> > Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
> > Signed-off-by: David Aguilar <davvid@gmail.com>
> > ---
>
> In the meantime, I've fetched from you and merged up to your
> master~2 aka 17f9836c (gitk: Show staged submodules regardless of
> ignore config, 2014-04-08).
I have applied and pushed out this patch, along with one from Max
Kirillov, so please do another fetch.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-27 6:59 ` Paul Mackerras
@ 2014-06-27 17:16 ` Junio C Hamano
0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2014-06-27 17:16 UTC (permalink / raw)
To: Paul Mackerras; +Cc: David Aguilar, git, brian m. carlson, Pat Thoyts
Paul Mackerras <paulus@samba.org> writes:
> On Thu, Jun 26, 2014 at 01:47:36PM -0700, Junio C Hamano wrote:
>>
>> In the meantime, I've fetched from you and merged up to your
>> master~2 aka 17f9836c (gitk: Show staged submodules regardless of
>> ignore config, 2014-04-08).
>
> I have applied and pushed out this patch, along with one from Max
> Kirillov, so please do another fetch.
Thanks, will do.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gitk: catch mkdtemp errors
2014-06-19 2:53 [PATCH] gitk: catch mkdtemp errors David Aguilar
2014-06-26 20:42 ` Junio C Hamano
2014-06-26 20:47 ` Junio C Hamano
@ 2014-06-27 6:58 ` Paul Mackerras
2 siblings, 0 replies; 7+ messages in thread
From: Paul Mackerras @ 2014-06-27 6:58 UTC (permalink / raw)
To: David Aguilar; +Cc: git, Junio C Hamano, brian m. carlson, Pat Thoyts
On Wed, Jun 18, 2014 at 07:53:14PM -0700, David Aguilar wrote:
> 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> on mkdtemp, which is not available on Windows.
>
> Use the original temporary directory behavior when mkdtemp fails.
> This makes the code use mkdtemp when available and gracefully
> fallback to the existing behavior when it is not available.
>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
> Signed-off-by: David Aguilar <davvid@gmail.com>
Thanks, applied (with slight modification to commit message).
Paul.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-06-27 17:16 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-19 2:53 [PATCH] gitk: catch mkdtemp errors David Aguilar
2014-06-26 20:42 ` Junio C Hamano
2014-06-27 3:05 ` David Aguilar
2014-06-26 20:47 ` Junio C Hamano
2014-06-27 6:59 ` Paul Mackerras
2014-06-27 17:16 ` Junio C Hamano
2014-06-27 6:58 ` Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).