Changeset View
Changeset View
Standalone View
Standalone View
src/land/engine/ArcanistGitLandEngine.php
| Show First 20 Lines • Show All 485 Lines • ▼ Show 20 Lines | if ($this->getIsGitPerforce()) { | ||||
| $flags_argv[] = '--conflict=quit'; | $flags_argv[] = '--conflict=quit'; | ||||
| $err = $this->newPassthru( | $err = $this->newPassthru( | ||||
| '%LR p4 submit %LR --commit %R --', | '%LR p4 submit %LR --commit %R --', | ||||
| $config_argv, | $config_argv, | ||||
| $flags_argv, | $flags_argv, | ||||
| $into_commit); | $into_commit); | ||||
| if ($err) { | if ($err) { | ||||
| throw new ArcanistUsageException( | throw new ArcanistLandPushFailureException( | ||||
| pht( | pht( | ||||
| 'Submit failed! Fix the error and run "arc land" again.')); | 'Submit failed! Fix the error and run "arc land" again.')); | ||||
| } | } | ||||
| return; | return; | ||||
| } | } | ||||
| $log->writeStatus( | $log->writeStatus( | ||||
| pht('PUSHING'), | pht('PUSHING'), | ||||
| pht('Pushing changes to "%s".', $this->getOntoRemote())); | pht('Pushing changes to "%s".', $this->getOntoRemote())); | ||||
| $err = $this->newPassthru( | $err = $this->newPassthru( | ||||
| 'push -- %s %Ls', | 'push -- %s %Ls', | ||||
| $this->getOntoRemote(), | $this->getOntoRemote(), | ||||
| $this->newOntoRefArguments($into_commit)); | $this->newOntoRefArguments($into_commit)); | ||||
| if ($err) { | if ($err) { | ||||
| throw new ArcanistUsageException( | throw new ArcanistLandPushFailureException( | ||||
| pht( | pht( | ||||
| 'Push failed! Fix the error and run "arc land" again.')); | 'Push failed! Fix the error and run "arc land" again.')); | ||||
| } | } | ||||
| // TODO | |||||
| // if ($this->isGitSvn) { | |||||
| // $err = phutil_passthru('git svn dcommit'); | |||||
| // $cmd = 'git svn dcommit'; | |||||
| } | } | ||||
| protected function reconcileLocalState( | protected function reconcileLocalState( | ||||
| $into_commit, | $into_commit, | ||||
| ArcanistRepositoryLocalState $state) { | ArcanistRepositoryLocalState $state) { | ||||
| $api = $this->getRepositoryAPI(); | $api = $this->getRepositoryAPI(); | ||||
| $log = $this->getWorkflow()->getLogEngine(); | $log = $this->getWorkflow()->getLogEngine(); | ||||
| ▲ Show 20 Lines • Show All 1,079 Lines • Show Last 20 Lines | |||||