Page MenuHomePhabricator
Files F15387930

D20254.id48346.diff
No OneTemporary
Actions

D20254.id48346.diff
View Options

diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
--- a/src/workflow/ArcanistPatchWorkflow.php
+++ b/src/workflow/ArcanistPatchWorkflow.php
@@ -741,21 +741,26 @@
$repository_api->execPassthru('submodule update --init --recursive');
if ($this->shouldCommit()) {
+ $flags = array();
if ($bundle->getFullAuthor()) {
- $author_cmd = csprintf('--author=%s', $bundle->getFullAuthor());
- } else {
- $author_cmd = '';
+ $flags[] = csprintf('--author=%s', $bundle->getFullAuthor());
}
$commit_message = $this->getCommitMessage($bundle);
+
$future = $repository_api->execFutureLocal(
- 'commit -a %C -F - --no-verify',
- $author_cmd);
+ 'commit -a %Ls -F - --no-verify',
+ $flags);
$future->write($commit_message);
$future->resolvex();
- $verb = pht('committed');
+
+ $this->writeOkay(
+ pht('COMMITTED'),
+ pht('Successfully committed patch.'));
} else {
- $verb = pht('applied');
+ $this->writeOkay(
+ pht('APPLIED'),
+ pht('Successfully applied patch.'));
}
if ($this->canBranch() &&
@@ -765,18 +770,18 @@
// See PHI1083 and PHI648. Synchronize submodule state after mutating
// the working copy.
- $repository_api->execxLocal('checkout %s', $original_branch);
+ $repository_api->execxLocal('checkout %s --', $original_branch);
$repository_api->execPassthru('submodule update --init --recursive');
$ex = null;
try {
- $repository_api->execxLocal('cherry-pick %s', $new_branch);
+ $repository_api->execxLocal('cherry-pick -- %s', $new_branch);
$repository_api->execPassthru('submodule update --init --recursive');
} catch (Exception $ex) {
// do nothing
}
- $repository_api->execxLocal('branch -D %s', $new_branch);
+ $repository_api->execxLocal('branch -D -- %s', $new_branch);
if ($ex) {
echo phutil_console_format(
@@ -786,10 +791,6 @@
}
}
- echo phutil_console_format(
- "<bg:green>** %s **</bg> %s\n",
- pht('OKAY'),
- pht('Successfully %s patch.', $verb));
} else if ($repository_api instanceof ArcanistMercurialAPI) {
$future = $repository_api->execFutureLocal('import --no-commit -');
$future->write($bundle->toGitPatch());

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 3:06 AM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705395
Default Alt Text
D20254.id48346.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility