mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-12-23 14:00:55 +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() {
|
||||
return array(
|
||||
self::LINT_TODO_COMMENT => ArcanistLintSeverity::SEVERITY_ADVICE,
|
||||
self::LINT_UNABLE_TO_PARSE
|
||||
=> ArcanistLintSeverity::SEVERITY_WARNING,
|
||||
self::LINT_FORMATTING_CONVENTIONS
|
||||
=> ArcanistLintSeverity::SEVERITY_WARNING,
|
||||
self::LINT_NAMING_CONVENTIONS
|
||||
|
|
|
@ -119,11 +119,11 @@ class ArcanistGitAPI extends ArcanistRepositoryAPI {
|
|||
$relative = $this->getRelativeCommit();
|
||||
if ($relative == self::GIT_MAGIC_ROOT_COMMIT) {
|
||||
list($stdout) = execx(
|
||||
'(cd %s; git log HEAD)',
|
||||
'(cd %s; git log --format=medium HEAD)',
|
||||
$this->getPath());
|
||||
} else {
|
||||
list($stdout) = execx(
|
||||
'(cd %s; git log %s..HEAD)',
|
||||
'(cd %s; git log --format=medium %s..HEAD)',
|
||||
$this->getPath(),
|
||||
$this->getRelativeCommit());
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ class ArcanistGitAPI extends ArcanistRepositoryAPI {
|
|||
|
||||
public function getGitHistoryLog() {
|
||||
list($stdout) = execx(
|
||||
'(cd %s; git log -n%d %s)',
|
||||
'(cd %s; git log --format=medium -n%d %s)',
|
||||
$this->getPath(),
|
||||
self::SEARCH_LENGTH_FOR_PARENT_REVISIONS,
|
||||
$this->getRelativeCommit());
|
||||
|
|
Loading…
Reference in a new issue