Merge pull request #58 from nikita-skobov/topbase-add-label

Topbase add label

src/split.rs

@@ -27,6 +27,7 @@ pub struct Runner<'a> {
     pub verbose: bool,
     pub should_rebase: bool,
     pub should_topbase: bool,
+    pub topbase_add_label: bool,
     pub repo_file: RepoFile,
     pub repo_root_dir: PathBuf,
     pub topbase_top_ref: Option<String>,
@@ -56,6 +57,7 @@ impl<'a> Runner<'a> {
             verbose: is_verbose,
             should_rebase: is_rebase,
             should_topbase: is_topbase,
+            topbase_add_label: false,
             repo_file: RepoFile::new(),
             topbase_top_ref: None,
             repo_original_ref: None,
@@ -75,6 +77,11 @@ impl<'a> Runner<'a> {
         }
     }
 
+    pub fn add_label_before_topbase(mut self, flag: bool) -> Self {
+        self.topbase_add_label = flag;
+        self
+    }
+
     // get the current ref that this git repo is pointing to
     // save it for later
     pub fn save_current_ref(mut self) -> Self {

src/split_out.rs

@@ -241,6 +241,7 @@ pub fn run_split_out(matches: &ArgMatches) {
         .get_repository_from_current_dir()
         .change_to_repo_root()
         .safe_to_proceed()
+        .add_label_before_topbase(true)
         .generate_arg_strings()
         .make_and_checkout_output_branch();
 

src/topbase.rs

@@ -167,6 +167,19 @@ impl<'a> Topbase for Runner<'a> {
             }
         }
 
+        // only add label in certain circumstances,
+        // otherwise a label being added is unnecessary
+        // and annoying
+        if self.topbase_add_label {
+            // if we've made it this far, that
+            // means we have commits to topbase
+            // so we should add a label here of the upstream
+            // branch, so if the user does a git log after topbase
+            // they can visualize which commits were added on top
+            let label_name = format!("{}-remote", current_branch);
+            let _ = exec_helpers::execute(&["git", "branch", label_name.as_str(), upstream_branch.as_str()]);
+        }
+
         // rebase_data="pick <hash> <msg>
         // pick <hash> <msg>
         // pick <hash> <msg>

test/splitout/end-to-end.bats

@@ -682,6 +682,52 @@ function teardown() {
     [[ "$(git status)" == *"rebase in progress"* ]]
 }
 
+@test '--topbase should add a branch label before rebasing' {
+    repo_file_contents="
+    remote_repo=\"..$SEP$test_remote_repo2\"
+    include=(\"lib/\")
+    "
+    echo "$repo_file_contents" > repo_file.sh
+
+    mkdir -p lib/
+    echo "libfile1.txt" > lib/libfile1.txt
+    git add lib/libfile1.txt && git commit -m "libfile1"
+
+    # make the same 'contribution' on the remote repo
+    # this mimics a scenario where you have previously
+    # contributed to that repo, so the next time you contribute,
+    # topbase will only add your most recent commits
+    curr_dir="$PWD"
+    cd "$BATS_TMPDIR/test_remote_repo2"
+    mkdir -p lib/
+    echo "libfile1.txt" > lib/libfile1.txt
+    git add lib/libfile1.txt && git commit -m "libfile1"
+    cd "$curr_dir"
+
+    # this is the recent contribution that will be topbased
+    echo "libfile1-mod" >> lib/libfile1.txt
+    git add lib/libfile1.txt && git commit -m "libfile1mod"
+
+    run $PROGRAM_PATH split-out repo_file.sh -t --verbose
+    echo "$output"
+    echo "$(git branch -v)"
+    echo -e "\n$(git branch --show-current):"
+    echo "$(git log --oneline)"
+    [[ $status == "0" ]]
+    [[ "$(git branch --show-current)" == "test_remote_repo2" ]]
+    output_log="$(git log --oneline)"
+    output_commits="$(git log --oneline | wc -l)"
+
+    # topbase should add a label to where the top of
+    # our libfile1mod was applied onto test_remote_repo2
+    [[ "$(git branch -v)" == *"test_remote_repo2-remote"* ]]
+    # the commit of this branch label should exist in our actual
+    # topbased branch. ie: this tests to make sure the branch
+    # label was applied in the right place
+    latest_label_commit="$(git log test_remote_repo2-remote --oneline -n 1)"
+    [[ "$output_log" == *"$latest_label_commit"* ]]
+}
+
 @test '--rebase should not say success if there were rebase merge conflicts' {
     repo_file_contents="
     remote_repo=\"..$SEP$test_remote_repo2\"