revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-23 14:00:55 +01:00
Code Issues Releases Wiki Activity

Added missing space between words in messages.

Browse source 
Summary:
During my attept to `arc land master` on `master` branch
I have discovered that error message is missing few spaces between words.

I have added them and used this ugly readonly command:

  pcregrep --include="\.php$" -M -r '(?<!\\n| )("|'"'"')\.\n\s*\1(?!\\n| )' ~/arc/arcanist/src

to detect other instances of this serious bug.

Two more were found.
This time they were probably introduced in order to abide
to the draconian lint rule about number of columns.

Since I want to be a good citizen,
I have added this missing space to the begining of the next line in both cases.
It is an ugly hack, but I think user should not suffer due to missing spaces.

Another solution could be preserving no leading spaces and splitting long lines.
Or just providing excuse to lint.

Test Plan: Ran `arc land master` on `master` branch.

Reviewers: epriestley, vrana

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T3008

Differential Revision: https://secure.phabricator.com/D5827
This commit is contained in:
Martin Kralik 2013-05-03 16:12:16 -07:00 committed by epriestley
parent 270f2402de
commit 3401b2a5d2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/repository/api/ArcanistMercurialAPI.php
View file

@ -760,7 +760,7 @@ final class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
if (!$err) { if (!$err) {
$this->setBaseCommitExplanation( $this->setBaseCommitExplanation(
"it is the greatest common ancestor of '{$matches[1]}' and ., as". "it is the greatest common ancestor of '{$matches[1]}' and ., as".
"specified by '{$rule}' in your {$source} 'base' ". " specified by '{$rule}' in your {$source} 'base' ".
"configuration."); "configuration.");
return trim($merge_base); return trim($merge_base);
} }

8
src/workflow/ArcanistLandWorkflow.php
View file

@ -123,7 +123,7 @@ EOTEXT
'update-with-rebase' => array( 'update-with-rebase' => array(
'help' => 'When updating the feature branch, use rebase instead of '. 'help' => 'When updating the feature branch, use rebase instead of '.
'merge. This might make things work better in some cases.'. 'merge. This might make things work better in some cases.'.
'Set arc.land.update.default to \'rebase\' to make this '. ' Set arc.land.update.default to \'rebase\' to make this '.
'default.', 'default.',
'conflicts' => array( 'conflicts' => array(
'merge' => 'The --merge strategy does not update the feature branch.', 'merge' => 'The --merge strategy does not update the feature branch.',
@ -292,9 +292,9 @@ EOTEXT
if ($this->onto == $this->branch) { if ($this->onto == $this->branch) {
$message = $message =
"You can not land a {$this->branchType} onto itself -- you are trying". "You can not land a {$this->branchType} onto itself -- you are trying ".
"to land '{$this->branch}' onto '{$this->onto}'. For more". "to land '{$this->branch}' onto '{$this->onto}'. For more ".
"information on how to push changes, see 'Pushing and Closing". "information on how to push changes, see 'Pushing and Closing ".
"Revisions' in 'Arcanist User Guide: arc diff' in the documentation."; "Revisions' in 'Arcanist User Guide: arc diff' in the documentation.";
if (!$this->isHistoryImmutable()) { if (!$this->isHistoryImmutable()) {
$message .= " You may be able to 'arc amend' instead."; $message .= " You may be able to 'arc amend' instead.";