Use merges while getting branch uptodate; automatically update PRs (#8)

* Use merges while getting branch uptodate; automatically update PRs

* update

* update

Author: purajit

gitstack.py

@@ -114,9 +114,9 @@ def operate(self, operation: str, args: List[str]) -> None:
             assert len(args) == 1
             parent = args[0]
             self.track_current_branch(parent)
-        elif operation in {"su", "submit"}:
+        elif operation in {"pr"}:
             assert len(args) == 0
-            self.submit_stack()
+            self.create_prs()
         elif operation in {"s", "sync"}:
             assert len(args) == 0
             self.sync()
@@ -134,8 +134,9 @@ def print_stack(self):
             )
         )
 
-    def submit_stack(self):
+    def create_prs(self):
         """Submit the stack starting at the current branch going down"""
+        branch = self.original_branch
         while branch != self.trunk:
             p = subprocess.run(
                 [
@@ -152,7 +153,13 @@ def submit_stack(self):
             )
             has_pr = bool(p.stdout.decode().strip())
             if has_pr:
-                pass
+                subprocess.run(
+                    ["git", "push"],
+                    check=True,
+                    stdout=sys.stdout.buffer,
+                    stderr=sys.stderr.buffer,
+                )
+                print(f"Updated PR for {branch}")
             else:
                 parent = self.gitstack[branch]
                 subprocess.run(
@@ -161,9 +168,17 @@ def submit_stack(self):
                     stdout=sys.stdout.buffer,
                     stderr=sys.stderr.buffer,
                 )
+                print(f"Created PR for {branch}")
 
             branch = self.switch_to_parent()
 
+        subprocess.run(
+            ["git", "switch", self.original_branch],
+            check=True,
+            stdout=sys.stdout.buffer,
+            stderr=sys.stderr.buffer,
+        )
+
     def create_branch(self, branch: str, parent) -> None:
         """Create new branch and add to gitstack"""
         subprocess.run(
@@ -180,7 +195,7 @@ def track_current_branch(self, parent):
             print(f"Branch {parent} does not exist")
             return
 
-        branch = git_get_current_branch()
+        branch = self.original_branch
         if branch == parent:
             print("Branch cannot be its own parent")
             return
@@ -342,12 +357,12 @@ def _check_and_rebase(self, branch: str) -> None:
         )
         current_base_sha = p.stdout.decode().strip()
         if current_parent_sha == current_base_sha:
-            logger.info(
-                "Branch %s doesn't need to be rebased on top of %s", branch, parent
+            print(
+                f"Branch {branch} up-to-date with {parent}", branch, parent
             )
             return
-        logger.info("Rebasing %s on top of %s", branch, parent)
-        subprocess.run(["git", "rebase", parent, branch], check=True)
+        print(f"Merging {parent} into {branch}")
+        subprocess.run(["git", "merge", parent], check=True)
 
     def _get_trunk(self):
         """Get name of trunk based on possible candidates"""