sfdo-tooling__cumulusci-3624

{
  "status": "ok",
  "stdout": "__init__.py\nbase.py\ncommit_status.py\nmerge.py\npublish.py\npull_request.py\nrelease.py\nrelease_report.py\ntag.py\ntests\nutil.py\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "error",
  "error_type": "CommandError",
  "error_message": "",
  "details": {
    "stdout": "",
    "stderr": "",
    "exit_code": 1
  }
}

{
  "status": "error",
  "error_type": "CommandError",
  "error_message": "",
  "details": {
    "stdout": "",
    "stderr": "",
    "exit_code": 1
  }
}

{
  "status": "ok",
  "stdout": "cumulusci/cumulusci.yml:341:    github_automerge_main:\ncumulusci/cumulusci.yml:345:    github_automerge_feature:\ncumulusci/cumulusci.yml:745:                task: github_automerge_feature\ncumulusci/cumulusci.yml:768:                task: github_automerge_feature\ncumulusci/cumulusci.yml:1168:                task: github_automerge_main\ncumulusci/cumulusci.yml:1201:                task: github_automerge_main\ncumulusci/cumulusci.yml:1228:                task: github_automerge_main\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "error",
  "error_type": "CommandError",
  "error_message": "",
  "details": {
    "stdout": "",
    "stderr": "",
    "exit_code": 1
  }
}

{
  "status": "ok",
  "stdout": "./cumulusci/tasks/github/merge.py:31:        \"skip_future_releases\": {\n./cumulusci/tasks/github/merge.py:52:        self.options[\"skip_future_releases\"] = process_bool_arg(\n./cumulusci/tasks/github/merge.py:53:            self.options.get(\"skip_future_releases\") or True\n./cumulusci/tasks/github/merge.py:108:        skip_future_releases = self.options[\"skip_future_releases\"]\n./cumulusci/tasks/github/merge.py:143:                if skip_future_releases and self._is_future_release_branch(\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "filepath": "cumulusci/tasks/github/merge.py",
  "content": "import http.client\n\nimport github3.exceptions\nfrom github3 import GitHubError\n\nfrom cumulusci.core.exceptions import GithubApiNotFoundError\nfrom cumulusci.core.utils import process_bool_arg\nfrom cumulusci.tasks.github.base import BaseGithubTask\nfrom cumulusci.utils.git import is_release_branch\n\n\nclass MergeBranch(BaseGithubTask):\n    task_docs = \"\"\"\n    Merges the most recent commit on the current branch into other branches depending on the value of source_branch.\n\n    If source_branch is a branch that does not start with the specified branch_prefix, then the commit will be\n    merged to all branches that begin with branch_prefix and are not themselves child branches (i.e. branches don't contain '__' in their name).\n\n    If source_branch begins with branch_prefix, then the commit is merged to all child branches of source_branch.\n    \"\"\"\n    task_options = {  # TODO: should use `class Options instead`\n        \"commit\": {\n            \"description\": \"The commit to merge into feature branches.  Defaults to the current head commit.\"\n        },\n        \"source_branch\": {\n            \"description\": \"The source branch to merge from.  Defaults to project__git__default_branch.\"\n        },\n        \"branch_prefix\": {\n            \"description\": \"A list of prefixes of branches that should receive the merge.  Defaults to project__git__prefix_feature\"\n        },\n        \"skip_future_releases\": {\n            \"description\": \"If true, then exclude branches that start with the branch prefix if they are not for the lowest release number. Defaults to True.\"\n        },\n        \"update_future_releases\": {\n            \"description\": \"If true, then include release branches that are not the lowest release number even if they are not child branches. Defaults to False.\"\n        },\n    }\n\n    def _init_options(self, kwargs):\n        super()._init_options(kwargs)\n\n        if \"commit\" not in self.options:\n            self.options[\"commit\"] = self.project_config.repo_commit\n        if \"branch_prefix\" not in self.options:\n            self.options[\n                \"branch_prefix\"\n            ] = self.project_config.project__git__prefix_feature\n        if \"source_branch\" not in self.options:\n            self.options[\n                \"source_branch\"\n            ] = self.project_config.project__git__default_branch\n        self.options[\"skip_future_releases\"] = process_bool_arg(\n            self.options.get(\"skip_future_releases\") or True\n        )\n        self.options[\"update_future_releases\"] = process_bool_arg(\n            self.options.get(\"update_future_releases\") or False\n        )\n\n    def _init_task(self):\n        super()._init_task()\n        self.repo = self.get_repo()\n\n    def _run_task(self):\n        self._validate_source_branch(self.options[\"source_branch\"])\n        branches_to_merge = self._get_branches_to_merge()\n\n        for branch in branches_to_merge:\n            self._merge(\n                branch.name,\n                self.options[\"source_branch\"],\n                self.options[\"commit\"],\n            )\n\n    def _validate_source_branch(self, source_branch):\n        \"\"\"Validates that the source branch exists in the repository\"\"\"\n        try:\n            self.repo.branch(source_branch)\n        except github3.exceptions.NotFoundError:\n            message = f\"Branch {source_branch} not found\"\n            raise GithubApiNotFoundError(message)\n\n    def _get_existing_prs(self, source_branch, branch_prefix):\n        \"\"\"Returns the existing pull requests from the source branch\n        to other branches that are candidates for merging.\"\"\"\n        existing_prs = []\n        for pr in self.repo.pull_requests(state=\"open\"):\n            if pr.base.ref.startswith(branch_prefix) and pr.head.ref == source_branch:\n                existing_prs.append(pr.base.ref)\n        return existing_prs\n\n    def _get_branches_to_merge(self):\n        \"\"\"\n        If source_branch is the default branch (or a branch that doesn't start with a prefix), we\n        gather all branches with branch_prefix that are not child branches.\n        NOTE: We only include the _next_ closest release branch when automerging from main.\n        A change on main may conflict with the current contents of the lowest release branch.\n        In this case, we would like for that conflict to only need to be resolved once\n        (not once for each release branch).\n\n        If source_branch starts with branch prefix, we gather\n        all branches with branch_prefix that are direct descendents of source_branch.\n\n        If update_future_releases is True, and source_branch is a release branch\n        then we also collect all future release branches.\n        \"\"\"\n        repo_branches = list(self.repo.branches())\n        next_release = self._get_next_release(repo_branches)\n        skip_future_releases = self.options[\"skip_future_releases\"]\n        update_future_releases = self._update_future_releases(next_release)\n\n        child_branches = []\n        main_descendents = []\n        release_branches = []\n        for branch in repo_branches:\n            # check for adding future release branches\n            if update_future_releases and self._is_future_release_branch(\n                branch.name, next_release\n            ):\n                release_branches.append(branch)\n                continue\n\n            # check if we looking at the source_branch\n            if branch.name == self.options[\"source_branch\"]:\n                self.logger.debug(f\"Skipping branch {branch.name}: is source branch\")\n                continue\n\n            # check for branch prefix match\n            elif not branch.name.startswith(self.options[\"branch_prefix\"]):\n                self.logger.debug(\n                    f\"Skipping branch {branch.name}: does not match prefix '{self.options['branch_prefix']}'\"\n                )\n                continue\n\n            # check if source_branch doesn't have prefix and is not a child (e.g. main)\n            elif (\n                not self.options[\"source_branch\"].startswith(\n                    self.options[\"branch_prefix\"]\n                )\n                and \"__\" not in branch.name\n            ):\n                # only merge to the lowest numbered release branch\n                # when merging from a branch without a prefix (e.g. main)\n                if skip_future_releases and self._is_future_release_branch(\n                    branch.name, next_release\n                ):\n                    continue\n                main_descendents.append(branch)\n\n            # else, we have a branch that starts with branch_prefix\n            # check is this branch is a direct descendent",
  "start_line": 1,
  "end_line": 150,
  "total_lines": 287,
  "is_truncated": true
}

{
  "status": "ok",
  "filepath": "cumulusci/core/utils.py",
  "content": "\"\"\" Utilities for CumulusCI Core\"\"\"\n\nimport copy\nimport glob\nimport json\nimport time\nimport typing as T\nimport warnings\nfrom datetime import datetime, timedelta\nfrom logging import getLogger\nfrom pathlib import Path\n\nimport pytz\n\nfrom cumulusci.core.debug import get_debug_mode\nfrom cumulusci.core.exceptions import (\n    ConfigMergeError,\n    CumulusCIException,\n    TaskOptionsError,\n)\nfrom cumulusci.utils.options import parse_list_of_pairs_dict_arg\n\n\ndef import_global(path: str):\n    \"\"\"Import a class from a string module class path\"\"\"\n    components = path.split(\".\")\n    module = components[:-1]\n    module = \".\".join(module)\n\n    if get_debug_mode():\n        import sys\n\n        logger = getLogger(__file__)\n        logger.info(f\"Importing {path}\")\n        logger.info(f\"Looking in sys.path {sys.path}\")\n        if components[0] == \"tasks\":\n            logger.info(f\"With tasks.__path__ {sys.modules['tasks'].__path__}\")\n\n    mod = __import__(module, fromlist=[str(components[-1])])\n    return getattr(mod, str(components[-1]))\n\n\n# For backwards-compatibility\nimport_class = import_global\n\n\ndef parse_datetime(dt_str, format):\n    \"\"\"Create a timezone-aware datetime object from a datetime string.\"\"\"\n    t = time.strptime(dt_str, format)\n    return datetime(t[0], t[1], t[2], t[3], t[4], t[5], t[6], pytz.UTC)\n\n\ndef process_bool_arg(arg: T.Union[int, str, None]):\n    \"\"\"Determine True/False from argument.\n\n    Similar to parts of the Salesforce API, there are a few true-ish and false-ish strings,\n        but \"True\" and \"False\" are the canonical ones.\n\n    None is accepted as \"False\" for backwards compatiblity reasons, but this usage is deprecated.\n    \"\"\"\n    if isinstance(arg, (int, bool)):\n        return bool(arg)\n    elif arg is None:\n        # backwards compatible behaviour that some tasks\n        # rely upon.\n        import traceback\n\n        warnings.warn(\"\".join(traceback.format_stack(limit=4)), DeprecationWarning)\n        warnings.warn(\n            \"Future versions of CCI will not accept 'None' as an argument to process_bool_arg\",\n            DeprecationWarning,\n        )\n\n        return False\n    elif isinstance(arg, str):\n        # these are values that Salesforce's bulk loader accepts\n        # there doesn't seem to be any harm in acccepting the\n        # full list to be coordinated with a \"Salesforce standard\"\n        if arg.lower() in [\"yes\", \"y\", \"true\", \"on\", \"1\"]:\n            return True\n        elif arg.lower() in [\"no\", \"n\", \"false\", \"off\", \"0\"]:\n            return False\n    raise TypeError(f\"Cannot interpret as boolean: `{arg}`\")\n\n\ndef process_glob_list_arg(arg):\n    \"\"\"Convert a list of glob patterns or filenames into a list of files\n    The initial list can take the form of a comma-separated string or\n    a proper list. Order is preserved, but duplicates will be removed.\n\n    Note: this function processes glob patterns, but doesn't validate\n    that the files actually exist. For example, if the pattern is\n    'foo.bar' and there is no file named 'foo.bar', the literal string\n    'foo.bar' will be included in the returned files.\n\n    Similarly, if the pattern is '*.baz' and it doesn't match any files,\n    the literal string '*.baz' will be returned.\n    \"\"\"\n    initial_list = process_list_arg(arg)\n",
  "start_line": 1,
  "end_line": 100,
  "total_lines": 364,
  "is_truncated": false
}

{
  "status": "ok",
  "filepath": "cumulusci/tasks/github/__init__.py",
  "content": "from cumulusci.tasks.github.merge import MergeBranch\nfrom cumulusci.tasks.github.pull_request import PullRequests\nfrom cumulusci.tasks.github.release import CreateRelease\nfrom cumulusci.tasks.github.release_report import ReleaseReport\nfrom cumulusci.tasks.github.tag import CloneTag\n\n\n__all__ = (\"MergeBranch\", \"PullRequests\", \"CreateRelease\", \"ReleaseReport\", \"CloneTag\")",
  "start_line": 1,
  "end_line": 8,
  "total_lines": 8,
  "is_truncated": false
}

{
  "status": "ok",
  "filepath": "cumulusci/tasks/github/base.py",
  "content": "from cumulusci.core.github import get_github_api_for_repo\nfrom cumulusci.core.tasks import BaseTask\n\n\nclass BaseGithubTask(BaseTask):\n    def _init_task(self):\n        super()._init_task()\n        self.github_config = self.project_config.keychain.get_service(\"github\")\n        self.github = get_github_api_for_repo(\n            self.project_config.keychain, self.project_config.repo_url\n        )\n\n    def get_repo(self):\n        return self.github.repository(\n            self.project_config.repo_owner, self.project_config.repo_name\n        )",
  "start_line": 1,
  "end_line": 16,
  "total_lines": 16,
  "is_truncated": false
}

{
  "status": "ok",
  "stdout": "./cumulusci/tasks/github/__init__.py:1:from cumulusci.tasks.github.merge import MergeBranch\n./cumulusci/tasks/github/__init__.py:8:__all__ = (\"MergeBranch\", \"PullRequests\", \"CreateRelease\", \"ReleaseReport\", \"CloneTag\")\n./cumulusci/tasks/github/merge.py:12:class MergeBranch(BaseGithubTask):\n./cumulusci/tasks/github/tests/test_merge.py:10:from cumulusci.tasks.github import MergeBranch\n./cumulusci/tasks/github/tests/test_merge.py:15:class TestMergeBranch(MockUtilBase):\n./cumulusci/tasks/github/tests/test_merge.py:43:        return MergeBranch(\n./cumulusci/tasks/github/tests/test_merge.py:118:        of MergeBranch with the given branch_names.\n./cumulusci/tasks/github/tests/test_merge.py:219:                (\"INFO\", \"Beginning task: MergeBranch\"),\n./cumulusci/tasks/github/tests/test_merge.py:918:        (\"INFO\", \"Beginning task: MergeBranch\"),\n./cumulusci/cumulusci.yml:343:        class_path: cumulusci.tasks.github.MergeBranch\n./cumulusci/cumulusci.yml:347:        class_path: cumulusci.tasks.github.MergeBranch\n./docs/history.md:1746:-   The `MergeBranchOld` task, which was previously deprecated, has now\n./docs/history.md:4640:    functionality in [MergeBranch]{.title-ref} to support merging from a\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "filepath": "cumulusci/tasks/github/tests/test_merge.py",
  "content": "import http.client\n\nimport github3\nimport pytest\nimport responses\nfrom testfixtures import LogCapture\n\nfrom cumulusci.core.config import ServiceConfig, TaskConfig\nfrom cumulusci.core.exceptions import GithubApiNotFoundError\nfrom cumulusci.tasks.github import MergeBranch\nfrom cumulusci.tasks.release_notes.tests.utils import MockUtilBase\nfrom cumulusci.tests.util import DummyOrgConfig, create_project_config\n\n\nclass TestMergeBranch(MockUtilBase):\n    def setup_method(self):\n\n        # Set up the mock values\n        self.repo = \"TestRepo\"\n        self.owner = \"TestOwner\"\n        self.repo_api_url = f\"https://api.github.com/repos/{self.owner}/{self.repo}\"\n        self.branch = \"main\"\n\n        # Create the project config\n        self.project_config = create_project_config(self.repo, self.owner)\n        self.project_config.config[\"project\"][\"git\"][\"default_branch\"] = self.branch\n        self.project_config.keychain.set_service(\n            \"github\",\n            \"test_alias\",\n            ServiceConfig(\n                {\n                    \"username\": \"TestUser\",\n                    \"token\": \"TestPass\",\n                    \"email\": \"testuser@testdomain.com\",\n                }\n            ),\n        )\n\n    def _create_task(self, task_config=None):\n        if not task_config:\n            task_config = {}\n\n        return MergeBranch(\n            project_config=self.project_config,\n            task_config=TaskConfig(task_config),\n            org_config=DummyOrgConfig(),\n        )\n\n    def _mock_repo(self):\n        api_url = self.repo_api_url\n\n        expected_response = self._get_expected_repo(owner=self.owner, name=self.repo)\n        responses.add(method=responses.GET, url=api_url, json=expected_response)\n        return expected_response\n\n    def _mock_branch(self, branch, expected_response=None):\n        api_url = f\"{self.repo_api_url}/branches/{branch}\"\n        if not expected_response:\n            expected_response = self._get_expected_branch(branch)\n        responses.add(method=responses.GET, url=api_url, json=expected_response)\n\n    def _mock_branches(self, branches=None):\n        api_url = f\"{self.repo_api_url}/branches\"\n        if branches:\n            expected_response = branches\n        else:\n            expected_response = []\n\n        responses.add(method=responses.GET, url=api_url, json=expected_response)\n        return expected_response\n\n    def _mock_branch_does_not_exist(self, branch):\n        api_url = f\"{self.repo_api_url}/branches/{branch}\"\n        expected_response = self._get_expected_not_found()\n        responses.add(\n            method=responses.GET,\n            url=api_url,\n            status=http.client.NOT_FOUND,  # 404\n            json=expected_response,\n        )\n\n    def _mock_merge(self, status=http.client.CREATED):\n        api_url = f\"{self.repo_api_url}/merges\"\n        expected_response = self._get_expected_merge(status == http.client.CONFLICT)\n\n        responses.add(\n            method=responses.POST, url=api_url, json=expected_response, status=status\n        )\n        return expected_response\n\n    def _mock_pull_create(self, pull_id, issue_id, status=None):\n        api_url = f\"{self.repo_api_url}/pulls\"\n        expected_response = self._get_expected_pull_request(pull_id, issue_id)\n\n        responses.add(\n            method=responses.POST,\n            url=api_url,\n            json=expected_response,\n            status=status or http.client.CREATED,  # 201\n        )\n\n    def _mock_compare(self, base, head, files=None):\n        api_url = f\"{self.repo_api_url}/compare/{base}...{head}\"\n        expected_response = self._get_expected_compare(base, head, files)\n\n        responses.add(method=responses.GET, url=api_url, json=expected_response)\n\n    def _get_log_lines(self, log):\n        log_lines = []\n        for event in log.records:\n            if event.name != \"cumulusci.core.tasks\":\n                continue\n            log_lines.append((event.levelname, event.getMessage()))\n        return log_lines\n\n    def _setup_mocks(self, branch_names, merges=True, compare_diff=True):\n        \"\"\"Setup all mocks needed for an integration test\n        of MergeBranch with the given branch_names.\n        source_branch should be at index 0\n        \"\"\"\n        # Create response for repo endpoint\n        self._mock_repo()\n        # Create endpoint for repo/pulls...\n        self.mock_pulls()\n\n        # Create response for source branch endpoint\n        self._mock_branch(branch_names[0])\n\n        branch_response_bodies = []\n        for name in branch_names:\n            branch_response_bodies.append(self._get_expected_branch(name))\n\n        # Create response for repo/branches endpoint\n        branches = self._mock_branches(branch_response_bodies)\n\n        if merges:\n            # Create endpoint for repo/merges endpoint\n            merges = [self._mock_merge()]\n        # Create endpoints for repo/compare/{base}...{head}\n        for branch in branches[1:]:\n            files = [{\"filename\": \"text.txt\"}] if compare_diff else []\n            self._mock_compare(\n                base=branch[\"name\"],\n                head=self.project_config.repo_commit,\n                files=files,\n            )\n\n    @responses.activate\n    def test_branch_does_not_exist(self):\n        self._mock_repo()",
  "start_line": 1,
  "end_line": 150,
  "total_lines": 920,
  "is_truncated": true
}

{
  "status": "error",
  "error_type": "CommandError",
  "error_message": "/workspace/cumulusci/__init__.py:8: UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.\n  __import__(\"pkg_resources\").declare_namespace(\"cumulusci\")\nTraceback (most recent call last):\n  File \"<stdin>\", line 35, in <module>\n  File \"<stdin>\", line 31, in <module>\n  File \"<stdin>\", line 27, in test_skip_future_releases_option\nAssertionError\n",
  "details": {
    "stdout": "Default skip_future_releases: True\nSet False skip_future_releases: True\nTest failed!\n",
    "stderr": "/workspace/cumulusci/__init__.py:8: UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.\n  __import__(\"pkg_resources\").declare_namespace(\"cumulusci\")\nTraceback (most recent call last):\n  File \"<stdin>\", line 35, in <module>\n  File \"<stdin>\", line 31, in <module>\n  File \"<stdin>\", line 27, in test_skip_future_releases_option\nAssertionError\n",
    "exit_code": 1
  }
}

{
  "status": "ok",
  "filepath": "cumulusci/tasks/github/merge.py",
  "occurrences": 1,
  "strategy": "exact",
  "diff": "--- a/cumulusci/tasks/github/merge.py\n+++ b/cumulusci/tasks/github/merge.py\n@@ -50,10 +50,10 @@\n                 \"source_branch\"\n             ] = self.project_config.project__git__default_branch\n         self.options[\"skip_future_releases\"] = process_bool_arg(\n-            self.options.get(\"skip_future_releases\") or True\n+            self.options.get(\"skip_future_releases\", True)\n         )\n         self.options[\"update_future_releases\"] = process_bool_arg(\n-            self.options.get(\"update_future_releases\") or False\n+            self.options.get(\"update_future_releases\", False)\n         )\n \n     def _init_task(self):\n",
  "is_truncated": false
}

{
  "status": "ok",
  "stdout": "Default skip_future_releases: True\nSet False skip_future_releases: False\nTest passed!\n",
  "stderr": "/workspace/cumulusci/__init__.py:8: UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.\n  __import__(\"pkg_resources\").declare_namespace(\"cumulusci\")\n",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": "Default update_future_releases: False\nSet True update_future_releases: True\nTest passed!\n",
  "stderr": "/workspace/cumulusci/__init__.py:8: UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.\n  __import__(\"pkg_resources\").declare_namespace(\"cumulusci\")\n",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": ".......................                                                  [100%]\n23 passed in 0.40s\n",
  "stderr": "/CumulusCI/cumulusci/__init__.py:8: UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81.\n  __import__(\"pkg_resources\").declare_namespace(\"cumulusci\")\n",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": " M cumulusci/tasks/github/merge.py\ndiff --git a/cumulusci/tasks/github/merge.py b/cumulusci/tasks/github/merge.py\nindex 1134de0..19893b0 100644\n--- a/cumulusci/tasks/github/merge.py\n+++ b/cumulusci/tasks/github/merge.py\n@@ -50,10 +50,10 @@ class MergeBranch(BaseGithubTask):\n                 \"source_branch\"\n             ] = self.project_config.project__git__default_branch\n         self.options[\"skip_future_releases\"] = process_bool_arg(\n-            self.options.get(\"skip_future_releases\") or True\n+            self.options.get(\"skip_future_releases\", True)\n         )\n         self.options[\"update_future_releases\"] = process_bool_arg(\n-            self.options.get(\"update_future_releases\") or False\n+            self.options.get(\"update_future_releases\", False)\n         )\n \n     def _init_task(self):\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "patch_size": 774,
  "files_changed": 1
}