Page MenuHomePhorge
Differential D25027 Diff 322 src/workflow/ArcanistPatchWorkflow.php

Changeset View

Standalone View

View Options

src/workflow/ArcanistPatchWorkflow.php

Show First 20 Lines • Show All 211 Lines • ▼ Show 20 Lines private function getBranchName(ArcanistBundle $bundle) {
$branch_name = null; $branch_name = null;
$repository_api = $this->getRepositoryAPI(); $repository_api = $this->getRepositoryAPI();
$revision_id = $bundle->getRevisionID(); $revision_id = $bundle->getRevisionID();
$base_name = 'arcpatch'; $base_name = 'arcpatch';
if ($revision_id) { if ($revision_id) {
$base_name .= "-D{$revision_id}"; $base_name .= "-D{$revision_id}";
} }
$suffixes = array(null, '_1', '_2', '_3'); $proposed_suffix = null;
foreach ($suffixes as $suffix) { while (!$branch_name) {
speckUnsubmitted
Not Done
Inline Actions

I think the linter would've requested there to be a space between while and open paren

speck: I think the linter would've requested there to be a space between `while` and open paren
$proposed_name = $base_name.$suffix; $proposed_name = "{$base_name}_{$proposed_suffix}";
0Unsubmitted
Not Done
Inline Actions

Will this result in "{$base_name}_" rather than "{$base_name}" as the first proposed branch name?

0: Will this result in `"{$base_name}_"` rather than `"{$base_name}"` as the first proposed branch…
speckUnsubmitted
Not Done
Inline Actions

Yea I think this would result in the first non-collision attempt always being suffixed with underscore. The naive approach here would be

if ($proposed_suffix == null) {
  $proposed_name = $base_name;
} else {
  $proposed_name = "{$base_name}_{$proposed_suffix}";
}
speck: Yea I think this would result in the first non-collision attempt always being suffixed with…
list($err) = $repository_api->execManualLocal( list($err) = $repository_api->execManualLocal(
'rev-parse --verify %s', 'rev-parse --verify %s',
$proposed_name); $proposed_name);
// no error means git rev-parse found a branch // no error means git rev-parse found a branch
if (!$err) { if (!$err) {
echo phutil_console_format( echo phutil_console_format(
"%s\n", "%s\n",
pht( pht(
'Branch name %s already exists; trying a new name.', 'Branch name %s already exists; trying a new name.',
$proposed_name)); $proposed_name));
$proposed_suffix = $proposed_suffix + 1;
0Unsubmitted
Not Done
Inline Actions

This can be just $proposed_suffix++.

0: This can be just `$proposed_suffix++`.
continue; continue;
} else { } else {
$branch_name = $proposed_name; $branch_name = $proposed_name;
break; break;
} }
} }
if (!$branch_name) { if (!$branch_name) {
▲ Show 20 Lines • Show All 904 Lines • Show Last 20 Lines
Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0