revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-10 00:42:40 +01:00
Code Issues Releases Wiki Activity

Updated arc land workflow to use temp file approach for messages to avoid newline escaping issue in windows.

Browse source 
Test Plan: Ran arc land locally with both the mutable default option and with the --merge flag to ensure that messages are set properly.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2372
This commit is contained in:
Marke Hallowell 2012-05-02 16:48:44 -07:00 committed by epriestley
parent 52e08cc6c5
commit 4645204c11
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/workflow/land/ArcanistLandWorkflow.php
View file

@ -262,8 +262,7 @@ EOTEXT
// the right message.
chdir($repository_api->getPath());
$err = phutil_passthru(
'git merge --no-ff -m %s %s',
$message,
'git merge --no-ff --no-commit %s',
$branch);
if ($err) {
throw new ArcanistUsageException(
@ -276,11 +275,14 @@ EOTEXT
$repository_api->execxLocal(
'merge --squash --ff-only %s',
$branch);
$repository_api->execxLocal(
'commit -m %s',
$message);
}
$tmp_file = new TempFile();
Filesystem::writeFile($tmp_file, $message);
$repository_api->execxLocal(
'commit -F %s',
$tmp_file);
if ($this->getArgument('hold')) {
echo phutil_console_format(
"Holding change in **%s**: it has NOT been pushed yet.\n",

2
src/workflow/land/__init__.php
View file

@ -12,6 +12,8 @@ phutil_require_module('arcanist', 'exception/usage/userabort');
phutil_require_module('arcanist', 'workflow/base');
phutil_require_module('phutil', 'console');
phutil_require_module('phutil', 'filesystem');
phutil_require_module('phutil', 'filesystem/tempfile');
phutil_require_module('phutil', 'future/exec');
phutil_require_module('phutil', 'utils');
phutil_require_module('phutil', 'xsprintf/csprintf');