2025.2 release code drop

Author: shashankdt-perforce

PythonClientAPI.cpp

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (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/PythonClientAPI.cpp#80 $
+$Id: //depot/main/p4-python/PythonClientAPI.cpp#81 $
 *******************************************************************************/
 
 #include <Python.h>
@@ -707,7 +707,12 @@ PyObject * PythonClientAPI::ConnectOrReconnect()
     Error e;
 
     ResetFlags();
-    client.Init( &e );
+
+    {
+        ReleasePythonLock guard;    // Release GIL during connect
+        client.Init( &e );
+    }
+    
     if ( e.Test() && exceptionLevel ) {
 	Except( "P4.connect()", &e );
 	return NULL;
@@ -751,7 +756,12 @@ PyObject * PythonClientAPI::Disconnect()
     }
 
     Error	e;
-    client.Final( &e );
+
+    {
+        ReleasePythonLock guard;    // Release GIL during disconnect
+        client.Final( &e );
+    }
+    
     ResetFlags();
 
     // Clear the specdef cache.

PythonClientUser.h

@@ -26,7 +26,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/PythonClientUser.h#19 $
+ * $Id: //depot/main/p4-python/PythonClientUser.h#20 $
  *
  * Build instructions:
  *  Use Distutils - see accompanying setup.py
@@ -64,6 +64,7 @@ class PythonClientUser: public ClientUser, public KeepAlive
 
     virtual ClientProgress *CreateProgress(int);
     virtual int ProgressIndicator();
+    virtual int CanParallelProgress() override { return 1; }
 
     virtual void Finished();
 

RELNOTES.txt

@@ -1,7 +1,7 @@
                             Release Notes for
                        P4Python, P4 API for Python
 
-                             Version 2025.1
+                             Version 2025.2
 
 Introduction
 
@@ -34,14 +34,6 @@ Important Product Rebrand Notice
 
 --------------------------------------------------------------------------
 
-Important End-of-Life Notice
-
-    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.
-
---------------------------------------------------------------------------
-
 Installation
 
   Installation via pip
@@ -58,8 +50,8 @@ Installation
 
       python3 -m pip install --upgrade p4python
 
-    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 
+    P4Python is distributed as a binary wheels for Python 3.10,
+    3.11, 3.12, 3.13 and 3.14. 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
@@ -69,23 +61,38 @@ Installation
     P4Python can be installed via Linux packages available from:
     https://www.perforce.com/perforce-packages
 
-    Following packages are available:
+    The easiest way to install P4Python is using the meta-package:
+
+    For RHEL/Rocky Linux
+        sudo yum install perforce-p4python3
+
+    For Ubuntu/Debian
+        sudo apt-get install perforce-p4python3
+
+    The perforce-p4python3 meta-package automatically installs the correct 
+    version for your system's default Python 3 installation.
 
-    RHEL/Rocky Linux 8      
+    If you need to install P4Python for a specific Python version, 
+    the following packages are available:
+
+    RHEL/Rocky Linux 8
         perforce-p4python3-python3.8
         perforce-p4python3-python3.9
-    
+
     RHEL/Rocky Linux 9
         perforce-p4python3-python3.9
 
-    Ubuntu 20.04      
+    RHEL/Rocky Linux 10
+        perforce-p4python3-python3.12
+
+    Ubuntu 20.04
         perforce-p4python3-python3.8
         perforce-p4python3-python3.9
 
-    Ubuntu 22.04      
+    Ubuntu 22.04
         perforce-p4python3-python3.10
-    
-    Ubuntu 24.04      
+
+    Ubuntu 24.04
         perforce-p4python3-python3.12
 
   Installing P4Python for Maya.
@@ -124,28 +131,28 @@ Compatibility Statements
 
   Server Compatibility
 
-    This release of P4Python supports the 2025.1 P4 Server.
+    This release of P4Python supports the 2025.2 P4 Server.
     Older releases might work but are not supported.
 
   API Compatibility
 
-    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.
+    This release of P4Python requires at least 2025.2 P4 C/C++ API
+    (2025.2/2852709). Older releases will not compile and are not supported.
 
   Python Compatibility
 
     This release of P4Python is supported building from source with 
-    Python 3.9, 3.10, 3.11, 3.12 and 3.13.
+    Python 3.10, 3.11, 3.12, 3.13 and 3.14.
 
     For detailed compatibility, please check the following table:
 
     Python Release | P4Python Release
     ======================================
-    3.9            | 2021.1 or later
     3.10           | 2022.1 or later
     3.11           | 2022.2 or later
     3.12           | 2023.1 or later
     3.13           | 2024.2 or later
+    3.14           | 2025.2 or later
 
   OpenSSL Compatibility
 
@@ -155,7 +162,7 @@ Compatibility Statements
     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 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
+    real OpenSSL libraries: The latest 3.x.x or 1.1.1 patch is recommended
 
   Platform Compatibility
 
@@ -170,10 +177,10 @@ Compatibility Statements
     Linux kernel 2.6+ for Intel(x86, x86_64)
         Ubuntu 20.04, 22.04, 24.04
         CentOS 8
-        Rocky Linux 9.1
+        Rocky Linux 9.1, 10
     Linux kernel 2.6+ for ARM(aarch64)
         Ubuntu 20.04, 22.04, 24.04
-        Rocky Linux 9.4
+        Rocky Linux 9.4, 10
 
     The above platforms are tested and subject to regression testing on a 
     frequent basis. Errors or bugs discovered in these platforms are prioritized
@@ -309,11 +316,41 @@ Key to symbols used in change notes below.
 
 --------------------------------------------------------------------------
 
+New functionalities in 2025.2 (2025.2/2863679) (2025/12/03)
+
+    #2842576 (Job #128780)
+        Built P4Python with P4API 2025.2 (2025.2/2852709)
+    
+    #2846296 (Job #128672)
+        Added support for python version 3.14
+
+    #2836086 (Job #110913)
+        Added support for per-file CreateProgress in the Python API 
+        by implementing CanParallelProgress() in PythonClientUser
+        enabling parallel progress operations.
+
+    #2832930 (Job #127506)
+        Added support for RPM packages on RHEL 10, Rocky Linux 10
+        and other EL10-compatible distributions.
+
+Bugs fixed in 2025.2
+
+    #2837109 (Job #124136)
+        run_merge() now correctly reflects the merge tool’s exit code 
+        instead of always returning True. 
+        
+    #2850324 (Job #129466)
+        Fixed an issue where P4Python held the Python GIL during blocking 
+        network operations in connect() and disconnect(), preventing other 
+        threads and async workflows from running.
+
+--------------------------------------------------------------------------
+
 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)

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#59 $
+ $Id: //depot/main/p4-python/SpecMgr.cpp#60 $
  *******************************************************************************/
 
 /*******************************************************************************
@@ -116,6 +116,7 @@ struct specdata {
 	"Backup;code:319;type:select;len:10;val:enable/disable;;"
 	"View;code:311;fmt:C;type:wlist;words:2;len:64;;"
 	"ChangeView;code:317;type:llist;len:64;;"
+	"LimitView;code:320;fmt:C;type:llist;len:64;;"
     },
     {
 	"depot",
@@ -241,6 +242,7 @@ struct specdata {
 	"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;;"
+	"RemoteCharset;code:863;opt:optional;type:line;len:32;;"
     },
     {
 	"repo",

p4test.py

@@ -684,7 +684,6 @@ def testOutputHandler( self ):
         # test the resetting
         self.p4.handler = None
         self.assertEqual( self.p4.handler, None )
-        self.assertEqual( sys.getrefcount(h), 2 )
 
         self.p4.connect()
         self._setClient()
@@ -717,14 +716,12 @@ def outputMessage(self, msg):
         self._doSubmit("Failed to submit the add", change)
 
         h = MyOutputHandler()
-        self.assertEqual( sys.getrefcount(h), 2 )
         self.p4.handler = h
 
         self.assertEqual( len(self.p4.run_files('...')), 0, "p4 does not return empty list")
         self.assertEqual( len(h.statOutput), len(files), "Less files than expected")
         self.assertEqual( len(h.messageOutput), 0, "Messages unexpected")
         self.p4.handler = None
-        self.assertEqual( sys.getrefcount(h), 2 )
 
     def testProgress( self ):
         self.p4.connect()
@@ -1461,6 +1458,90 @@ def isAlive(self):
         self.assertEqual(100, total_files, "Setbreak is not working")
         self.p4.disconnect()
 
+    def testMergeToolReturnCode(self):
+        testDir = 'test_merge_return'
+        testAbsoluteDir = os.path.join(self.client_root, testDir)
+        os.mkdir(testAbsoluteDir)
+
+        self.p4.connect()
+        self.assertTrue(self.p4.connected(), "Not connected")
+        self._setClient()
+
+        # Create initial file
+        file = "merge_test.txt"
+        fname = os.path.join(testAbsoluteDir, file)
+        with open(fname, "w") as f:
+            f.write("Line 1\n")
+        textFile = testDir + "/" + file
+        self.p4.run_add(textFile)
+
+        change = self.p4.fetch_change()
+        change._description = "Initial version"
+        self._doSubmit("Failed to submit initial", change)
+
+        # Create second revision
+        self.p4.run_edit(textFile)
+        with open(fname, "w") as f:
+            f.write("Line 1\nLine 2\n")
+        
+        change = self.p4.fetch_change()
+        change._description = "Second version"
+        self._doSubmit("Failed to submit second", change)
+
+        # Sync back and create conflict
+        self.p4.run_sync(textFile + "#1")
+        self.p4.run_edit(textFile)
+        with open(fname, "w") as f:
+            f.write("Line 1\nDifferent Line 2\n")
+        self.p4.run_sync(textFile)
+
+        # Test with failing merge tool
+        import tempfile
+        import stat
+        
+        # Create a fake merge tool that always fails
+        failing_merge_script = os.path.join(tempfile.gettempdir(), "failing_merge.sh")
+        with open(failing_merge_script, "w") as f:
+            f.write("#!/bin/bash\n >&2\nexit 1\n")
+        os.chmod(failing_merge_script, stat.S_IRWXU)
+
+        class MergeTestResolver(P4.Resolver):
+            def __init__(self, testObject):
+                self.t = testObject
+                self.merge_result = None
+
+            def resolve(self, mergeData):
+                # Set P4MERGE to our failing script
+                old_p4merge = os.environ.get('P4MERGE', '')
+                os.environ['P4MERGE'] = failing_merge_script
+                
+                try:
+                    # Call run_merge and verify it returns False when merge tool fails
+                    self.merge_result = mergeData.run_merge()
+                    
+                    # Assert that run_merge() correctly detects merge tool failure
+                    self.t.assertFalse(self.merge_result, 
+                        f"run_merge() should return False when merge tool fails with exit code 1, but returned {self.merge_result}")
+                    
+                    # Additional assertion to verify the type
+                    self.t.assertIsInstance(self.merge_result, bool, 
+                        f"run_merge() should return a boolean, but returned {type(self.merge_result)}")
+                        
+                finally:
+                    # Restore original P4MERGE
+                    if old_p4merge:
+                        os.environ['P4MERGE'] = old_p4merge
+                    elif 'P4MERGE' in os.environ:
+                        del os.environ['P4MERGE']
+                
+                return "at"  # Accept theirs to complete the resolve
+
+        resolver = MergeTestResolver(self)
+        self.p4.run_resolve(resolver=resolver)
+        
+        # Clean up
+        if os.path.exists(failing_merge_script):
+            os.unlink(failing_merge_script)
 
 
 if __name__ == '__main__':