Pat Thoyts [off-list ref] writes:
On Windows the bcompare tool launches a graphical program and does
not wait for it to terminate. A separate 'bcomp' tool is provided which
will wait for the view to exit so we use this instead.
Hmm, does this only apply to Windows, or are there other platforms on
which BC3 supplies bcomp for the exact same reason? What I am trying to
get at is that it might be nicer if we do not have to check uname, e.g.
if type bcomp >/dev/null 2>/dev/null
then
echo bcomp
else
echo bcompare
fi
quoted hunk
Reported-by: Werner BEROUX <redacted>
Signed-off-by: Pat Thoyts <redacted>
---
mergetools/bc3 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/mergetools/bc3 b/mergetools/bc3
index 27b3dd4..b642bf2 100644
--- a/mergetools/bc3
+++ b/mergetools/bc3
@@ -16,5 +16,12 @@ merge_cmd () {
}
translate_merge_tool_path() {
- echo bcompare
+ case $(uname -s) in
+ *MINGW*)
+ echo bcomp
+ ;;
+ *)
+ echo bcompare
+ ;;
+ esac
}
On 15.10.2011 07:50, Junio C Hamano wrote:
Hmm, does this only apply to Windows, or are there other platforms on
which BC3 supplies bcomp for the exact same reason? What I am trying to
BC3 is only available for Linux and Windows, so it only applies to
Windows currently.
--
Sebastian Schuberth
Sebastian Schuberth [off-list ref] writes:
On 15.10.2011 07:50, Junio C Hamano wrote:
quoted
Hmm, does this only apply to Windows, or are there other platforms on
which BC3 supplies bcomp for the exact same reason? What I am trying to
BC3 is only available for Linux and Windows, so it only applies to
Windows currently.
Who asked anything about "currently"?
On Sat, Oct 15, 2011 at 22:14, Junio C Hamano [off-list ref] wrote:
quoted
quoted
Hmm, does this only apply to Windows, or are there other platforms on
which BC3 supplies bcomp for the exact same reason? What I am trying to
BC3 is only available for Linux and Windows, so it only applies to
Windows currently.
Who asked anything about "currently"?
Heh, no one. But obviously I cannot predict the future, that's why I
explicitly said "currently".
Here's what I was meaning to say in more long-winded words: Although
BC3 only supports Linux and Windows currently, IMHO it is unlikely
that future support for other platforms will suffer from the same
issue as Windows and will require a different executable than
"bcompare". And even if it was the case, that could be fixed then. For
now the proposed patch covers all cases and works well, and although
your suggestion would be more generic, it's not necessary, and the
discussion about whether or not to use your more generic approach is
starting to outweigh the time that was required to write this patch as
well as the time that would be required for a future patch.
--
Sebastian Schuberth