[niftyplugins commit] r78 - - Fix for issue #41: fallback on p4v if p4win doesn't exists.

[codesite...@google.com]

Author: jim.tilander
Date: Mon Jul 6 22:34:10 2009
New Revision: 78

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

Log:
- Fix for issue #41: fallback on p4v if p4win doesn't exists.

Modified: trunk/Build/Experimental_NiftyPerforce.msi
==============================================================================
Binary files. No diff available.

Modified: trunk/Build/Experimental_NiftySolution.msi
==============================================================================
Binary files. No diff available.

Modified: trunk/NiftyPerforce/P4Operations.cs
==============================================================================
--- trunk/NiftyPerforce/P4Operations.cs (original)
+++ trunk/NiftyPerforce/P4Operations.cs Mon Jul 6 22:34:10 2009
@@ -79,18 +79,22 @@
{
if(filename.Length == 0)
return false;
- if(!g_p4wininstalled)
- return NotifyUser("could not find p4win exe installed in perforce
directory");
- return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString() + "
-D \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ if(g_p4wininstalled)
+ return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString()
+ " -D \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ if(g_p4installed)
+ return ScheduleRunCommand(output, "p4.exe", GetUserInfoString() + "
diff -du \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ return NotifyUser("could not find p4win.exe/p4.exe installed in
perforce directory");
}

public static bool RevisionHistoryFile(OutputWindowPane
output, string filename)
{
if(filename.Length == 0)
return false;
- if(!g_p4wininstalled)
- return NotifyUser("could not find p4win exe installed in perforce
directory");
- return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString() + "
\"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ if(g_p4wininstalled)
+ return ScheduleRunCommand(output, "p4win.exe", GetUserInfoString()
+ " \"" + filename + "\"", System.IO.Path.GetDirectoryName(filename));
+ if(g_p4vinstalled)
+ return ScheduleRunCommand(output, "p4v.exe", GetUserInfoString() + "
-cmd \"history " + filename + "\"",
System.IO.Path.GetDirectoryName(filename));
+ return NotifyUser("could not find p4win.exe/p4v.exe installed in
perforce directory");
}

public static bool P4WinShowFile(OutputWindowPane output, string
filename)