RBTools 5.1__tar.gz → 5.2__tar.gz

{rbtools-5.1 → rbtools-5.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: RBTools
-Version: 5.1
+Version: 5.2
 Summary: Command line tools and API for working with code and document reviews on Review Board
 Author-email: "Beanbag, Inc." <questions@beanbaginc.com>
 License: MIT
@@ -38,9 +38,15 @@ Requires-Dist: typing_extensions>=4.3.0
 Requires-Dist: tqdm
 Requires-Dist: importlib-metadata>=5.0
 Requires-Dist: importlib-resources>=5.9
+Dynamic: license-file
 
-About RBTools
-=============
+RBTools - Command Line Tools for Review Board
+=============================================
+
+[![Latest Release](https://img.shields.io/pypi/v/RBTools)](https://pypi.org/project/RBTools)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
+[![Review Board](https://img.shields.io/badge/Review%20Board-d0e6ff?label=reviewed%20with)](https://www.reviewboard.org)
+[![Python](https://img.shields.io/pypi/pyversions/RBTools)](https://pypi.org/project/RBTools)
 
 RBTools is a set of command line tools and a rich Python API for use with
 [Review Board](https://www.reviewboard.org/).
@@ -96,10 +102,20 @@ Getting Support
 We can help you get going with Review Board and RBTools, and diagnose any
 issues that may come up.
 
-If you're using RBTools in production, we offer [support
-contracts](https://www.reviewboard.org/support/), covering all Beanbag
-products. This helps fund the development of Review Board, RBTools, and our
-other open source projects.
+We provide more [dedicated, private
+support](https://www.reviewboard.org/support/) for your organization through a
+support contract, offering:
+
+* Same-day responses (generally within a few hours, if not sooner)
+* Confidential communications
+* Installation/upgrade assistance
+* Emergency database repair
+* Video/chat meetings (by appointment)
+* Priority fixes for urgent bugs
+* Backports of urgent fixes to older releases (when possible)
+
+Support contracts fund the development of Review Board, RBTools, and our other
+open source projects.
 
 For basic questions, there's a public community support
 [discussion list](http://groups.google.com/group/reviewboard/). We generally
@@ -152,7 +168,7 @@ $ pip install -r dev-requirements.txt
 Running the test suite is easy. Simply run:
 
 ```console
-$ ./tests/runtests.py
+$ pytest
 ```
 
 from the top of the source tree. You can also run a particular set of tests.

{rbtools-5.1 → rbtools-5.2}/RBTools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: RBTools
-Version: 5.1
+Version: 5.2
 Summary: Command line tools and API for working with code and document reviews on Review Board
 Author-email: "Beanbag, Inc." <questions@beanbaginc.com>
 License: MIT
@@ -38,9 +38,15 @@ Requires-Dist: typing_extensions>=4.3.0
 Requires-Dist: tqdm
 Requires-Dist: importlib-metadata>=5.0
 Requires-Dist: importlib-resources>=5.9
+Dynamic: license-file
 
-About RBTools
-=============
+RBTools - Command Line Tools for Review Board
+=============================================
+
+[![Latest Release](https://img.shields.io/pypi/v/RBTools)](https://pypi.org/project/RBTools)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
+[![Review Board](https://img.shields.io/badge/Review%20Board-d0e6ff?label=reviewed%20with)](https://www.reviewboard.org)
+[![Python](https://img.shields.io/pypi/pyversions/RBTools)](https://pypi.org/project/RBTools)
 
 RBTools is a set of command line tools and a rich Python API for use with
 [Review Board](https://www.reviewboard.org/).
@@ -96,10 +102,20 @@ Getting Support
 We can help you get going with Review Board and RBTools, and diagnose any
 issues that may come up.
 
-If you're using RBTools in production, we offer [support
-contracts](https://www.reviewboard.org/support/), covering all Beanbag
-products. This helps fund the development of Review Board, RBTools, and our
-other open source projects.
+We provide more [dedicated, private
+support](https://www.reviewboard.org/support/) for your organization through a
+support contract, offering:
+
+* Same-day responses (generally within a few hours, if not sooner)
+* Confidential communications
+* Installation/upgrade assistance
+* Emergency database repair
+* Video/chat meetings (by appointment)
+* Priority fixes for urgent bugs
+* Backports of urgent fixes to older releases (when possible)
+
+Support contracts fund the development of Review Board, RBTools, and our other
+open source projects.
 
 For basic questions, there's a public community support
 [discussion list](http://groups.google.com/group/reviewboard/). We generally
@@ -152,7 +168,7 @@ $ pip install -r dev-requirements.txt
 Running the test suite is easy. Simply run:
 
 ```console
-$ ./tests/runtests.py
+$ pytest
 ```
 
 from the top of the source tree. You can also run a particular set of tests.

{rbtools-5.1 → rbtools-5.2}/RBTools.egg-info/SOURCES.txt

@@ -132,7 +132,9 @@ docs/releasenotes/3.1.rst
 docs/releasenotes/4.0.rst
 docs/releasenotes/4.1.rst
 docs/releasenotes/5.0.rst
+docs/releasenotes/5.1.1.rst
 docs/releasenotes/5.1.rst
+docs/releasenotes/5.2.rst
 docs/releasenotes/Makefile
 docs/releasenotes/conf.py
 docs/releasenotes/index.rst

{rbtools-5.1 → rbtools-5.2}/README.md

@@ -1,5 +1,10 @@
-About RBTools
-=============
+RBTools - Command Line Tools for Review Board
+=============================================
+
+[![Latest Release](https://img.shields.io/pypi/v/RBTools)](https://pypi.org/project/RBTools)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
+[![Review Board](https://img.shields.io/badge/Review%20Board-d0e6ff?label=reviewed%20with)](https://www.reviewboard.org)
+[![Python](https://img.shields.io/pypi/pyversions/RBTools)](https://pypi.org/project/RBTools)
 
 RBTools is a set of command line tools and a rich Python API for use with
 [Review Board](https://www.reviewboard.org/).
@@ -55,10 +60,20 @@ Getting Support
 We can help you get going with Review Board and RBTools, and diagnose any
 issues that may come up.
 
-If you're using RBTools in production, we offer [support
-contracts](https://www.reviewboard.org/support/), covering all Beanbag
-products. This helps fund the development of Review Board, RBTools, and our
-other open source projects.
+We provide more [dedicated, private
+support](https://www.reviewboard.org/support/) for your organization through a
+support contract, offering:
+
+* Same-day responses (generally within a few hours, if not sooner)
+* Confidential communications
+* Installation/upgrade assistance
+* Emergency database repair
+* Video/chat meetings (by appointment)
+* Priority fixes for urgent bugs
+* Backports of urgent fixes to older releases (when possible)
+
+Support contracts fund the development of Review Board, RBTools, and our other
+open source projects.
 
 For basic questions, there's a public community support
 [discussion list](http://groups.google.com/group/reviewboard/). We generally
@@ -111,7 +126,7 @@ $ pip install -r dev-requirements.txt
 Running the test suite is easy. Simply run:
 
 ```console
-$ ./tests/runtests.py
+$ pytest
 ```
 
 from the top of the source tree. You can also run a particular set of tests.

{rbtools-5.1 → rbtools-5.2}/contrib/installers/windows/wix/rbtools.wixproj

@@ -63,6 +63,6 @@
 
  <!-- Sign the installer -->
  <Target Name="SignMsi">
-  <Exec Command='"$(SignToolPath)" sign /fd SHA256 /sha1 $(CertificateThumbprint) /t $(TimestampUrl) "%(SignMsi.FullPath)"' />
+  <Exec Command='"$(SignToolPath)" sign /debug /fd SHA256 /sha1 $(CertificateThumbprint) /t $(TimestampUrl) "%(SignMsi.FullPath)"' />
  </Target>
 </Project>

rbtools-5.2/docs/releasenotes/5.1.1.rst

@@ -0,0 +1,38 @@
+.. default-intersphinx:: rbt5.x rb-latest
+
+
+===========================
+RBTools 5.1.1 Release Notes
+===========================
+
+**Release date:** December 3, 2024
+
+
+Installation
+============
+
+Follow our :ref:`installation guide <rbtools-installation>` to install RBTools.
+
+To learn more, see:
+
+* `Documentation <https://www.reviewboard.org/docs/rbtools/5.x/>`_
+* `RBTools on PyPI <https://pypi.org/project/rbtools/>`_
+* `RBTools on GitHub <https://github.com/reviewboard/rbtools/>`_
+
+
+Bug Fixes
+=========
+
+rbt patch
+---------
+
+* Fixed a remaining bug with :option:`rbt patch --px` and Subversion
+  leading to a crash.
+
+
+Contributors
+============
+
+* Christian Hammond
+* David Trowbridge
+* Michelle Aubin

rbtools-5.2/docs/releasenotes/5.2.rst

@@ -0,0 +1,72 @@
+.. default-intersphinx:: rbt5.x rb-latest
+
+=========================
+RBTools 5.2 Release Notes
+=========================
+
+**Release date:** March 24, 2025
+
+
+Installation
+============
+
+Follow our :ref:`installation guide <rbtools-installation>` to install RBTools.
+
+To learn more, see:
+
+* `Documentation <https://www.reviewboard.org/docs/rbtools/5.x/>`_
+* `RBTools on PyPI <https://pypi.org/project/rbtools/>`_
+* `RBTools on GitHub <https://github.com/reviewboard/rbtools/>`_
+
+
+Bug Fixes
+=========
+
+rbt patch
+---------
+
+* Fixed running :option`rbt patch --print` when the Review Board server URL is
+  defined via the :rbtconfig:`TREES` setting.
+
+* Fixed patching on SVN repositories when the working directory has no overlap
+  with the patch's base directory.
+
+  :rbtcommand:`rbt patch` attempted to be smart about applying patches when the
+  current working directory was different from the working directory that the
+  Review Request was originally created from. Unfortunately, this broke
+  applying patches across different branches. This has been fixed to skip any
+  filtering when there is no overlap between the patch's base directory and the
+  current working directory.
+
+
+rbt post
+--------
+
+* Fixed MIME type guessing when :command:`file` was not available.
+
+  RBTools 5.1 added a fallback method for detecting the MIME type of binary
+  files included in diffs for when the :command:`file` command is not present.
+  This had a couple issues that could cause crashes in some situations.
+
+
+IBM ClearCase / HCL DevOps Code ClearCase
+-----------------------------------------
+
+* Fixed repository matching when posting against Review Board servers older
+  than 7.0.1.
+
+
+Mercurial
+---------
+
+* Fixed file revision parsing to avoid unwanted debug output from the
+  :command:`hg` command.
+
+
+Contributors
+============
+
+* André Klitzing
+* Christian Hammond
+* David Trowbridge
+* Michelle Aubin

{rbtools-5.1 → rbtools-5.2}/docs/releasenotes/index.rst

@@ -11,6 +11,8 @@ RBTools Release Notes
 .. toctree::
    :maxdepth: 1
 
+   5.2
+   5.1.1
    5.1
    5.0
 

{rbtools-5.1 → rbtools-5.2}/rbtools/__init__.py

@@ -10,7 +10,7 @@ Beanbag Tools. They're largely used for packaging purposes.
 #:
 #: (Major, Minor, Micro, Patch, alpha/beta/rc/final, Release Number, Released)
 #:
-VERSION = (5, 1, 0, 0, 'final', 0, True)
+VERSION = (5, 2, 0, 0, 'final', 0, True)
 
 
 def get_version_string():

{rbtools-5.1 → rbtools-5.2}/rbtools/clients/__init__.py

@@ -113,7 +113,7 @@ def scan_usable_client(
     config: RBToolsConfig,
     options: argparse.Namespace,
     client_name: Optional[str] = None,
-) -> tuple[RepositoryInfo, BaseSCMClient]:
+) -> tuple[Optional[RepositoryInfo], Optional[BaseSCMClient]]:
     """Scan for a usable SCMClient.
 
     Args:

{rbtools-5.1 → rbtools-5.2}/rbtools/clients/clearcase.py

@@ -399,7 +399,7 @@ class ClearCaseClient(BaseSCMClient):
     # Pack were failing when we tried to make a query that included the
     # VersionVault name. We therefore only include it when we know the server
     # can use server_tool_ids instead.
-    server_tool_names = 'ClearCase'
+    server_tool_names = 'ClearCase,VersionVault / ClearCase'
     server_tool_ids = ['clearcase', 'versionvault']
 
     requires_diff_tool = True

{rbtools-5.1 → rbtools-5.2}/rbtools/clients/mercurial.py

@@ -792,9 +792,9 @@ class MercurialClient(BaseSCMClient):
             str:
             The global revision ID of the commit.
         """
-        # --debug ensures that we get the full ID.
         identify = self._execute(
-            [self._exe, 'identify', '--debug', '-i', '--hidden', '-r',
+            [self._exe, 'identify', '-i', '--hidden',
+             '--template', '{node}', '-r',
              str(revision)],
             ignore_errors=True, none_on_ignored_error=True)
 

{rbtools-5.1 → rbtools-5.2}/rbtools/clients/svn.py

@@ -72,6 +72,7 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
         self,
         *,
         patch: Patch,
+        base_dir: Optional[str] = None,
     ) -> Optional[int]:
         """Return the default path prefix strip level for a patch.
 
@@ -80,29 +81,40 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
 
         For Subversion, we always strip off any leading ``/``.
 
+        Version Changed:
+            5.0.2:
+            * Added the ``base_dir`` argument and changed to prefer that
+              if present.
+
         Args:
             patch (rbtools.diffs.patches.Patch):
                 The path to generate a default prefix strip level for.
 
+            base_dir (str, optional):
+                The base directory to use when computing the prefix level,
+                if available.
+
+                Version Added:
+                    5.0.2
+
         Returns:
             int:
             The prefix strip level, or ``None`` if a clear one could not be
             determined.
         """
-        repository_info = self.repository_info
-
-        if repository_info is not None:
-            base_path = repository_info.base_path
-
-            if base_path == '/':
-                # We always need to strip off the leading forward slash.
-                return 1
-            elif base_path:
-                # We strip all leading directories from base_path. The last
-                # directory will not be suffixed with a slash.
-                return base_path.count('/') + 1
-
-        return None
+        if (not base_dir and
+            (repository_info := self.repository_info) is not None):
+            base_dir = repository_info.base_path
+
+        if base_dir == '/':
+            # We always need to strip off the leading forward slash.
+            return 1
+        elif base_dir:
+            # We strip all leading directories from base_dir. The last
+            # directory will not be suffixed with a slash.
+            return base_dir.count('/') + 1
+        else:
+            return None
 
     def apply_single_patch(
         self,
@@ -110,7 +122,7 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
         patch: Patch,
         patch_num: int,
     ) -> PatchResult:
-        """Internal function to apply a single patch.
+        """Apply a single patch.
 
         This will take a single patch and apply it using Subversion.
 
@@ -140,19 +152,43 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
         repository_info = self.repository_info
 
         if repository_info is not None:
-            base_path = repository_info.base_path or ''
+            checkout_base_dir = repository_info.base_path or ''
         else:
-            base_path = ''
+            checkout_base_dir = ''
 
         patch_file = str(patch.path)
-        base_dir = patch.base_dir
+        patch_base_dir = patch.base_dir
+
+        in_subdir = (patch_base_dir and
+                     checkout_base_dir != patch_base_dir and
+                     checkout_base_dir.startswith(patch_base_dir))
+
+        prefix_level = patch.prefix_level
+
+        if prefix_level is None:
+            # If we're in a subdirectory of where the patch was created, we
+            # want to use the checkout directory to compute the prefix level.
+            # If there's no overlap (or if the checkout and patch base
+            # directories match), we use the patch basedir to compute the
+            # prefix level and we hope that things apply cleanly.
+            if in_subdir:
+                base_dir = checkout_base_dir
+            else:
+                base_dir = patch_base_dir
 
-        if base_dir and not base_dir.startswith(base_path):
-            # The patch was created in either a higher level directory or a
-            # directory not under this one. We should exclude files from the
-            # patch that are not under this directory.
-            excluded, empty = self._exclude_files_not_in_tree(patch_file,
-                                                              base_path)
+            prefix_level = self.get_default_prefix_level(
+                patch=patch, base_dir=base_dir)
+
+            # Set this back so we can refer to it later when handling empty
+            # files.
+            patch.prefix_level = prefix_level
+
+        if in_subdir:
+            # The patch was created in a higher-level directory. Log a warning
+            # and filter out any files which are not present in the current
+            # directory.
+            excluded, empty = self._exclude_files_not_in_tree(
+                patch_file, checkout_base_dir)
 
             if excluded:
                 logger.warning(
@@ -161,7 +197,7 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
                     'not under the current directory have been '
                     'excluded. To apply all files in this '
                     'patch, apply this patch from the %s directory.',
-                    base_dir)
+                    patch_base_dir)
 
                 if empty:
                     logger.warning('All files were excluded from the patch.')
@@ -169,15 +205,6 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
         # Build the command line.
         cmd: list[str] = ['patch']
 
-        prefix_level = patch.prefix_level
-
-        if prefix_level is None:
-            prefix_level = self.get_default_prefix_level(patch=patch)
-
-            # Set this back so we can refer to it later when handling empty
-            # files.
-            patch.prefix_level = prefix_level
-
         if prefix_level is not None and prefix_level >= 0:
             cmd.append(f'--strip={prefix_level}')
 
@@ -338,27 +365,26 @@ class SVNPatcher(SCMClientPatcher['SVNClient']):
 
         filtered_patch_name = make_tempfile()
 
-        with open(filtered_patch_name, 'wb') as filtered_patch:
-            with open(patch_file, 'rb') as original_patch:
-                include_file = True
-
-                INDEX_FILE_RE = SVNClient.INDEX_FILE_RE
+        with open(filtered_patch_name, 'wb') as filtered_patch, \
+             open(patch_file, 'rb') as original_patch:
+            include_file = True
 
-                for line in original_patch.readlines():
-                    m = INDEX_FILE_RE.match(line)
+            INDEX_FILE_RE = SVNClient.INDEX_FILE_RE
 
-                    if m:
-                        filename = m.group(1).decode('utf-8')
+            for line in original_patch.readlines():
+                m = INDEX_FILE_RE.match(line)
 
-                        include_file = filename.startswith(base_path)
+                if m:
+                    filename = m.group(1).decode('utf-8')
+                    include_file = filename.startswith(base_path)
 
-                        if not include_file:
-                            excluded_files = True
-                        else:
-                            empty_patch = False
+                    if not include_file:
+                        excluded_files = True
+                    else:
+                        empty_patch = False
 
-                    if include_file:
-                        filtered_patch.write(line)
+                if include_file:
+                    filtered_patch.write(line)
 
         os.rename(filtered_patch_name, patch_file)