p4ruby 2017.1.1699426-x86-mingw32 → 2021.1.2156749-x86-mingw32

data/ext/P4/p4clientapi.cpp

@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ruby.h>
 #include "undefdups.h"
 #include <p4/clientapi.h>
+#include <p4/strtable.h>
 #include <p4/i18napi.h>
 #include <p4/enviro.h>
 #include <p4/hostenv.h>
@@ -142,6 +143,21 @@ P4ClientApi::GetEnviroFile()
     return enviro->GetEnviroFile();
 }
 
+void
+P4ClientApi::SetEVar( const char *var, const char *val )
+{
+    StrRef sVar( var );
+    StrRef sVal( val );
+    client.SetEVar( sVar, sVal );
+}
+
+const StrPtr *
+P4ClientApi::GetEVar( const char *var )
+{
+    StrRef sVar( var );
+    return client.GetEVar( sVar );
+}
+
 void
 P4ClientApi::SetApiLevel( int level )
 {
@@ -323,6 +339,9 @@ P4ClientApi::Disconnect()
     // Clear the specdef cache.
     specMgr.Reset();
 
+    // Clear out any results from the last command
+    ui.Reset();
+
     return Qtrue;
 }
 
@@ -426,12 +445,6 @@ P4ClientApi::IsIgnored( const char *path )
     return ignore->Reject( p, client.GetIgnoreFile() );
 }
 
-VALUE
-P4ClientApi::Reset()
-{
-    ui.Reset();
-}
-
 //
 // Run returns the results of the command. If the client has not been
 // connected, then an exception is raised but errors from Perforce
@@ -764,3 +777,48 @@ P4ClientApi::Except( const char *func, Error *e )
     Except( func, m.Text() );
 }
 
+//
+// SSO Handlers
+//
+
+VALUE
+P4ClientApi::SetEnableSSO( VALUE e )
+{
+    return ui.EnableSSO( e );
+}
+
+VALUE
+P4ClientApi::GetEnableSSO()
+{
+    return ui.SSOEnabled();
+}
+
+VALUE
+P4ClientApi::GetSSOVars()
+{
+    return ui.GetSSOVars();
+}
+
+VALUE
+P4ClientApi::SetSSOPassResult( VALUE r )
+{
+    return ui.SetSSOPassResult( r );
+}
+
+VALUE
+P4ClientApi::GetSSOPassResult()
+{
+    return ui.GetSSOPassResult();
+}
+
+VALUE
+P4ClientApi::SetSSOFailResult( VALUE r )
+{
+   return ui.SetSSOFailResult( r );
+}
+
+VALUE
+P4ClientApi::GetSSOFailResult()
+{
+    return ui.GetSSOFailResult();
+}

data/ext/P4/p4clientapi.h

@@ -73,6 +73,7 @@ public:
     void SetClient( const char *c )	{ client.SetClient( c );	}
     void SetCwd( const char *c );
     void SetEnviroFile( const char *c );
+    void SetEVar( const char *var, const char *val );
     void SetHost( const char *h )	{ client.SetHost( h );		}
     void SetIgnoreFile( const char *f )	{ client.SetIgnoreFile( f );	}
     void SetMaxResults( int v )		{ maxResults = v;		}
@@ -96,6 +97,7 @@ public:
     const StrPtr &GetCwd()		{ return client.GetCwd();	}
     const char * GetEnv( const char *v);
     const StrPtr *GetEnviroFile();
+    const StrPtr *GetEVar(const char *v);
     const StrPtr &GetHost()		{ return client.GetHost();	}
     const StrPtr &GetIgnoreFile()	{ return client.GetIgnoreFile();}
     const StrPtr &GetLanguage()		{ return client.GetLanguage();	}
@@ -121,7 +123,6 @@ public:
     VALUE Connect();		// P4Exception on error
     VALUE Connected();		// Return true if connected and not dropped.
     VALUE Disconnect();
-    VALUE Reset();          // Clear out any results from the previous command
 
     // Executing commands.
     VALUE Run( const char *cmd, int argc, char * const *argv );
@@ -170,6 +171,15 @@ public:
     VALUE SetProgress( VALUE progress );
     VALUE GetProgress() { return ui.GetProgress(); }
 
+    // SSO handler
+    VALUE SetEnableSSO( VALUE e );
+    VALUE GetEnableSSO();
+    VALUE GetSSOVars();
+    VALUE SetSSOPassResult( VALUE r );
+    VALUE GetSSOPassResult();
+    VALUE SetSSOFailResult( VALUE r );
+    VALUE GetSSOFailResult();
+
     // Ruby garbage collection
     void  GCMark();
 
@@ -248,4 +258,3 @@ private:
     int			maxScanRows;
     int			maxLockTime;
 };
-

data/ext/P4/p4result.cpp

@@ -57,6 +57,7 @@ P4Result::P4Result()
     VALUE cP4	= rb_const_get_at( rb_cObject, idP4 );
     cP4Msg	= rb_const_get_at( cP4, idP4Msg );
 
+    Reset();
 }
 
 

data/ext/P4/p4specdata.cpp

@@ -106,3 +106,32 @@ SpecDataRuby::SetLine( SpecElem *sd, int x, const StrPtr *v, Error *e )
 	}
 	return;
 }
+
+void
+SpecDataRuby::Comment ( SpecElem *sd, int x, const char **wv,  int nl, Error *e )
+{
+	VALUE 	key;
+	VALUE	val;
+	VALUE	ary;
+	StrBuf	t;
+
+	key = P4Utils::ruby_string( sd->tag.Text(), sd->tag.Length() );
+	val = P4Utils::ruby_string( *wv );
+
+	if( sd->IsList() )
+	{
+
+	    ary = rb_hash_aref( hash, key ); // rb_hash_aref  - get the value for hash key
+	    if( ary == Qnil )
+	    {
+		ary = rb_ary_new();
+		rb_hash_aset( hash, key, ary ); // rb_hash_aset(hash, key, value) - set the hash key to value
+	    }
+	    rb_ary_store( ary, x, val );
+	}
+	else
+	{ 
+	    rb_hash_aset( hash, key, val );
+	}
+	return;
+}

data/ext/P4/p4specdata.h

@@ -44,6 +44,8 @@ class SpecDataRuby : public SpecData
 	virtual StrPtr *GetLine( SpecElem *sd, int x, const char **cmt );
 	virtual void	SetLine( SpecElem *sd, int x, const StrPtr *val,
 				Error *e );
+	virtual void	Comment( SpecElem *sd, int x, const char **wv,
+	            int nl, Error *e );
 
     private:
 	VALUE	hash;

data/ext/P4/specmgr.cpp

@@ -63,21 +63,6 @@ struct defaultspec {
             "unlocked/locked;;"
         "View;code:311;type:wlist;words:2;len:64;;"
     },
-    {
-        "changeX",
-        "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
-        "Date;code:202;type:date;ro;fmt:R;seq:3;len:20;;"
-        "Client;code:203;ro;fmt:L;seq:2;len:32;;"
-        "User;code:204;ro;fmt:L;seq:4;len:32;;"
-        "Status;code:205;ro;fmt:R;seq:5;len:10;;"
-        "Type;code:211;seq:6;type:select;fmt:L;len:10;"
-            "val:public/restricted;;"
-        "ImportedBy;code:212;type:line;ro;fmt:L;len:32;;"
-        "Identity;code:213;type:line;;"
-        "Description;code:206;type:text;rq;;"
-        "Jobs;code:209;type:wlist;words:2;len:32;;"
-        "Files;code:210;type:llist;len:64;;"
-    },
     {
         "change",
         "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
@@ -92,6 +77,7 @@ struct defaultspec {
         "Description;code:206;type:text;rq;seq:7;;"
         "JobStatus;code:207;fmt:I;type:select;seq:9;;"
         "Jobs;code:208;type:wlist;seq:8;len:32;;"
+        "Stream;code:214;type:line;len:64;;"
         "Files;code:210;type:llist;len:64;;"
     },
     {
@@ -115,47 +101,12 @@ struct defaultspec {
         "Stream;code:314;type:line;len:64;;"
         "StreamAtChange;code:316;type:line;len:64;;"
         "ServerID;code:315;type:line;ro;len:64;;"
-        "Type;code:318;type:select;len:10;val:writeable/readonly;;"
+        "Type;code:318;type:select;len:10;val:"
+            "writeable/readonly/graph/partitioned;;"
         "Backup;code:319;type:select;len:10;val:enable/disable;;"
         "View;code:311;type:wlist;words:2;len:64;;"
         "ChangeView;code:317;type:llist;len:64;;"
     },
-    {
-        "clientX",
-        "Client;code:301;rq;ro;seq:1;len:32;;"
-        "Update;code:302;type:date;ro;seq:2;fmt:L;len:20;;"
-        "Access;code:303;type:date;ro;seq:4;fmt:L;len:20;;"
-        "Owner;code:304;seq:3;fmt:R;len:32;;"
-        "Host;code:305;seq:5;fmt:R;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:llist;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "SubmitOptions;code:313;type:select;fmt:L;len:25;val:"
-            "submitunchanged/submitunchanged+reopen/revertunchanged/"
-            "revertunchanged+reopen/leaveunchanged/leaveunchanged+reopen;;"
-        "LineEnd;code:310;type:select;fmt:L;len:12;val:"
-            "local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
-    {
-        "clientSpecing021",
-        "Client;code:301;rq;ro;len:32;;"
-        "Update;code:302;type:date;ro;len:20;;"
-        "Access;code:303;type:date;ro;len:20;;"
-        "Owner;code:304;len:32;;"
-        "Host;code:305;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:text;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "LineEnd;code:310;type:select;len:12;val:local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
     {
         "depot",
         "Depot;code:251;rq;ro;len:32;;"
@@ -175,11 +126,13 @@ struct defaultspec {
         "MaxResults;code:402;type:word;len:12;;"
         "MaxScanRows;code:403;type:word;len:12;;"
         "MaxLockTime;code:407;type:word;len:12;;"
+        "MaxOpenFiles;code:413;type:word;len:12;;"
         "Timeout;code:406;type:word;len:12;;"
         "PasswordTimeout;code:409;type:word;len:12;;"
         "LdapConfig;code:410;type:line;len:128;;"
         "LdapSearchQuery;code:411;type:line;len:128;;"
         "LdapUserAttribute;code:412;type:line;len:128;;"
+        "LdapUserDNAttribute;code:414;type:line;len:128;;"
         "Subgroups;code:404;type:wlist;len:32;opt:default;;"
         "Owners;code:408;type:wlist;len:32;opt:default;;"
         "Users;code:405;type:wlist;len:32;opt:default;;"
@@ -247,36 +200,67 @@ struct defaultspec {
         "Clients;code:458;len:8;;"
         "Users;code:459;len:8;;"
         "Files;code:460;len:8;;"
-    },
+        "Repos;code:462;len:8;;"
+        "ExtraCapabilities;code:463;type:llist;len:512;;"
+        },
     {
         "protect",
-        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;len:64;;"
+        "SubPath;code:502;ro;len:64;;"
+        "Update;code:503;type:date;ro;fmt:L;len:20;;"
+        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;z;len:64;;"
     },
     {
         "remote",
-        "RemoteID;code:851;rq;ro;len:32;;"
+        "RemoteID;code:851;rq;ro;fmt:L;len:32;;"
         "Address;code:852;rq;type:line;len:32;;"
         "Owner;code:853;fmt:R;len:32;;"
         "RemoteUser;code:861;fmt:R;len:32;;"
         "Options;code:854;type:line;len:32;val:"
-            "unlocked/lockednocompress/compress;;"
+            "unlocked/locked,nocompress/compress,copyrcs/nocopyrcs;;"
         "Update;code:855;type:date;ro;fmt:L;len:20;;"
         "Access;code:856;type:date;ro;fmt:L;len:20;;"
         "Description;code:857;type:text;len:128;;"
         "LastFetch;code:858;fmt:L;len:10;;"
         "LastPush;code:859;fmt:L;len:10;;"
         "DepotMap;code:860;type:wlist;words:2;len:64;;"
+        "ArchiveLimits;code:862;type:wlist;words:2;len:64;;"
     },
     {
-        "specW",
-        "Fields;code:351;type:wlist;words:5;rq;;"
-        "Required;code:357;type:wlist;;"
-        "Readonly;code:358;type:wlist;;"
-        "Words;code:352;type:wlist;words:2;;"
-        "Formats;code:353;type:wlist;words:3;;"
-        "Values;code:354;type:wlist;words:2;;"
-        "Presets;code:355;type:wlist;words:2;;"
-        "Comments;code:356;type:text;;"
+        "repo",
+        "Repo;code:1001;rq;ro;fmt:L;len:128;;"
+        "Owner;code:1002;fmt:R;len:32;;"
+        "Created;code:1003;type:date;ro;fmt:L;len:20;;"
+        "Pushed;code:1004;type:date;ro;fmt:R;len:20;;"
+        "ForkedFrom;code:1005;ro;fmt:L;len:128;;"
+        "Description;code:1006;type:text;len:128;;"
+        "DefaultBranch;code:1007;fmt:L;len:32;;"
+        "MirroredFrom;code:1008;fmt:R;len:32;;"
+        "Options;code:1009;type:select;len:10;val:lfs/nolfs;;"
+        "GconnMirrorServerId;code:1010;fmt:L;len:32;;"
+        "GconnMirrorSecretToken;code:NNN;len:36;;"
+        "GconnMirrorStatus;code:NNN;len:8;;"
+        "GconnMirrorExcludedBranches;code:NNN;len:256;;"
+        "GconnMirrorHideFetchUrl;code:NNN;len:5;;"
+    },
+    {
+        "server",
+        "ServerID;code:751;rq;ro;len:32;;"
+        "Type;code:752;rq;len:32;;"
+        "Name;code:753;type:line;len:32;;"
+        "Address;code:754;type:line;len:32;;"
+        "ExternalAddress;code:755;type:line;len:32;;"
+        "Services;code:756;rq;len:128;;"
+        "Options;code:764;type:line;len:32;val:"
+            "nomandatory/mandatory;;"
+        "ReplicatingFrom;code:765;type:line;len:32;;"
+        "Description;code:757;type:text;len:128;;"
+        "User;code:761;type:line;len:64;;"
+        "AllowedAddresses;code:763;type:wlist;len:64;;"
+        "UpdateCachedRepos;code:766;type:wlist;len:64;;"
+        "ClientDataFilter;code:758;type:wlist;len:64;;"
+        "RevisionDataFilter;code:759;type:wlist;len:64;;"
+        "ArchiveDataFilter;code:760;type:wlist;len:64;;"
+        "DistributedConfig;code:762;type:text;len:128;;"
     },
     {
         "spec",
@@ -286,6 +270,7 @@ struct defaultspec {
         "Values;code:354;type:wlist;words:2;;"
         "Presets;code:355;type:wlist;words:2;;"
         "Openable;code:362;type:wlist;words:2;;"
+            "Maxwords;code:361;type:wlist;words:2;;"
         "Comments;code:356;type:text;;"
     },
     {
@@ -293,28 +278,30 @@ struct defaultspec {
         "Stream;code:701;rq;ro;len:64;;"
         "Update;code:705;type:date;ro;fmt:L;len:20;;"
         "Access;code:706;type:date;ro;fmt:L;len:20;;"
-        "Owner;code:704;len:32;;"
-        "Name;code:703;rq;type:line;len:32;;"
+        "Owner;code:704;len:32;open:isolate;;"
+        "Name;code:703;rq;type:line;len:32;open:isolate;;"
         "Parent;code:702;rq;len:64;open:isolate;;"
         "Type;code:708;rq;len:32;open:isolate;;"
-        "Description;code:709;type:text;len:128;;"
+        "Description;code:709;type:text;len:128;open:isolate;;"
         "Options;code:707;type:line;len:64;val:"
             "allsubmit/ownersubmit,unlocked/locked,"
             "toparent/notoparent,fromparent/nofromparent,"
-            "mergedown/mergeany;;"
-        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:isolate;;"
-        "Remapped;code:711;type:wlist;words:2;len:64;open:isolate;;"
-        "Ignored;code:712;type:wlist;words:1;len:64;open:isolate;;"
+            "mergedown/mergeany;open:isolate;;"
+        "ParentView;code:NNN;rq;open:isolate;"
+        "pre:inherit;val:noinherit/inherit;;"
+        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:propagate;fmt:C;;"
+        "Remapped;code:711;type:wlist;words:2;len:64;open:propagate;fmt:C;;"
+        "Ignored;code:712;type:wlist;words:1;len:64;open:propagate;fmt:C;;"
         "View;code:713;type:wlist;words:2;len:64;;"
         "ChangeView;code:714;type:llist;ro;len:64;;"
     },
     {
         "triggers",
-        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;"
+        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;z;;"
     },
     {
        "typemap",
-        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;"
+        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;z;;"
     },
     {
         "user",
@@ -326,23 +313,10 @@ struct defaultspec {
         "FullName;code:655;fmt:R;type:line;rq;len:32;;"
         "JobView;code:656;type:line;len:64;;"
         "Password;code:657;len:32;;"
-        "AuthMethod;code:662;fmt:L;len:10;val:perforce/ldap;;"
+        "AuthMethod;code:662;fmt:L;len:10;val:"
+            "perforce/perforce+2fa/ldap/ldap+2fa;;"
         "Reviews;code:658;type:wlist;len:64;;"
     },
-    {
-        "server",
-        "ServerID;code:751;rq;ro;len:32;;"
-        "Type;code:752;rq;len:32;;"
-        "Name;code:753;type:line;len:32;;"
-        "Address;code:754;type:line;len:32;;"
-        "ExternalAddress;code:755;type:line;len:32;;"
-        "Services;code:756;rq;len:128;;"
-        "Description;code:757;type:text;len:128;;"
-        "User;code:761;type:line;len:64;;"
-        "ClientDataFilter;code:758;type:wlist;len:64;;"
-        "RevisionDataFilter;code:759;type:wlist;len:64;;"
-        "ArchiveDataFilter;code:760;type:wlist;len:64;;"
-    },
     { 0, 0 }
 };