Changeset View
Changeset View
Standalone View
Standalone View
src/workflow/ArcanistLandWorkflow.php
| Show First 20 Lines • Show All 508 Lines • ▼ Show 20 Lines | private function readArguments() { | ||||
| if (count($branch) !== 1) { | if (count($branch) !== 1) { | ||||
| throw new ArcanistUsageException( | throw new ArcanistUsageException( | ||||
| pht('Specify exactly one branch or bookmark to land changes from.')); | pht('Specify exactly one branch or bookmark to land changes from.')); | ||||
| } | } | ||||
| $this->branch = head($branch); | $this->branch = head($branch); | ||||
| $this->keepBranch = $this->getArgument('keep-branch'); | $this->keepBranch = $this->getArgument('keep-branch'); | ||||
| $update_strategy = $this->getConfigFromAnySource( | $update_strategy = $this->getConfigFromAnySource('arc.land.update.default'); | ||||
| 'arc.land.update.default', | |||||
| 'merge'); | |||||
| $this->shouldUpdateWithRebase = $update_strategy == 'rebase'; | $this->shouldUpdateWithRebase = $update_strategy == 'rebase'; | ||||
| if ($this->getArgument('update-with-rebase')) { | if ($this->getArgument('update-with-rebase')) { | ||||
| $this->shouldUpdateWithRebase = true; | $this->shouldUpdateWithRebase = true; | ||||
| } else if ($this->getArgument('update-with-merge')) { | } else if ($this->getArgument('update-with-merge')) { | ||||
| $this->shouldUpdateWithRebase = false; | $this->shouldUpdateWithRebase = false; | ||||
| } | } | ||||
| $this->preview = $this->getArgument('preview'); | $this->preview = $this->getArgument('preview'); | ||||
| ▲ Show 20 Lines • Show All 1,044 Lines • Show Last 20 Lines | |||||