bitmingw · September 18, 2023 08:20 · Jan 1, 2021 · Feb 16, 2017 · Feb 16, 2017 · Feb 16, 2017
diff --git a/git_batch_resolver.py b/git_batch_resolver.py
@@ -7,11 +7,33 @@
 automates `git add/rm` and `git checkout` with --ours or --theirs
 for a large batch of changes.
 
-Usage: `./git_batch_resolver.py` in your git repository.
+Usage: `python3 git_batch_resolver.py` in your git repository.
 
 Note:
-for `git merge`, ours -> current branch, theirs -> other branch
-for `git rebase`, ours -> other branch, theirs -> current branch
+  in `git merge`, ours -> current branch, theirs -> other branch
+  in `git rebase`, ours -> other branch, theirs -> current branch
+
+MIT License
+
+Copyright (c) 2020 Ming Wen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 """
 
 import fileinput

diff --git a/git_batch_resolver.py b/git_batch_resolver.py
@@ -18,7 +18,7 @@
 import os
 from subprocess import check_output
 
-UNMERGED_PATH = "Unmerged path"  # probably avoid problem with plural
+
 BOTH_ADDED = "both added:"
 BOTH_MODIFIED = "both modified:"
 ADDED_BY_US = "added by us:"

diff --git a/git_batch_resolver.py b/git_batch_resolver.py
@@ -7,7 +7,7 @@
 automates `git add/rm` and `git checkout` with --ours or --theirs
 for a large batch of changes.
 
-Usage: `./batch-rebase.py` in your git repository.
+Usage: `./git_batch_resolver.py` in your git repository.
 
 Note:
 for `git merge`, ours -> current branch, theirs -> other branch

diff --git a/git_batch_resolver.py b/git_batch_resolver.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+
+"""
+Author: Ming Wen (bitmingw@gmail.com)
+
+When resolving conflicts on a merge or rebase, this script
+automates `git add/rm` and `git checkout` with --ours or --theirs
+for a large batch of changes.
+
+Usage: `./batch-rebase.py` in your git repository.
+
+Note:
+for `git merge`, ours -> current branch, theirs -> other branch
+for `git rebase`, ours -> other branch, theirs -> current branch
+"""
+
+import fileinput
+import os
+from subprocess import check_output
+
+UNMERGED_PATH = "Unmerged path"  # probably avoid problem with plural
+BOTH_ADDED = "both added:"
+BOTH_MODIFIED = "both modified:"
+ADDED_BY_US = "added by us:"
+ADDED_BY_THEM = "added by them:"
+DELETED_BY_US = "deleted by us:"
+DELETED_BY_THEM = "deleted by them:"
+
+
+def main():
+    stat = read_stat()
+    prompt = "To solve conflict, use (o)urs, (t)heirs or (a)bort? "
+    while True:
+        response = input(prompt)
+        if len(response) == 0 or (response[0] not in ["o", "t", "a"]):
+            prompt = "Invalid option. Type [o/t/a]. Please try again: "
+        else:
+            break
+    if response[0] == "o":
+        for f in stat["both-added"]:
+            check_output("git add " + f, shell=True)
+        for f in stat["both-modified"]:
+            check_output("git checkout --ours " + f, shell=True)
+            check_output("git add " + f, shell=True)
+        for f in stat["added-by-us"]:
+            check_output("git add " + f, shell=True)
+        for f in stat["added-by-them"]:
+            check_output("git rm " + f, shell=True)
+        for f in stat["deleted-by-us"]:
+            check_output("git rm " + f, shell=True)
+        for f in stat["deleted-by-them"]:
+            check_output("git add " + f, shell=True)
+    elif response[0] == "t":
+        for f in stat["both-added"]:
+            check_output("git add " + f, shell=True)
+        for f in stat["both-modified"]:
+            check_output("git checkout --theirs " + f, shell=True)
+            check_output("git add " + f, shell=True)
+        for f in stat["added-by-us"]:
+            check_output("git rm " + f, shell=True)
+        for f in stat["added-by-them"]:
+            check_output("git add " + f, shell=True)
+        for f in stat["deleted-by-us"]:
+            check_output("git add " + f, shell=True)
+        for f in stat["deleted-by-them"]:
+            check_output("git rm " + f, shell=True)
+    elif response[0] == "a":
+        print("Action abort by user.")
+        return
+
+    print("\n==== results: git status ====")
+    res = str(check_output(["git", "status"]), encoding='utf-8')
+    res = res.split("\n")
+    for line in res:
+        print(line)
+    print("==== end of result ====")
+    print("Please resolve remaining issues manually. Thanks!")
+
+
+def read_stat():
+    check_output("git status > _tmp.txt", shell=True)
+    stat = {"both-added": [],
+            "both-modified": [],
+            "added-by-us": [],
+            "added-by-them": [],
+            "deleted-by-us": [],
+            "deleted-by-them": []}
+    print("==== git status ====")
+    for line in fileinput.input("_tmp.txt"):
+        print(line, end="")
+        if match_str_head(line, BOTH_ADDED):
+            stat["both-added"].append(
+                extract_path(line, BOTH_ADDED))
+        elif match_str_head(line, BOTH_MODIFIED):
+            stat["both-modified"].append(
+                extract_path(line, BOTH_MODIFIED))
+        elif match_str_head(line, ADDED_BY_US):
+            stat["added-by-us"].append(
+                extract_path(line, ADDED_BY_US))
+        elif match_str_head(line, ADDED_BY_THEM):
+            stat["added-by-them"].append(
+                extract_path(line, ADDED_BY_THEM))
+        elif match_str_head(line, DELETED_BY_US):
+            stat["deleted-by-us"].append(
+                extract_path(line, DELETED_BY_US))
+        elif match_str_head(line, DELETED_BY_THEM):
+            stat["deleted-by-them"].append(
+                extract_path(line, DELETED_BY_THEM))
+    print("==== end of git status ====\n")
+    os.remove("_tmp.txt")
+    return stat
+
+
+def match_str_head(s, template):
+    s = s.strip()
+    return True if s.find(template) == 0 else False
+
+
+def extract_path(s, template):
+    s = s.strip()
+    assert match_str_head(s, template)
+    s = s[len(template):]  # remove prefix
+    return s.strip()
+
+
+if __name__ == "__main__":
+    main()