Differential D21324 Diff 50754 src/land/engine/ArcanistLandEngine.php

Changeset View

Standalone View

Show First 20 Lines • Show All 1,260 Lines • ▼ Show 20 Lines	try {
}		}
}		}

break;		break;
}		}
}		}

if ($is_hold) {		if ($is_hold) {
$this->didHoldChanges();		$this->didHoldChanges($local_state);
$this->discardLocalState();		$local_state->discardLocalState();
} else {		} else {
$this->reconcileLocalState($into_commit, $local_state);		$this->reconcileLocalState($into_commit, $local_state);
}		}

// TODO: Restore this.		// TODO: Restore this.
// $this->getWorkflow()->askForRepositoryUpdate();		// $this->getWorkflow()->askForRepositoryUpdate();

		// TODO: This is misleading under "--hold".
$log->writeSuccess(		$log->writeSuccess(
pht('DONE'),		pht('DONE'),
pht('Landed changes.'));		pht('Landed changes.'));
} catch (Exception $ex) {		} catch (Exception $ex) {
$local_state->restoreLocalState();		$local_state->restoreLocalState();
throw $ex;		throw $ex;
} catch (Throwable $ex) {		} catch (Throwable $ex) {
$local_state->restoreLocalState();		$local_state->restoreLocalState();
throw $ex;		throw $ex;
}		}
}		}


protected function validateArguments() {		protected function validateArguments() {
$log = $this->getLogEngine();		$log = $this->getLogEngine();

$into_local = $this->getIntoLocalArgument();		$into_local = $this->getIntoLocalArgument();
$into_empty = $this->getIntoEmptyArgument();		$into_empty = $this->getIntoEmptyArgument();
$into_remote = $this->getIntoRemoteArgument();		$into_remote = $this->getIntoRemoteArgument();

$into_count = 0;		$into_count = 0;
▲ Show 20 Lines • Show All 196 Lines • Show Last 20 Lines