From 8398cee3460e1f6343d41323e851e99d8a0ed315 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Mon, 10 Jun 2019 02:21:02 +0200
Subject: Use `get_merge_base` across scripts

Replace `$ARGS` system from before with the merge base value taken from
the database. This makes the merge base consistent across `code-review`
tools/subcommands.
---
 code-review-commits  |  8 +++-----
 code-review-diff     |  8 +++-----
 code-review-difftool | 10 +++++-----
 code-review-stat     |  8 +++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/code-review-commits b/code-review-commits
index 10b03c6..45db156 100755
--- a/code-review-commits
+++ b/code-review-commits
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-ARGS='master..'
+SCRIPT="$(dirname "$0")"
+source "$SCRIPT/code-review-database"
 
-if [ "$#" -gt 0 ]; then
-	ARGS="$@"
-fi
 
-git log --oneline "$@"
+git log --oneline "$(get_merge_base)"
diff --git a/code-review-diff b/code-review-diff
index 37c6cb2..fe16e07 100755
--- a/code-review-diff
+++ b/code-review-diff
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-ARGS='master..'
+SCRIPT="$(dirname "$0")"
+source "$SCRIPT/code-review-database"
 
-if [ "$#" -gt 0 ]; then
-	ARGS="$@"
-fi
 
-git diff "$ARGS"
+git diff "$(get_merge_base)"
diff --git a/code-review-difftool b/code-review-difftool
index 54376c4..1d3dcb8 100755
--- a/code-review-difftool
+++ b/code-review-difftool
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-REVIEW_BASE=master..
+SCRIPT="$(dirname "$0")"
+source "$SCRIPT/code-review-database"
 
-if [ $# -gt 1 ]; then
-	REVIEW_BASE="$1"
-fi
+
+review_base="$(get_merge_base)"
 
 # TODO: Use `code-review-changed-files` instead of `git diff --name-only`
 # TODO: Can't replace single dots as those could be part of a branch name
 # vim -c 'tabdo Gdiff ${REVIEW_BASE/./}' -p $(git diff --name-only "$REVIEW_BASE")
-vim -c 'tabdo Gdiff origin/master' -p $(git diff --name-only origin/master)
+vim -c "tabdo Gdiff $review_base" -p $(git diff --name-only $review_base)
diff --git a/code-review-stat b/code-review-stat
index 61f58ed..a3ca472 100755
--- a/code-review-stat
+++ b/code-review-stat
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-ARGS='master..'
+SCRIPT="$(dirname "$0")"
+source "$SCRIPT/code-review-database"
 
-if [ "$#" -gt 0 ]; then
-	ARGS="$@"
-fi
 
-git diff --stat "$ARGS"
+git diff --stat "$(get_merge_base)"
-- 
cgit v1.2.3