Permalink
Browse files

Added missing space between words in messages.

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
  • Loading branch information...
1 parent 270f240 commit 3401b2a5d227e0c48a6389adbb9b2ae9b99ba490 @majak majak committed with epriestley May 3, 2013
Showing with 5 additions and 5 deletions.
  1. +1 −1 src/repository/api/ArcanistMercurialAPI.php
  2. +4 −4 src/workflow/ArcanistLandWorkflow.php
@@ -760,7 +760,7 @@ public function resolveBaseCommitRule($rule, $source) {
if (!$err) {
$this->setBaseCommitExplanation(
"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.");
return trim($merge_base);
}
@@ -123,7 +123,7 @@ public function getArguments() {
'update-with-rebase' => array(
'help' => 'When updating the feature branch, use rebase instead of '.
'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.',
'conflicts' => array(
'merge' => 'The --merge strategy does not update the feature branch.',
@@ -292,9 +292,9 @@ private function validate() {
if ($this->onto == $this->branch) {
$message =
- "You can not land a {$this->branchType} onto itself -- you are trying".
- "to land '{$this->branch}' onto '{$this->onto}'. For more".
- "information on how to push changes, see 'Pushing and Closing".
+ "You can not land a {$this->branchType} 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.";

0 comments on commit 3401b2a

Please sign in to comment.