From 14f2f7fdd204ba8f96345e2393d3b1573c85e64a Mon Sep 17 00:00:00 2001 From: Guy Warner Date: Tue, 28 Jan 2014 08:53:50 -0800 Subject: [PATCH] Arc output the correct action being taken Summary: Fixes T3929. If arc is merging it will say merging * into * vs always saying rebasing * onto * Test Plan: Make arc do a rebase, then a merge Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley CC: Korvin, epriestley, aran Maniphest Tasks: T3929 Differential Revision: https://secure.phabricator.com/D8085 --- src/workflow/ArcanistLandWorkflow.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php index d1b9dc31..67b8e746 100644 --- a/src/workflow/ArcanistLandWorkflow.php +++ b/src/workflow/ArcanistLandWorkflow.php @@ -594,14 +594,13 @@ EOTEXT private function rebase() { $repository_api = $this->getRepositoryAPI(); - echo phutil_console_format( - "Rebasing **%s** onto **%s**\n", - $this->branch, - $this->onto); - chdir($repository_api->getPath()); if ($this->isGit) { if ($this->shouldUpdateWithRebase) { + echo phutil_console_format( + "Rebasing **%s** onto **%s**\n", + $this->branch, + $this->onto); $err = phutil_passthru('git rebase %s', $this->onto); if ($err) { throw new ArcanistUsageException( @@ -612,6 +611,10 @@ EOTEXT "run 'arc land' again."); } } else { + echo phutil_console_format( + "Merging **%s** into **%s**\n", + $this->branch, + $this->onto); $err = phutil_passthru( 'git merge --no-stat %s -m %s', $this->onto,