T289718: Extend zodbsync to print commit range (#146)

Author: DamianLokic

perfact/zodbsync/subcommand.py

@@ -68,8 +68,8 @@ def gitcmd_run(self, *args):
         subprocess.check_call(self.gitcmd(*args))
 
     def gitcmd_try(self, *args):
-        '''Wrapper to run a git command, ignoring return code.'''
-        subprocess.call(self.gitcmd(*args))
+        '''Wrapper to run a git command, returning return code.'''
+        return subprocess.call(self.gitcmd(*args))
 
     def gitcmd_output(self, *args):
         '''Wrapper to run a git command and return the output.'''
@@ -300,6 +300,23 @@ def wrapper(self, *args, **kwargs):
                     )
                 raise
 
+            if not self.args.dry_run:
+                is_ancestor = (
+                    self.gitcmd_try(
+                        "merge-base", "--is-ancestor", self.orig_commit, "HEAD"
+                    ) == 0
+                )
+                if is_ancestor:
+                    merge_commits = self.gitcmd_output(
+                        "log", "--oneline", "--min-parents=2",
+                        f"{self.orig_commit}..HEAD"
+                    ).strip()
+                    if not merge_commits:
+                        head_commit = self.gitcmd_output(
+                            "rev-parse", "HEAD"
+                        ).strip()
+                        self.logger.info(f"{self.orig_commit}..{head_commit}")
+
         return wrapper
 
     def create_file(self, file_path, content, binary=False):