Exclusive checkout

Common/VersionedAsset.h

@@ -23,7 +23,8 @@ enum State
 	kMetaFile = 1 << 15,
 	kMovedLocal = 1 << 16, // only used plugin side for perforce.
 	kMovedRemote = 1 << 17, // only used plugin side for perforce.
-	kUnversioned = 1 << 18
+	kUnversioned = 1 << 18,
+	kExclusiveCheckout = 1 << 19, // Only one user at a time can open this file for editing.
 };
 
 class VersionedAsset

P4Plugin/P4Plugin.vcxproj

@@ -144,7 +144,7 @@ _SCL_SECURE_NO_DEPRECATE
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)Source\r16.1\lib\win32debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)Source\r16.1\lib\win32debug;$(ProjectDir)Source\r16.1\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libclient.lib;libeay32.lib;ssleay32.lib;librpc.lib;libsupp.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>

P4Plugin/Source/P4StatusBaseCommand.cpp

@@ -27,7 +27,6 @@ void P4StatusBaseCommand::OutputStat( StrDict *varList )
 	std::string headRev;
 	std::string haveRev;
 	std::string depotFile;
-	bool exclLockType = false;
 
 	// Dump out the variables, using the GetVar( x ) interface.
 	// Don't display the function, which is only relevant to rpc.
@@ -42,7 +41,8 @@ void P4StatusBaseCommand::OutputStat( StrDict *varList )
 
 		if (key == "headType")
 		{
-			exclLockType = value.find("+l") != std::string::npos;
+			if (value.find("+l") != std::string::npos)
+				current.AddState(kExclusiveCheckout);
 		}
 		else if (key == "clientFile")
 		{
@@ -59,7 +59,7 @@ void P4StatusBaseCommand::OutputStat( StrDict *varList )
 		else if (key == "action")
 		{
 			action = value;
-			if (value == "edit" && exclLockType)
+			if (value == "edit" && current.HasState(kExclusiveCheckout))
 				current.AddState(kLockedLocal);
 		}
 		else if (key == "ourLock")
@@ -73,7 +73,7 @@ void P4StatusBaseCommand::OutputStat( StrDict *varList )
 		else if (key == "otherOpen")
 		{
 			current.AddState(kCheckedOutRemote);
-			if (exclLockType)
+			if (current.HasState(kExclusiveCheckout))
 				current.AddState(kLockedRemote);
 		}
 		else if (StartsWith(key, "otherAction") && value == "delete")

Test/Perforce/GetLatest.test

@@ -49,7 +49,6 @@ c32:enableCommand revert
 c32:enableCommand status
 c32:enableCommand submit
 c32:enableCommand unlock
-w1:./... - no such file(s).\n
 o1:-1
 d1:end of list
 r1:end of response

Test/Perforce/PerforceTest.pm

@@ -31,13 +31,15 @@ sub PerforceIntegrationTests
 	$ENV{'VCS_P4CLIENT'} = "testclient";
 	$ENV{'VCS_P4USER'} = "vcs_test_user";
 	$ENV{'P4CHARSET'} = 'utf8';
-	$ENV{'VCS_P4PASSWD'} = 'secret';
+	$ENV{'VCS_P4PASSWD'} = 'Secret';
+	$ENV{'P4EXECABS'} = getcwd() . "/" . $ENV{'P4EXEC'};
 
 	if ($ENV{'TARGET'} eq "win32")
 	{
 		$ENV{'VCS_P4ROOT'} =~ s/\//\\/g;
 		$ENV{'VCS_P4CLIENTROOT'} =~ s/\//\\/g;
 		$ENV{'VCS_P4CLIENTROOTABS'} =~ s/\//\\/g;
+		$ENV{'P4EXECABS'} =~ s/\//\\/g;
 	}
 
 	$ENV{'VCS_P4ROOT'} = abs_path($ENV{'VCS_P4ROOT'});
@@ -81,6 +83,7 @@ sub RunTests()
 		chdir $clientroot;
 		mkdir "./Assets";
 		mkdir "./Library";
+		AddExclusiveFile();
 		$output = `$testserver $pluginexec $cwd $i $option`;
 		$res = $? >> 8;
 		print $output;
@@ -101,12 +104,35 @@ sub RunTests()
 			return 1;
 		}
 		$total++;
+		RemoveExclusiveFile();
 	}
 	print "Done: $success of $total tests passed.\n";
 	chdir $cwd;
 	return 0;
 }
 
+sub RunCommand
+{
+	my $command = $_[0];
+	system("$ENV{'P4EXECABS'} -p $ENV{'VCS_P4PORT'} -u $ENV{'VCS_P4USER'} -P $ENV{'VCS_P4PASSWD'} -c $ENV{'VCS_P4CLIENT'} -d $ENV{'VCS_P4CLIENTROOTABS'} $command");
+}
+
+sub AddExclusiveFile
+{
+	open(FH, '>', 'Assets/exclusivefile.txt') or die $!;
+	print(FH 'File with exclusive open file type modifier.');
+	close(FH) or die $1;
+
+	RunCommand('add -t text+l Assets/exclusivefile.txt');
+	RunCommand('submit -d "Add Assets/exclusivefile.txt." Assets/exclusivefile.txt');
+}
+
+sub RemoveExclusiveFile
+{
+	RunCommand('delete Assets/exclusivefile.txt');
+	RunCommand('submit -d "Delete Assets/exclusivefile.txt." Assets/exclusivefile.txt');
+}
+
 sub SetupServer
 {
 	$root = $ENV{'VCS_P4ROOT'}; 

Test/Perforce/SecureGetLatest.test

@@ -51,7 +51,6 @@ c32:enableCommand revert
 c32:enableCommand status
 c32:enableCommand submit
 c32:enableCommand unlock
-w1:./... - no such file(s).\n
 o1:-1
 d1:end of list
 r1:end of response

Test/Perforce/Status.test

@@ -133,4 +133,18 @@ o1:./Assets/excludedfile.txt
 o1:262144
 v1:./Assets/excludedfile.txt - file(s) not in client view.
 d1:end of list
+r1:end of response
+--
+c:status recurse
+1
+./Assets/exclusivefile.txt
+0
+--
+o1:-1
+v1:fstat  "./Assets/exclusivefile.txt" 
+==:v1:User vcs_test_user ticket expires in
+v1:<absroot>/Assets/exclusivefile.txt
+o1:<absroot>/Assets/exclusivefile.txt
+o1:540675
+d1:end of list
 r1:end of response