[niftyplugins] r85 committed - - Fixed the incorrect diff against head, we really want to do the diff...

[codesite...@google.com]

Revision: 85
Author: jim.tilander
Date: Tue Jun 1 22:46:36 2010
Log: - Fixed the incorrect diff against head, we really want to do the diff
against the #have revision since you want to figure out what the heck
you've changed locally.

http://code.google.com/p/niftyplugins/source/detail?r=85

Modified:
/trunk/Build/Experimental_NiftyPerforce.msi
/trunk/Build/Experimental_NiftySolution.msi
/trunk/NiftyPerforce/P4Operations.cs

=======================================
--- /trunk/Build/Experimental_NiftyPerforce.msi Tue Jun 1 22:40:52 2010
+++ /trunk/Build/Experimental_NiftyPerforce.msi Tue Jun 1 22:46:36 2010
Binary file, no diff available.
=======================================
--- /trunk/Build/Experimental_NiftySolution.msi Tue Jun 1 22:40:52 2010
+++ /trunk/Build/Experimental_NiftySolution.msi Tue Jun 1 22:46:36 2010
Binary file, no diff available.
=======================================
--- /trunk/NiftyPerforce/P4Operations.cs Sun Nov 29 12:54:30 2009
+++ /trunk/NiftyPerforce/P4Operations.cs Tue Jun 1 22:46:36 2010
@@ -81,18 +81,18 @@
if(filename.Length == 0)
return false;
if(g_p4wininstalled)
- return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString()
+ " -D \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString()
+ " -D \"" + filename + "#have\"",
System.IO.Path.GetDirectoryName(filename));
if(g_p4installed)
{
// Let's figure out if the user has some custom diff tool installed.
Then we just send whatever we have without any fancy options.
if(g_p4customdiff)
{
- return ScheduleRunCommand(output, "p4.exe", GetUserInfoString() + "
diff \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ return ScheduleRunCommand(output, "p4.exe", GetUserInfoString() + "
diff \"" + filename + "#have\"", System.IO.Path.GetDirectoryName(filename));
}
else
{
// Otherwise let's show a unified diff in the outputpane.
- return ScheduleRunCommand(output, "p4.exe", GetUserInfoString() + "
diff -du \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ return ScheduleRunCommand(output, "p4.exe", GetUserInfoString() + "
diff -du \"" + filename + "#have\"",
System.IO.Path.GetDirectoryName(filename));
}
}
return NotifyUser("could not find p4win.exe/p4.exe installed in
perforce directory");