mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-10-24 17:48:50 +02:00
aada1440ef
Summary: Makes arc land support hg repositories. Both bookmarks and named branches can be landed. For the most part all the arc land options work, but there are a few caveats: - bookmarks can only be landed on bookmarks - branches can only be landed on branches - landing a named branch with --merge creates a commit to close the branch before the merge. - since mercurial doesn't start with a default master bookmark, landing a bookmark requires specifying --onto or setting arc.land.onto.default Test Plan: Tested arc land with all permutations of --merge, --keep-branch on both bookmark branches and named branches. Also tested --hold, --revision, --onto, --remote. See https://secure.phabricator.com/P619 Also tested git arc land with --merge and --keep-branch. Reviewers: dschleimer, sid0, epriestley, bos Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4068
665 lines
20 KiB
PHP
665 lines
20 KiB
PHP
<?php
|
|
|
|
/**
|
|
* Lands a branch by rebasing, merging and amending it.
|
|
*
|
|
* @group workflow
|
|
*/
|
|
final class ArcanistLandWorkflow extends ArcanistBaseWorkflow {
|
|
private $isGit;
|
|
private $isHg;
|
|
|
|
private $oldBranch;
|
|
private $branch;
|
|
private $onto;
|
|
private $ontoRemoteBranch;
|
|
private $remote;
|
|
private $useSquash;
|
|
private $keepBranch;
|
|
|
|
private $revision;
|
|
private $messageFile;
|
|
|
|
public function getWorkflowName() {
|
|
return 'land';
|
|
}
|
|
|
|
public function getCommandSynopses() {
|
|
return phutil_console_format(<<<EOTEXT
|
|
**land** [__options__] [__branch__] [--onto __master__]
|
|
EOTEXT
|
|
);
|
|
}
|
|
|
|
public function getCommandHelp() {
|
|
return phutil_console_format(<<<EOTEXT
|
|
Supports: git, hg
|
|
|
|
Land an accepted change (currently sitting in local feature branch
|
|
__branch__) onto __master__ and push it to the remote. Then, delete
|
|
the feature branch. If you omit __branch__, the current branch will
|
|
be used.
|
|
|
|
In mutable repositories, this will perform a --squash merge (the
|
|
entire branch will be represented by one commit on __master__). In
|
|
immutable repositories (or when --merge is provided), it will perform
|
|
a --no-ff merge (the branch will always be merged into __master__ with
|
|
a merge commit).
|
|
|
|
Under hg, bookmarks can be landed the same way as branches.
|
|
EOTEXT
|
|
);
|
|
}
|
|
|
|
public function requiresWorkingCopy() {
|
|
return true;
|
|
}
|
|
|
|
public function requiresConduit() {
|
|
return true;
|
|
}
|
|
|
|
public function requiresAuthentication() {
|
|
return true;
|
|
}
|
|
|
|
public function requiresRepositoryAPI() {
|
|
return true;
|
|
}
|
|
|
|
public function getArguments() {
|
|
return array(
|
|
'onto' => array(
|
|
'param' => 'master',
|
|
'help' => "Land feature branch onto a branch other than the default ".
|
|
"('master' in git, 'default' in hg). You can change the ".
|
|
"default by setting 'arc.land.onto.default' with ".
|
|
"`arc set-config` or for the entire project in .arcconfig.",
|
|
),
|
|
'hold' => array(
|
|
'help' => "Prepare the change to be pushed, but do not actually ".
|
|
"push it.",
|
|
),
|
|
'keep-branch' => array(
|
|
'help' => "Keep the feature branch after pushing changes to the ".
|
|
"remote (by default, it is deleted).",
|
|
),
|
|
'remote' => array(
|
|
'param' => 'origin',
|
|
'help' => "Push to a remote other than the default ('origin' in git).",
|
|
),
|
|
'merge' => array(
|
|
'help' => 'Perform a --no-ff merge, not a --squash merge. If the '.
|
|
'project is marked as having an immutable history, this is '.
|
|
'the default behavior.',
|
|
'supports' => array(
|
|
'git',
|
|
),
|
|
'nosupport' => array(
|
|
'hg' => 'Use the --squash strategy when landing in mercurial.',
|
|
),
|
|
),
|
|
'squash' => array(
|
|
'help' => 'Perform a --squash merge, not a --no-ff merge. If the '.
|
|
'project is marked as having a mutable history, this is '.
|
|
'the default behavior.',
|
|
'conflicts' => array(
|
|
'merge' => '--merge and --squash are conflicting merge strategies.',
|
|
),
|
|
),
|
|
'delete-remote' => array(
|
|
'help' => 'Delete the feature branch in the remote after '.
|
|
'landing it.',
|
|
'conflicts' => array(
|
|
'keep-branch' => true,
|
|
),
|
|
),
|
|
'revision' => array(
|
|
'param' => 'id',
|
|
'help' => 'Use the message from a specific revision, rather than '.
|
|
'inferring the revision based on branch content.',
|
|
),
|
|
'*' => 'branch',
|
|
);
|
|
}
|
|
|
|
public function run() {
|
|
$this->readArguments();
|
|
$this->validate();
|
|
$this->pullFromRemote();
|
|
|
|
$this->checkoutBranch();
|
|
$this->findRevision();
|
|
|
|
if ($this->useSquash) {
|
|
$this->rebase();
|
|
$this->squash();
|
|
} else {
|
|
$this->merge();
|
|
}
|
|
|
|
$this->push();
|
|
if (!$this->keepBranch) {
|
|
$this->cleanupBranch();
|
|
}
|
|
|
|
// If we were on some branch A and the user ran "arc land B",
|
|
// switch back to A.
|
|
if ($this->oldBranch != $this->branch && $this->oldBranch != $this->onto) {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
$repository_api->execxLocal(
|
|
'checkout %s',
|
|
$this->oldBranch);
|
|
echo phutil_console_format(
|
|
"Switched back to branch **%s**.\n",
|
|
$this->oldBranch);
|
|
}
|
|
|
|
echo "Done.\n";
|
|
|
|
return 0;
|
|
}
|
|
|
|
private function readArguments() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
$this->isGit = $repository_api instanceof ArcanistGitAPI;
|
|
$this->isHg = $repository_api instanceof ArcanistMercurialAPI;
|
|
|
|
if (!$this->isGit && !$this->isHg) {
|
|
throw new ArcanistUsageException(
|
|
"'arc land' only supports git and mercurial.");
|
|
}
|
|
|
|
$branch = $this->getArgument('branch');
|
|
if (empty($branch)) {
|
|
$branch = $this->getBranchOrBookmark();
|
|
|
|
if ($branch) {
|
|
echo "Landing current branch '{$branch}'.\n";
|
|
$branch = array($branch);
|
|
}
|
|
}
|
|
|
|
if (count($branch) !== 1) {
|
|
throw new ArcanistUsageException(
|
|
"Specify exactly one branch to land changes from.");
|
|
}
|
|
$this->branch = head($branch);
|
|
$this->keepBranch = $this->getArgument('keep-branch');
|
|
|
|
$onto_default = $this->isGit ? 'master' : 'default';
|
|
$onto_default = nonempty(
|
|
$this->getWorkingCopy()->getConfigFromAnySource('arc.land.onto.default'),
|
|
$onto_default);
|
|
$this->onto = $this->getArgument('onto', $onto_default);
|
|
|
|
$remote_default = $this->isGit ? 'origin' : '';
|
|
$this->remote = $this->getArgument('remote', $remote_default);
|
|
|
|
if ($this->getArgument('merge')) {
|
|
$this->useSquash = false;
|
|
} else if ($this->getArgument('squash')) {
|
|
$this->useSquash = true;
|
|
} else {
|
|
$this->useSquash = !$this->isHistoryImmutable();
|
|
}
|
|
|
|
$this->ontoRemoteBranch = $this->onto;
|
|
if ($this->isGit) {
|
|
$this->ontoRemoteBranch = $this->remote.'/'.$this->onto;
|
|
}
|
|
|
|
$this->oldBranch = $this->getBranchOrBookmark();
|
|
}
|
|
|
|
private function validate() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
if ($this->onto == $this->branch) {
|
|
$message =
|
|
"You can not land a branch onto itself -- you are trying to land ".
|
|
"'{$this->branch}' onto '{$this->onto}'. For more information on ".
|
|
"how to push changes, see 'Pushing and Closing Revisions' in ".
|
|
"'Arcanist User Guide: arc diff' in the documentation.";
|
|
if (!$this->isHistoryImmutable()) {
|
|
$message .= " You may be able to 'arc amend' instead.";
|
|
}
|
|
throw new ArcanistUsageException($message);
|
|
}
|
|
|
|
if ($this->isHg) {
|
|
if ($this->useSquash) {
|
|
list ($err) = $repository_api->execManualLocal("rebase --help");
|
|
if ($err) {
|
|
throw new ArcanistUsageException(
|
|
"You must enable the rebase extension to use ".
|
|
"the --squash strategy.");
|
|
}
|
|
}
|
|
|
|
if ($repository_api->isBookmark($this->branch) &&
|
|
!$repository_api->isBookmark($this->onto)) {
|
|
throw new ArcanistUsageException(
|
|
"Source {$this->branch} is a bookmark but destination ".
|
|
"{$this->onto} is not a bookmark. When landing a bookmark, ".
|
|
"the destination must also be a bookmark. Use --onto to specify ".
|
|
"a bookmark, or set arc.land.onto.default in .arcconfig.");
|
|
}
|
|
|
|
if ($repository_api->isBranch($this->branch) &&
|
|
!$repository_api->isBranch($this->onto)) {
|
|
throw new ArcanistUsageException(
|
|
"Source {$this->branch} is a branch but destination {$this->onto} ".
|
|
"is not a branch. When landing a branch, the destination must also ".
|
|
"be a branch. Use --onto to specify a branch, or set ".
|
|
"arc.land.onto.default in .arcconfig.");
|
|
}
|
|
}
|
|
|
|
if ($this->isGit) {
|
|
list($err) = $repository_api->execManualLocal(
|
|
'rev-parse --verify %s',
|
|
$this->branch);
|
|
|
|
if ($err) {
|
|
throw new ArcanistUsageException(
|
|
"Branch '{$this->branch}' does not exist.");
|
|
}
|
|
}
|
|
|
|
$this->requireCleanWorkingCopy();
|
|
}
|
|
|
|
private function checkoutBranch() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
$repository_api->execxLocal(
|
|
'checkout %s',
|
|
$this->branch);
|
|
|
|
echo phutil_console_format(
|
|
"Switched to branch **%s**. Identifying and merging...\n",
|
|
$this->branch);
|
|
}
|
|
|
|
private function findRevision() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
$repository_api->parseRelativeLocalCommit(array($this->ontoRemoteBranch));
|
|
|
|
$revision_id = $this->getArgument('revision');
|
|
if ($revision_id) {
|
|
$revision_id = $this->normalizeRevisionID($revision_id);
|
|
$revisions = $this->getConduit()->callMethodSynchronous(
|
|
'differential.query',
|
|
array(
|
|
'ids' => array($revision_id),
|
|
));
|
|
if (!$revisions) {
|
|
throw new ArcanistUsageException("No such revision 'D{$revision_id}'!");
|
|
}
|
|
} else {
|
|
$revisions = $repository_api->loadWorkingCopyDifferentialRevisions(
|
|
$this->getConduit(),
|
|
array(
|
|
'authors' => array($this->getUserPHID()),
|
|
));
|
|
}
|
|
|
|
if (!count($revisions)) {
|
|
throw new ArcanistUsageException(
|
|
"arc can not identify which revision exists on branch ".
|
|
"'{$this->branch}'. Update the revision with recent changes ".
|
|
"to synchronize the branch name and hashes, or use 'arc amend' ".
|
|
"to amend the commit message at HEAD, or use '--revision <id>' ".
|
|
"to select a revision explicitly.");
|
|
} else if (count($revisions) > 1) {
|
|
$message =
|
|
"There are multiple revisions on feature branch '{$this->branch}' ".
|
|
"which are not present on '{$onto}':\n\n".
|
|
$this->renderRevisionList($revisions)."\n".
|
|
"Separate these revisions onto different branches, or use ".
|
|
"'--revision <id>' to select one.";
|
|
throw new ArcanistUsageException($message);
|
|
}
|
|
|
|
$this->revision = head($revisions);
|
|
|
|
$rev_status = $this->revision['status'];
|
|
$rev_id = $this->revision['id'];
|
|
$rev_title = $this->revision['title'];
|
|
|
|
if ($rev_status != ArcanistDifferentialRevisionStatus::ACCEPTED) {
|
|
$ok = phutil_console_confirm(
|
|
"Revision 'D{$rev_id}: {$rev_title}' has not been ".
|
|
"accepted. Continue anyway?");
|
|
if (!$ok) {
|
|
throw new ArcanistUserAbortException();
|
|
}
|
|
}
|
|
|
|
$message = $this->getConduit()->callMethodSynchronous(
|
|
'differential.getcommitmessage',
|
|
array(
|
|
'revision_id' => $rev_id,
|
|
));
|
|
|
|
$this->messageFile = new TempFile();
|
|
Filesystem::writeFile($this->messageFile, $message);
|
|
|
|
echo "Landing revision 'D{$rev_id}: ".
|
|
"{$rev_title}'...\n";
|
|
}
|
|
|
|
private function pullFromRemote() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
$repository_api->execxLocal('checkout %s', $this->onto);
|
|
|
|
echo phutil_console_format(
|
|
"Switched to branch **%s**. Updating branch...\n",
|
|
$this->onto);
|
|
|
|
$local_ahead_of_remote = false;
|
|
if ($this->isGit) {
|
|
$repository_api->execxLocal('pull --ff-only');
|
|
|
|
list($out) = $repository_api->execxLocal(
|
|
'log %s/%s..%s',
|
|
$this->remote,
|
|
$this->onto,
|
|
$this->onto);
|
|
if (strlen(trim($out))) {
|
|
$local_ahead_of_remote = true;
|
|
}
|
|
} else if ($this->isHg) {
|
|
// execManual instead of execx because outgoing returns
|
|
// code 1 when there is nothing outgoing
|
|
list($err, $out) = $repository_api->execManualLocal(
|
|
'outgoing -r %s',
|
|
$this->onto);
|
|
|
|
// $err === 0 means something is outgoing
|
|
if ($err === 0) {
|
|
$local_ahead_of_remote = true;
|
|
}
|
|
else {
|
|
try {
|
|
$repository_api->execxLocal('pull -u');
|
|
} catch (CommandException $ex) {
|
|
$err = $ex->getError();
|
|
$stdout = $ex->getStdOut();
|
|
|
|
// Copied from: PhabricatorRepositoryPullLocalDaemon.php
|
|
// NOTE: Between versions 2.1 and 2.1.1, Mercurial changed the
|
|
// behavior of "hg pull" to return 1 in case of a successful pull
|
|
// with no changes. This behavior has been reverted, but users who
|
|
// updated between Feb 1, 2012 and Mar 1, 2012 will have the
|
|
// erroring version. Do a dumb test against stdout to check for this
|
|
// possibility.
|
|
// See: https://github.com/facebook/phabricator/issues/101/
|
|
|
|
// NOTE: Mercurial has translated versions, which translate this error
|
|
// string. In a translated version, the string will be something else,
|
|
// like "aucun changement trouve". There didn't seem to be an easy way
|
|
// to handle this (there are hard ways but this is not a common
|
|
// problem and only creates log spam, not application failures).
|
|
// Assume English.
|
|
|
|
// TODO: Remove this once we're far enough in the future that
|
|
// deployment of 2.1 is exceedingly rare?
|
|
if ($err == 1 && preg_match('/no changes found/', $stdout)) {
|
|
return;
|
|
} else {
|
|
throw $ex;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if ($local_ahead_of_remote) {
|
|
throw new ArcanistUsageException(
|
|
"Local branch '{$this->onto}' is ahead of remote branch ".
|
|
"'{$this->ontoRemoteBranch}', so landing a feature branch ".
|
|
"would push additional changes. Push or reset the changes ".
|
|
"in '{$this->onto}' before running 'arc land'.");
|
|
}
|
|
}
|
|
|
|
private function rebase() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
chdir($repository_api->getPath());
|
|
if ($this->isGit) {
|
|
$err = phutil_passthru('git rebase %s', $this->onto);
|
|
}
|
|
else if ($this->isHg) {
|
|
// keep branch here so later we can decide whether to remove it
|
|
$err = $repository_api->execPassthru(
|
|
'rebase -d %s --keepbranches',
|
|
$this->onto);
|
|
}
|
|
|
|
if ($err) {
|
|
$command = $repository_api->getSourceControlSystemName();
|
|
throw new ArcanistUsageException(
|
|
"'{$command} rebase {$this->onto}' failed. ".
|
|
"You can abort with '{$command} rebase --abort', ".
|
|
"or resolve conflicts and use '{$command} rebase ".
|
|
"--continue' to continue forward. After resolving the rebase, ".
|
|
"run 'arc land' again.");
|
|
}
|
|
|
|
// Now that we've rebased, the merge-base of origin/master and HEAD may
|
|
// be different. Reparse the relative commit.
|
|
$repository_api->parseRelativeLocalCommit(array($this->ontoRemoteBranch));
|
|
}
|
|
|
|
private function squash() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
$repository_api->execxLocal('checkout %s', $this->onto);
|
|
|
|
if ($this->isGit) {
|
|
$repository_api->execxLocal(
|
|
'merge --squash --ff-only %s',
|
|
$this->branch);
|
|
}
|
|
else if ($this->isHg) {
|
|
$branch_rev_id = $repository_api->getCanonicalRevisionName($this->branch);
|
|
|
|
$repository_api->execxLocal(
|
|
'rebase --collapse --logfile %s -b %s -d %s %s',
|
|
$this->messageFile,
|
|
$this->branch,
|
|
$this->onto,
|
|
$this->keepBranch ? '--keep' : '');
|
|
if ($repository_api->isBookmark($this->branch)) {
|
|
// a bug in mercurial means bookmarks end up on the revision prior
|
|
// to the collapse when using --collapse with --keep,
|
|
// so we manually move them to the correct spots
|
|
// see: http://bz.selenic.com/show_bug.cgi?id=3716
|
|
$repository_api->execxLocal(
|
|
'bookmark -f %s',
|
|
$this->onto);
|
|
|
|
if ($this->keepBranch) {
|
|
$repository_api->execxLocal(
|
|
'bookmark -f %s -r %s',
|
|
$this->branch,
|
|
$branch_rev_id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private function merge() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
// In immutable histories, do a --no-ff merge to force a merge commit with
|
|
// the right message.
|
|
$repository_api->execxLocal('checkout %s', $this->onto);
|
|
|
|
chdir($repository_api->getPath());
|
|
if ($this->isGit) {
|
|
$err = phutil_passthru(
|
|
'git merge --no-ff --no-commit %s',
|
|
$this->branch);
|
|
|
|
if ($err) {
|
|
throw new ArcanistUsageException(
|
|
"'git merge' failed. Your working copy has been left in a partially ".
|
|
"merged state. You can: abort with 'git merge --abort'; or follow ".
|
|
"the instructions to complete the merge.");
|
|
}
|
|
}
|
|
else if ($this->isHg) {
|
|
// HG arc land currently doesn't support --merge.
|
|
// When merging a bookmark branch to a master branch that
|
|
// hasn't changed since the fork, mercurial fails to merge.
|
|
// Instead of only working in some cases, we just disable --merge
|
|
// until there is a demand for it.
|
|
// The user should never reach this line, since --merge is
|
|
// forbidden at the command line argument level.
|
|
throw new ArcanistUsageException(
|
|
"--merge is not currently supported for hg repos.");
|
|
}
|
|
}
|
|
|
|
private function push() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
if ($this->isGit) {
|
|
$repository_api->execxLocal(
|
|
'commit -F %s',
|
|
$this->messageFile);
|
|
}
|
|
else if ($this->isHg) {
|
|
// hg rebase produces a commit earlier as part of rebase
|
|
if (!$this->useSquash) {
|
|
$repository_api->execxLocal(
|
|
'commit --logfile %s',
|
|
$this->messageFile);
|
|
}
|
|
}
|
|
|
|
if ($this->getArgument('hold')) {
|
|
echo phutil_console_format(
|
|
"Holding change in **%s**: it has NOT been pushed yet.\n",
|
|
$this->onto);
|
|
} else {
|
|
echo "Pushing change...\n\n";
|
|
|
|
chdir($repository_api->getPath());
|
|
|
|
if ($this->isGit) {
|
|
$err = phutil_passthru(
|
|
'git push %s %s',
|
|
$this->remote,
|
|
$this->onto);
|
|
}
|
|
else if ($this->isHg) {
|
|
$err = $repository_api->execPassthru(
|
|
'push --new-branch -r %s %s',
|
|
$this->onto,
|
|
$this->remote);
|
|
}
|
|
|
|
if ($err) {
|
|
$repo_command = $repository_api->getSourceControlSystemName();
|
|
throw new ArcanistUsageException("'{$repo_command} push' failed.");
|
|
}
|
|
|
|
$mark_workflow = $this->buildChildWorkflow(
|
|
'close-revision',
|
|
array(
|
|
'--finalize',
|
|
'--quiet',
|
|
$this->revision['id'],
|
|
));
|
|
$mark_workflow->run();
|
|
|
|
echo "\n";
|
|
}
|
|
}
|
|
|
|
private function cleanupBranch() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
echo "Cleaning up feature branch...\n";
|
|
if ($this->isGit) {
|
|
list($ref) = $repository_api->execxLocal(
|
|
'rev-parse --verify %s',
|
|
$this->branch);
|
|
$ref = trim($ref);
|
|
$recovery_command = csprintf(
|
|
'git checkout -b %s %s',
|
|
$this->branch,
|
|
$ref);
|
|
echo "(Use `{$recovery_command}` if you want it back.)\n";
|
|
$repository_api->execxLocal(
|
|
'branch -D %s',
|
|
$this->branch);
|
|
}
|
|
else if ($this->isHg) {
|
|
// named branches were closed as part of the earlier commit
|
|
// so only worry about bookmarks
|
|
if ($repository_api->isBookmark($this->branch)) {
|
|
$repository_api->execxLocal(
|
|
'bookmark -d %s',
|
|
$this->branch);
|
|
}
|
|
}
|
|
|
|
if ($this->getArgument('delete-remote')) {
|
|
if ($this->isGit) {
|
|
list($err, $ref) = $repository_api->execManualLocal(
|
|
'rev-parse --verify %s/%s',
|
|
$this->remote,
|
|
$this->branch);
|
|
|
|
if ($err) {
|
|
echo "No remote feature branch to clean up.\n";
|
|
} else {
|
|
|
|
// NOTE: In Git, you delete a remote branch by pushing it with a
|
|
// colon in front of its name:
|
|
//
|
|
// git push <remote> :<branch>
|
|
|
|
echo "Cleaning up remote feature branch...\n";
|
|
$repository_api->execxLocal(
|
|
'push %s :%s',
|
|
$this->remote,
|
|
$this->branch);
|
|
}
|
|
}
|
|
else if ($this->isHg) {
|
|
// named branches were closed as part of the earlier commit
|
|
// so only worry about bookmarks
|
|
if ($repository_api->isBookmark($this->branch)) {
|
|
$repository_api->execxLocal(
|
|
'push -B %s %s',
|
|
$this->branch,
|
|
$this->remote);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
protected function getSupportedRevisionControlSystems() {
|
|
return array('git', 'hg');
|
|
}
|
|
|
|
private function getBranchOrBookmark() {
|
|
$repository_api = $this->getRepositoryAPI();
|
|
if ($this->isGit) {
|
|
$branch = $repository_api->getBranchName();
|
|
}
|
|
else if ($this->isHg) {
|
|
$branch = $repository_api->getActiveBookmark();
|
|
if (!$branch) {
|
|
$branch = $repository_api->getBranchName();
|
|
}
|
|
}
|
|
|
|
return $branch;
|
|
}
|
|
}
|