From 592c2ff9ffc379b2fe7c1bd1e72335fb35fd58f0 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Thu, 2 Jun 2011 01:21:32 +0200 Subject: [PATCH] Several f'ups in hg's parseLog() method --- src/IDF/Scm/Mercurial.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/IDF/Scm/Mercurial.php b/src/IDF/Scm/Mercurial.php index 5b80c3c..8c0b34d 100644 --- a/src/IDF/Scm/Mercurial.php +++ b/src/IDF/Scm/Mercurial.php @@ -531,7 +531,8 @@ class IDF_Scm_Mercurial extends IDF_Scm if ($line == "\0") { $headers_processed = false; if (count($c) > 0) { - $c['full_message'] = trim($c['full_message']); + if (array_key_exists('full_message', $c)) + $c['full_message'] = trim($c['full_message']); $res[] = (object) $c; } continue; @@ -547,10 +548,8 @@ class IDF_Scm_Mercurial extends IDF_Scm $c['commit'] = $match[2]; $c['tree'] = $c['commit']; $c['full_message'] = ''; - } elseif ($match[1] == 'user') { + } elseif ($match[1] == 'author') { $c['author'] = $match[2]; - } elseif ($match[1] == 'summary') { - $c['title'] = $match[2]; } elseif ($match[1] == 'branch') { $c['branch'] = empty($match[2]) ? 'default' : $match[2]; } elseif ($match[1] == 'parents') {