[Fix] get_branch_status secondary status is now a list

timbrel · Feb 17, 2018 · 5cffb7d · 5cffb7d
1 parent 6f3b372
commit 5cffb7d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/github/commands/pull_request.py b/github/commands/pull_request.py
@@ -168,14 +168,18 @@ def run_async(self):
             else:
                 status, secondary = self.get_branch_status()
                 if secondary:
-                    sublime.message_dialog(
-                        "Your current branch is different from its remote counterpart. %s" % secondary)
-                else:
-                    owner = github.parse_remote(self.get_remotes()[remote_branch.remote]).owner
-                    self.open_comparision_in_browser(
-                        owner,
-                        remote_branch.name
-                    )
+                    secondary = "\n".join(secondary)
+                    if "ahead" in secondary or "behind" in secondary:
+                        sublime.message_dialog(
+                            "Your current branch is different from its remote counterpart.\n" +
+                            secondary)
+                        return
+
+                owner = github.parse_remote(self.get_remotes()[remote_branch.remote]).owner
+                self.open_comparision_in_browser(
+                    owner,
+                    remote_branch.name
+                )
 
     def open_comparision_in_browser(self, owner, branch):
         base_remote = github.parse_remote(self.get_integrated_remote_url())

diff --git a/gitlab/commands/merge_request.py b/gitlab/commands/merge_request.py
@@ -151,17 +151,21 @@ def open_mr_in_browser(self):
 #             remote_branch = self.get_active_remote_branch()
 #             if not remote_branch:
 #                 sublime.message_dialog("Unable to determine remote.")
-#             else:
-#                 status, secondary = self.get_branch_status()
-#                 if secondary:
-#                     sublime.message_dialog(
-#                         "Your current branch is different from its remote counterpart. %s" % secondary)
-#                 else:
-#                     owner = github.parse_remote(self.get_remotes()[remote_branch.remote]).owner
-#                     self.open_comparision_in_browser(
-#                         owner,
-#                         remote_branch.name
-#                     )
+#            else:
+#                status, secondary = self.get_branch_status()
+#                if secondary:
+#                    secondary = "\n".join(secondary)
+#                    if "ahead" in secondary or "behind" in secondary:
+#                        sublime.message_dialog(
+#                            "Your current branch is different from its remote counterpart.\n" +
+#                            secondary)
+#                        return
+
+#                owner = github.parse_remote(self.get_remotes()[remote_branch.remote]).owner
+#                self.open_comparision_in_browser(
+#                    owner,
+#                    remote_branch.name
+#                )
 
 #     def open_comparision_in_browser(self, owner, branch):
 #         base_remote = github.parse_remote(self.get_integrated_remote_url())