From 243530e54b494a99db8eaa07405b1eccfc080787 Mon Sep 17 00:00:00 2001
From: "Joel W. Reed" <joelwreed@gmail.com>
Date: Wed, 26 Mar 2008 15:41:31 -0400
Subject: [PATCH] add.brief.option.add.gnome.vfs.binary.helper

---
 .../Difference.cs                                       |  9 +++++++++
 .../Makefile                                            |  4 ++++
 configure                                               | 17 +++++++++--------
 configure.in                                            |  3 ++-
 tools/opentf/DiffCommand.cs                             |  6 ++++++
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/class/Microsoft.TeamFoundation.VersionControl.Client/Difference.cs b/class/Microsoft.TeamFoundation.VersionControl.Client/Difference.cs
index 6f25c78..ec75910 100644
--- a/class/Microsoft.TeamFoundation.VersionControl.Client/Difference.cs
+++ b/class/Microsoft.TeamFoundation.VersionControl.Client/Difference.cs
@@ -150,6 +150,15 @@ namespace Microsoft.TeamFoundation.VersionControl.Client
 					return;
 				}
 
+#if HAVE_GNOME_VFS
+			Gnome.Vfs.MimeType mimeType = new Gnome.Vfs.MimeType(Gnome.Vfs.Mime.TypeFromName(fileNameForHeader));
+			if (!mimeType.CanBeExecutable)
+				{
+					stream.WriteLine("Binary files {0} and {1} differ", aItem.Name, bItem.Name);
+					return;
+				}
+#endif
+
 			WriteHeader(aItem, bItem, diffOpts);
 
 			// short circuit new files
diff --git a/class/Microsoft.TeamFoundation.VersionControl.Client/Makefile b/class/Microsoft.TeamFoundation.VersionControl.Client/Makefile
index 2b975b2..0c32997 100644
--- a/class/Microsoft.TeamFoundation.VersionControl.Client/Makefile
+++ b/class/Microsoft.TeamFoundation.VersionControl.Client/Makefile
@@ -3,3 +3,7 @@ include ../../build/rules.make
 
 LIBRARY = Microsoft.TeamFoundation.VersionControl.Client.dll
 include ../../build/library.make
+
+ifeq ($(HAVE_GNOME_VFS),yes)
+LOCAL_MCS_FLAGS += -pkg:gnome-vfs-sharp-2.0 -d:HAVE_GNOME_VFS
+endif
diff --git a/configure b/configure
index fa749e4..b8c9ece 100755
--- a/configure
+++ b/configure
@@ -1900,24 +1900,24 @@ fi
 # Check whether --enable-highlight was given.
 if test "${enable_highlight+set}" = set; then
   enableval=$enable_highlight; if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-sharp-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtksourceview-sharp-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-sharp-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-vfs-sharp-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  HAVE_GTK_SOURCEVIEW=yes
+  HAVE_GNOME_VFS=yes
 else
-  HAVE_GTK_SOURCEVIEW=no
+  HAVE_GNOME_VFS=no
 fi
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-sharp-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-vfs-sharp-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-sharp-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtksourceview-sharp-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  HAVE_GNOME_VFS=yes
+  HAVE_GTK_SOURCEVIEW=yes
 else
-  HAVE_GNOME_VFS=no
+  HAVE_GTK_SOURCEVIEW=no
 fi
 
 fi
@@ -3023,6 +3023,7 @@ echo "HAVE_ATLEAST_GTK_210=$HAVE_ATLEAST_GTK_210" >> build/config.make
 echo "HAVE_MAGIC=$HAVE_MAGIC" >> build/config.make
 echo "HAVE_MONODEVELOP=$HAVE_MD" >> build/config.make
 echo "HAVE_GNOME_KEYRING=$HAVE_GNOME_KEYRING" >> build/config.make
+echo "HAVE_GNOME_VFS=$HAVE_GNOME_VFS" >> build/config.make
 echo "HAVE_DOC_TOOLS=$HAVE_DOC_TOOLS" >> build/config.make
 echo "HAVE_MSLIBS=$HAVE_MSLIBS" >> build/config.make
 
diff --git a/configure.in b/configure.in
index b3def25..1a6d888 100644
--- a/configure.in
+++ b/configure.in
@@ -26,8 +26,8 @@ fi
 
 AC_ARG_ENABLE(highlight, 
 	[  --enable-highlight      enable syntax highlighting support],
-  PKG_CHECK_EXISTS(gtksourceview-sharp-2.0, HAVE_GTK_SOURCEVIEW=yes, HAVE_GTK_SOURCEVIEW=no)
   PKG_CHECK_EXISTS(gnome-vfs-sharp-2.0, HAVE_GNOME_VFS=yes, HAVE_GNOME_VFS=no)
+  PKG_CHECK_EXISTS(gtksourceview-sharp-2.0, HAVE_GTK_SOURCEVIEW=yes, HAVE_GTK_SOURCEVIEW=no)
 )
 
 AC_ARG_ENABLE(keyring, 
@@ -88,6 +88,7 @@ echo "HAVE_ATLEAST_GTK_210=$HAVE_ATLEAST_GTK_210" >> build/config.make
 echo "HAVE_MAGIC=$HAVE_MAGIC" >> build/config.make
 echo "HAVE_MONODEVELOP=$HAVE_MD" >> build/config.make
 echo "HAVE_GNOME_KEYRING=$HAVE_GNOME_KEYRING" >> build/config.make
+echo "HAVE_GNOME_VFS=$HAVE_GNOME_VFS" >> build/config.make
 echo "HAVE_DOC_TOOLS=$HAVE_DOC_TOOLS" >> build/config.make
 echo "HAVE_MSLIBS=$HAVE_MSLIBS" >> build/config.make
 
diff --git a/tools/opentf/DiffCommand.cs b/tools/opentf/DiffCommand.cs
index a818794..7b023d7 100644
--- a/tools/opentf/DiffCommand.cs
+++ b/tools/opentf/DiffCommand.cs
@@ -247,6 +247,12 @@ class DifferenceCommand : Command
 				FromToHash fromToHash = itemHashes[key];
 				if (fromToHash.FromHash == fromToHash.ToHash) continue;
 
+				if (OptionBrief) 
+					{
+						Driver.WriteLine(key);
+						continue;
+					}
+
 				IDiffItem a = new DiffItemNull();
 				IDiffItem b = new DiffItemNull();
 
-- 
2.11.4.GIT