Resolve usernames when the remote ends with a trailing slash (#110)

python · Jan 21, 2024 · d7c3264 · d7c3264
1 parent c7a504f
commit d7c3264
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py
@@ -198,7 +198,7 @@ def username(self):
         cmd = ["git", "config", "--get", f"remote.{self.pr_remote}.url"]
         result = self.run_cmd(cmd, required_real_result=True)
         # implicit ssh URIs use : to separate host from user, others just use /
-        username = result.replace(":", "/").split("/")[-2]
+        username = result.replace(":", "/").rstrip("/").split("/")[-2]
         return username
 
     def get_cherry_pick_branch(self, maint_branch):

diff --git a/cherry_picker/test_cherry_picker.py b/cherry_picker/test_cherry_picker.py
@@ -343,10 +343,13 @@ def test_get_pr_url(config):
     [
         b"[email protected]:mock_user/cpython.git",
         b"[email protected]:mock_user/cpython",
+        b"[email protected]:mock_user/cpython/",
         b"ssh://[email protected]/mock_user/cpython.git",
         b"ssh://[email protected]/mock_user/cpython",
+        b"ssh://[email protected]/mock_user/cpython/",
         b"https://github.com/mock_user/cpython.git",
         b"https://github.com/mock_user/cpython",
+        b"https://github.com/mock_user/cpython/",
     ],
 )
 def test_username(url, config):