ticket2pr 0.3.0__py2.py3-none-any.whl → 0.3.1__py2.py3-none-any.whl

src/branch_creator.py

@@ -1,7 +1,12 @@
+import logging
 import re
+from datetime import datetime
 
 from src.clients.github_client import GitHubClient
 from src.clients.jira_client import JiraClient, JiraIssue
+from src.exceptions import GithubBranchAlreadyExistsError
+
+logger = logging.getLogger(__name__)
 
 
 def sanitize_branch_name(name: str, max_length: int = 100) -> str:
@@ -42,7 +47,20 @@ def create_branch_from_jira_issue(
     branch_name = generate_branch_name(jira_issue.key, jira_issue.summary, jira_issue.type)
     # TODO: Consider replacing the 2 next lines with local git client
     base_ref = github_client.get_base_branch_ref(base_branch)
-    branch_url = github_client.create_branch(branch_name, base_ref)
+
+    try:
+        branch_url = github_client.create_branch(branch_name, base_ref)
+    except GithubBranchAlreadyExistsError:
+        # Branch already exists, add timestamp suffix and retry
+        original_branch_name = branch_name
+        timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
+        branch_name = f"{branch_name}-{timestamp}"
+        logger.info(
+            "Branch '%s' already exists. Retrying with new name: '%s'",
+            original_branch_name,
+            branch_name,
+        )
+        branch_url = github_client.create_branch(branch_name, base_ref)
 
     jira_client.link_branch(jira_issue.key, branch_url, branch_name)
 

{ticket2pr-0.3.0.dist-info → ticket2pr-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ticket2pr
-Version: 0.3.0
+Version: 0.3.1
 Summary: Automate Jira ticket to GitHub PR workflow
 Home-page: https://github.com/bengabay11/ticket2pr
 Author: Ben Gabay

{ticket2pr-0.3.0.dist-info → ticket2pr-0.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/branch_creator.py,sha256=W0kttV0WAp5xtpGpBk_oDHtLYYVeGYpZt_OF3S3GSfk,1580
+src/branch_creator.py,sha256=8KqlIjP-VDnB8_qd_1NjiyimAs6yn5xJdr0o9OMtzsw,2230
 src/cli.py,sha256=zqKsJqcVortkcJ4VOkqQe6Xf5o_7U4kcIXSzUhU15PM,5811
 src/console_utils.py,sha256=TbVl_WhiGi1Kq7txk_WpCIfs7gvTJ3qPrSNVBOZ_ZiQ,6928
 src/enhanced_git.py,sha256=IcZb7e_7f8z6VyuAoy9q0J1TEF30B3vG-4WG5IrgbuQ,4245
@@ -28,9 +28,9 @@ tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 tests/integration/test_find_first_toml.py,sha256=Wq4rDReqcWLC0CsgcDBDX62wtMljcsm8UHUDTLr4-_A,902
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_nothing.py,sha256=qRI0MSdLiBRklBNEsOAkr4jxfcrO2v2CuB2hHWePonU,103
-ticket2pr-0.3.0.dist-info/licenses/LICENSE,sha256=omgsokA67LJXOOKpXtf1wNH71Bfs35NWEAuLowNUMyM,1066
-ticket2pr-0.3.0.dist-info/METADATA,sha256=JlxjDaUv7kKwyZ5iu9cO8KBdJNsK6brh_hWtCbIF1vU,3264
-ticket2pr-0.3.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
-ticket2pr-0.3.0.dist-info/entry_points.txt,sha256=DnWUjexpwtqVcRSICrpnveMIjGJA9_0K5IjZt10jVkM,47
-ticket2pr-0.3.0.dist-info/top_level.txt,sha256=KW3xgkz9NLMTcmmzgKvW8RFpCFkRIQ085qzq2diFf68,10
-ticket2pr-0.3.0.dist-info/RECORD,,
+ticket2pr-0.3.1.dist-info/licenses/LICENSE,sha256=omgsokA67LJXOOKpXtf1wNH71Bfs35NWEAuLowNUMyM,1066
+ticket2pr-0.3.1.dist-info/METADATA,sha256=nrAa9Ytiq62HIsHzx8ueJax6R6dEK8jTw1f4z5tZZGA,3264
+ticket2pr-0.3.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+ticket2pr-0.3.1.dist-info/entry_points.txt,sha256=DnWUjexpwtqVcRSICrpnveMIjGJA9_0K5IjZt10jVkM,47
+ticket2pr-0.3.1.dist-info/top_level.txt,sha256=KW3xgkz9NLMTcmmzgKvW8RFpCFkRIQ085qzq2diFf68,10
+ticket2pr-0.3.1.dist-info/RECORD,,