From 63a3edb29f9fd23be3f5a3285dbcfde11a0c459b Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 27 Mar 2011 00:39:29 -0700 Subject: [PATCH] Make SVN commit parsers actually parse commits again. --- .../base/PhabricatorRepositoryCommitParserWorker.php | 10 +++++++--- ...habricatorRepositorySvnCommitChangeParserWorker.php | 2 +- ...abricatorRepositorySvnCommitMessageParserWorker.php | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php b/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php index fc23edac0f..87ce4a69d1 100644 --- a/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php +++ b/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php @@ -54,11 +54,15 @@ abstract class PhabricatorRepositoryCommitParserWorker * This method is kind of awkward here but both the SVN message and * change parsers use it. */ - protected function getSVNLogXMLObject($uri, $revision) { + protected function getSVNLogXMLObject($uri, $revision, $verbose = false) { + + if ($verbose) { + $verbose = '--verbose'; + } try { list($xml) = execx( - 'svn log --xml --limit 1 --non-interactive %s@%d', + "svn log --xml {$verbose} --limit 1 --non-interactive %s@%d", $uri, $revision); } catch (CommandException $ex) { @@ -72,7 +76,7 @@ abstract class PhabricatorRepositoryCommitParserWorker } $fallback_uri->setProtocol('svn+ssh'); list($xml) = execx( - 'svn log --xml --limit 1 --non-interactive %s@%d', + "svn log --xml {$verbose} --limit 1 --non-interactive %s@%d", $fallback_uri, $revision); } diff --git a/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php index fcbbf5b67c..3982a7b94b 100644 --- a/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php +++ b/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php @@ -54,7 +54,7 @@ class PhabricatorRepositorySvnCommitChangeParserWorker // Pull the top-level path changes out of "svn log". This is pretty // straightforward; just parse the XML log. - $log = $this->getSVNLogXMLObject($uri, $svn_commit); + $log = $this->getSVNLogXMLObject($uri, $svn_commit, $verbose = true); $entry = $log->logentry[0]; diff --git a/src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php index a92697d902..75da4e66ed 100644 --- a/src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php +++ b/src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php @@ -25,7 +25,10 @@ class PhabricatorRepositorySvnCommitMessageParserWorker $uri = $repository->getDetail('remote-uri'); - $log = $this->getSVNLogXMLObject($uri, $commit->getCommitIdentifier()); + $log = $this->getSVNLogXMLObject( + $uri, + $commit->getCommitIdentifier(), + $verbose = false); $entry = $log->logentry[0];