2025.1 release code drop

Release 2025.1

Author: hjain-perforce

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
+Copyright (c) 2025, Perforce Software, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,7 @@ this program.
 
 P4/P4API License
 -----------------------
-Copyright (c) 1995-2024, Perforce Software, Inc.
+Copyright (c) 1995-2025, Perforce Software, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

P4.py

@@ -7,7 +7,7 @@
     This uses the Python type P4API.P4Adapter, which is a wrapper for the
     Perforce ClientApi object.
     
-    $Id: //depot/main/p4-python/P4.py#114 $
+    $Id: //depot/main/p4-python/P4.py#115 $
     
     #*******************************************************************************
     # Copyright (c) 2007-2010, Perforce Software, Inc.  All rights reserved.
@@ -762,28 +762,44 @@ def run_print(self, *args, **kargs):
         result = []
         if raw:
             debugResult = []
+            file_contents = None
+
+            def flush_file_contents():
+                nonlocal file_contents
+                if file_contents is None:
+                    return
+                elif len(file_contents) == 0:
+                    # If no file contents, assume string (text)
+                    result.append("")
+                else:
+                    # Ensure all elements in file_contents are of the same type
+                    content_type = type(file_contents[0])
+                    if any(not isinstance(x, content_type) for x in file_contents):
+                        raise TypeError("Mixed types in file content.")
+                    if content_type is bytes:
+                        result.append(b"".join(file_contents))
+                    else:
+                        result.append("".join(file_contents))
+                file_contents = None
+
             for line in raw:
                 if isinstance(line, dict):
+                    flush_file_contents()
                     result.append(line)
                     if logger:
                         debugResult.append(line)
-                    result.append("")
+                    file_contents = []
                 else:
-                    # to support encoding for Python 3, we have to do a little dance
-                    # we cannot add bytes to the str "", but we expect that all lines
-                    # are either str or bytes. So if we encounter bytes, we replace the content
-                    try:
-                        result[-1] += line
-                    except TypeError:
-                        if type(line) == bytes and type(result[-1]) == str and result[-1] == "":
-                            result[-1] = line
-                        else:
-                            raise
+                    if file_contents is None:
+                        file_contents = []
+                    file_contents.append(line)
+
+            flush_file_contents()
+
             if logger:
                 logger.debug(debugResult)
-            return result
-        else:
-            return []
+
+        return result
 
     def run_resolve(self, *args, **kargs):
         if self.resolver:

P4API.cpp

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: //depot/main/p4-python/P4API.cpp#64 $
+ * $Id: //depot/main/p4-python/P4API.cpp#65 $
  *
  * Build instructions:
  *  Use Distutils - see accompanying setup.py
@@ -338,7 +338,7 @@ static PyObject * P4API_dvcs_init(P4Adapter * self, PyObject * args, PyObject *
             return NULL;
 
 
-    auto_ptr<ServerHelperApi> personalServer( create_server(user, client, directory, &ui) );
+    unique_ptr<ServerHelperApi> personalServer( create_server(user, client, directory, &ui) );
 
     if( personalServer.get() == NULL)
 	return NULL;
@@ -400,7 +400,7 @@ static PyObject * P4API_dvcs_clone(P4Adapter * self, PyObject * args, PyObject *
 					 &progress))
 	return NULL;
 
-    auto_ptr<ServerHelperApi> personalServer( create_server(user, client, directory, &ui) );
+    unique_ptr<ServerHelperApi> personalServer( create_server(user, client, directory, &ui) );
 
     if( personalServer.get() == NULL)
 	return NULL;

RELNOTES.txt

@@ -1,7 +1,7 @@
                             Release Notes for
-               P4Python, Helix Core API for Python
+                       P4Python, P4 API for Python
 
-                             Version 2024.2
+                             Version 2025.1
 
 Introduction
 
@@ -23,11 +23,22 @@ Introduction
 
 --------------------------------------------------------------------------
 
+Important Product Rebrand Notice
+
+    Helix Core is now P4
+    Perforce has a new look and logo that reflects our place in DevOps
+    workflows. As part of these changes, Helix Core is now P4. Name updates
+    and new icons to align with the P4 branding will be rolled out soon.
+    To learn more, see:
+        https://www.perforce.com/blog/vcs/introducing-the-p4-platform
+
+--------------------------------------------------------------------------
+
 Important End-of-Life Notice
 
-    This major release of P4Python would be the last to provide wheels for and
-    test against Python 3.8. This is part of our commitment to focus on 
-    supported technology platforms
+    This release of P4Python would be the last to support and test against 
+    Python 3.9, which is in EOL status. This is part of our commitment to 
+    focus on supported technology platforms.
 
 --------------------------------------------------------------------------
 
@@ -47,9 +58,10 @@ Installation
 
       python3 -m pip install --upgrade p4python
 
-    P4Python is distributed as a binary wheels for Python 3.8, 3.9, 3.10,
-    3.11, 3.12 and 3.13. In order for the binary wheel to be used, the ABI tag needs to
-    match.This often requires updated pip, to do so issue:
+    P4Python is distributed as a binary wheels for Python 3.9, 3.10,
+    3.11, 3.12 and 3.13. In order for the binary wheel to be used, the ABI 
+    tag needs to match. This often requires updated pip, to do so issue:
+
       python3 -m pip install --upgrade pip
 
   Installation using Linux binary packages
@@ -112,24 +124,23 @@ Compatibility Statements
 
   Server Compatibility
 
-    You can use any release of P4Python with any release of the
-    Perforce server later than 2001.1
+    This release of P4Python supports the 2025.1 P4 Server.
+    Older releases might work but are not supported.
 
   API Compatibility
 
-    This release of P4Python requires at least 2024.2 Perforce API 
-    (2024.2/2675662). Older releases will not compile and are not supported.
+    This release of P4Python requires at least 2025.1 P4 C/C++ API
+    (2025.1/2761706). Older releases will not compile and are not supported.
 
   Python Compatibility
 
     This release of P4Python is supported building from source with 
-    Python 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13.
+    Python 3.9, 3.10, 3.11, 3.12 and 3.13.
 
     For detailed compatibility, please check the following table:
 
     Python Release | P4Python Release
     ======================================
-    3.8            | 2020.1 or later
     3.9            | 2021.1 or later
     3.10           | 2022.1 or later
     3.11           | 2022.2 or later
@@ -139,11 +150,11 @@ Compatibility Statements
   OpenSSL Compatibility
 
     To build P4Python with encrypted communication support, you must use the
-    version of OpenSSL that Perforce C/C++ API has been built against.
+    version of OpenSSL that P4 C/C++ API has been built against.
 
-    Beginning with the 2017.1 release of the Helix C/C++ API, the dependency on
+    Beginning with the 2017.1 release of the P4 C/C++ API, the dependency on
     OpenSSL is now enforced and the SSL stub library has been removed.
-    Executables linked against the P4API libraries must also be linked against
+    Executables linked against the P4 C/C++ API libraries must also be linked against
     real OpenSSL libraries: The latest 3.0.x or 1.1.1 patch is recommended
 
   Platform Compatibility
@@ -172,33 +183,29 @@ Compatibility Statements
   Compiler Compatibility
 
     To build P4Python from source, you must use a version of P4Python that has
-    been compiled with the same compiler used to build the Perforce C++ API.
+    been compiled with the same compiler used to build the P4 C/C++ API.
     For most platforms, use gcc/g++.
 
-    On Linux since the 2019.1 P4API release, due to a change in library 
+    On Linux since the 2019.1 P4 C/C++ API release, due to a change in library 
     dependencies, the source code requires gcc 6 or above to be used.
 
     Attempting to use a different compiler or a different version of the
     compiler will cause link errors due to differences in name handling.
 
-    For more information about P4API compiler requirements, please see this link:
+    For more information about P4 C/C++ API compiler requirements, please see this link:
     https://www.perforce.com/manuals/p4api/Content/P4API/client.programming.compiling.html
 
-    On Windows platforms, the P4Python installer is build with Python from
-    python.org. The installer for Python 3.x was built with Visual Studio 2017
-    and Visual Studio 2008 for Python 2.
-
     To run Python 3.x on Windows, it might be necessary to install the
     redistributable version of the 2017 libraries, vc_redist.x64.exe or
     vc_redist.x86.exe, respectively for 64 bit and 32 bit.
-    Without these libraries the DLL for P4API will not load into Python and
+    Without these libraries the DLL for P4 C/C++ API will not load into Python and
     the command 'import P4' will fail.
 
   Known Limitations
 
-    The Perforce client-server protocol is not designed to support
+    The P4 client-server protocol is not designed to support
     multiple concurrent queries over the same connection. For this
-    reason, multi-threaded applications using the C++ API or the
+    reason, multi-threaded applications using the P4 C/C++ API or the
     script APIs (P4Perl, P4Ruby, etc.) should ensure that a
     separate connection is used for each thread or that only one
     thread may use a shared connection at a time.
@@ -212,7 +219,7 @@ Compatibility Statements
 
 Attributes
 
-  Perforce P4Python provides the attributes listed below. Attributes
+  P4Python provides the attributes listed below. Attributes
   can be set in the P4() constructor or by using their setters and
   getters. For example:
 
@@ -277,7 +284,7 @@ Attributes
 
 Tagged mode and form parsing
 
-  In Perforce P4Python 2007.3 and later, form parsing and tagged
+  In P4Python 2007.3 and later, form parsing and tagged
   output are enabled by default. (In Public Depot P4Python,
   tagged output and form parsing mode were disabled by default,
   but most scripts enabled them immediately.)
@@ -297,8 +304,36 @@ Tagged mode and form parsing
 Key to symbols used in change notes below.
 
     * -- requires new P4Python
-   ** -- requires new p4d server program
-  *** -- requires new P4API
+   ** -- requires new P4 server program
+  *** -- requires new P4 C/C++ API
+
+--------------------------------------------------------------------------
+
+New functionalities in 2025.1 (2025.1/2767466) (2025/05/21)
+
+    #2757777 (Job #125785)
+        Built P4Python with P4 C/C++ API 2025.1 (2025.1/2761706)
+        
+Bugs fixed in 2025.1
+
+    #2744582 (Job #123978)
+        Eliminated hardcoded bash paths, improving portability and flexibility.
+        Replaced shell=True with safer subprocess calls using command lists.
+
+    #2743827 (Job #124153)
+        Updated P4Python build behavior to disable silent OPENSSL installation. 
+        Users must now explicitly set the env variable "P4PYTHON_BUILD_SSL=yes"
+        to enable OPENSSL support during build.
+        If enabled, OPENSSL sources will be downloaded from the HTTPS-based 
+        URL: https://www.openssl.org/source.
+        Added the support to build P4Python with OPENSSL 3.x.
+
+    #2705918 (Job #124154)
+        Change auto_ptr into unique_ptr as auto_ptr is obsoleted from C++11.
+
+    #2743928 (Job #124332)
+        Fixed exponential rise of the time needed to run p4.run_print() with 
+        growing file size.
 
 --------------------------------------------------------------------------
 

SpecMgr.cpp

@@ -23,7 +23,7 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- $Id: //depot/main/p4-python/SpecMgr.cpp#58 $
+ $Id: //depot/main/p4-python/SpecMgr.cpp#59 $
  *******************************************************************************/
 
 /*******************************************************************************
@@ -60,7 +60,7 @@ struct specdata {
     const char *type;
     const char *spec;
 } speclist[] = {
-
+ 
     {
 	"branch",
 	"Branch;code:301;rq;ro;fmt:L;len:32;;"
@@ -140,6 +140,7 @@ struct specdata {
 	"MaxOpenFiles;code:413;type:word;len:12;;"
 	"MaxMemory;code:NNN;type:word;len:12;;"
 	"Timeout;code:406;type:word;len:12;;"
+	"IdleTimeout;code:NNN;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;;"

Version

@@ -11,7 +11,7 @@
 # SUPPDATE = 2010 06 17 ;
 #	Of the build.  The copyright date is derived from SUPPDATE.
 
-RELEASE = 2024 2;
-PATCHLEVEL = 2676807 ;
-SUPPDATE = 2024 11 07 ;
+RELEASE = 2025 1;
+PATCHLEVEL = 2756918 ;
+SUPPDATE = 2025 02 05 ;
 

build.md

@@ -34,21 +34,37 @@
       export apidir=<Perforce C++ API absolute path>
       export ssl=<OpenSSL library path>
       ```
+
+   5. **[Optional] Control SSL Build Behavior**
+
+      By default, if SSL is not available in the root environment, P4Python will attempt to build SSL silently during installation. 
+      Since `pip install` is non-interactive, users cannot choose whether to build SSL or not during the process.
+
+      To explicitly control this behavior, you can use the `P4PYTHON_BUILD_SSL` environment variable as a prefix to the install command:
+
+      - If set to `"no"`, the build process will skip building SSL.
+      - If set to `"yes"`, the build process will proceed to build SSL if needed.
+      - If not set, the default is `"no"` (SSL will not be built).
+
+      **Example usage:**
+      ```
+      P4PYTHON_BUILD_SSL=yes python3 -m pip install .
+      ```
    
-   5. To install P4Python, execute the following command from P4Python source code directory:
+   6. To install P4Python, execute the following command from P4Python source code directory:
       
       ```
       python3 -m pip install .
       ```
       **Note:** In order to cleanly reinstall P4Python, remove the directory named "build".
 
-   6. To test your P4Python install, execute p4test.py:
+   7. To test your P4Python install, execute p4test.py:
       ```
       python3 p4test.py
       ```
 		 **Note:** This test requires the Perforce server executable p4d 17.1 or better to be installed and in the PATH.
 
-   7. To build P4Python wheel, execute the following command:
+   8. To build P4Python wheel, execute the following command:
       
       ```
       python3 -m pip wheel . -w dist

linux_build/build-wheels.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eEx
 ARCH=$(arch)
 

p4test.py

@@ -508,7 +508,7 @@ def resolve(self, mergeData):
                     return "at"
 
                 def actionResolve(self, mergeData):
-                    self.t.assertEqual(mergeData.merge_action, "(text+wx)",
+                    self.t.assertEqual(mergeData.merge_action, "(text+Dwx)",
                         "Unexpected mergeAction: '%s'" % mergeData.merge_action  )
                     self.t.assertEqual(mergeData.yours_action, "(text+w)",
                         "Unexpected mergeAction: '%s'" % mergeData.yours_action  )