mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 14:52:40 +01:00
Merge branch 'master' of github.com:facebook/arcanist
This commit is contained in:
commit
b891519d3d
2 changed files with 5 additions and 3 deletions
|
@ -79,6 +79,8 @@ class ArcanistXHPASTLinter extends ArcanistLinter {
|
||||||
public function getLintSeverityMap() {
|
public function getLintSeverityMap() {
|
||||||
return array(
|
return array(
|
||||||
self::LINT_TODO_COMMENT => ArcanistLintSeverity::SEVERITY_ADVICE,
|
self::LINT_TODO_COMMENT => ArcanistLintSeverity::SEVERITY_ADVICE,
|
||||||
|
self::LINT_UNABLE_TO_PARSE
|
||||||
|
=> ArcanistLintSeverity::SEVERITY_WARNING,
|
||||||
self::LINT_FORMATTING_CONVENTIONS
|
self::LINT_FORMATTING_CONVENTIONS
|
||||||
=> ArcanistLintSeverity::SEVERITY_WARNING,
|
=> ArcanistLintSeverity::SEVERITY_WARNING,
|
||||||
self::LINT_NAMING_CONVENTIONS
|
self::LINT_NAMING_CONVENTIONS
|
||||||
|
|
|
@ -119,11 +119,11 @@ class ArcanistGitAPI extends ArcanistRepositoryAPI {
|
||||||
$relative = $this->getRelativeCommit();
|
$relative = $this->getRelativeCommit();
|
||||||
if ($relative == self::GIT_MAGIC_ROOT_COMMIT) {
|
if ($relative == self::GIT_MAGIC_ROOT_COMMIT) {
|
||||||
list($stdout) = execx(
|
list($stdout) = execx(
|
||||||
'(cd %s; git log HEAD)',
|
'(cd %s; git log --format=medium HEAD)',
|
||||||
$this->getPath());
|
$this->getPath());
|
||||||
} else {
|
} else {
|
||||||
list($stdout) = execx(
|
list($stdout) = execx(
|
||||||
'(cd %s; git log %s..HEAD)',
|
'(cd %s; git log --format=medium %s..HEAD)',
|
||||||
$this->getPath(),
|
$this->getPath(),
|
||||||
$this->getRelativeCommit());
|
$this->getRelativeCommit());
|
||||||
}
|
}
|
||||||
|
@ -132,7 +132,7 @@ class ArcanistGitAPI extends ArcanistRepositoryAPI {
|
||||||
|
|
||||||
public function getGitHistoryLog() {
|
public function getGitHistoryLog() {
|
||||||
list($stdout) = execx(
|
list($stdout) = execx(
|
||||||
'(cd %s; git log -n%d %s)',
|
'(cd %s; git log --format=medium -n%d %s)',
|
||||||
$this->getPath(),
|
$this->getPath(),
|
||||||
self::SEARCH_LENGTH_FOR_PARENT_REVISIONS,
|
self::SEARCH_LENGTH_FOR_PARENT_REVISIONS,
|
||||||
$this->getRelativeCommit());
|
$this->getRelativeCommit());
|
||||||
|
|
Loading…
Reference in a new issue