revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-29 10:12:41 +01:00
Code Issues Releases Wiki Activity

Arc output the correct action being taken

Browse source 
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
This commit is contained in:
Guy Warner 2014-01-28 08:53:50 -08:00 committed by epriestley
parent d1a68ccb37
commit 14f2f7fdd2
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/workflow/ArcanistLandWorkflow.php
View file

@ -594,14 +594,13 @@ EOTEXT
private function rebase() { private function rebase() {
$repository_api = $this->getRepositoryAPI(); $repository_api = $this->getRepositoryAPI();
chdir($repository_api->getPath());
if ($this->isGit) {
if ($this->shouldUpdateWithRebase) {
echo phutil_console_format( echo phutil_console_format(
"Rebasing **%s** onto **%s**\n", "Rebasing **%s** onto **%s**\n",
$this->branch, $this->branch,
$this->onto); $this->onto);
chdir($repository_api->getPath());
if ($this->isGit) {
if ($this->shouldUpdateWithRebase) {
$err = phutil_passthru('git rebase %s', $this->onto); $err = phutil_passthru('git rebase %s', $this->onto);
if ($err) { if ($err) {
throw new ArcanistUsageException( throw new ArcanistUsageException(
@ -612,6 +611,10 @@ EOTEXT
"run 'arc land' again."); "run 'arc land' again.");
} }
} else { } else {
echo phutil_console_format(
"Merging **%s** into **%s**\n",
$this->branch,
$this->onto);
$err = phutil_passthru( $err = phutil_passthru(
'git merge --no-stat %s -m %s', 'git merge --no-stat %s -m %s',
$this->onto, $this->onto,