From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 21 Jan 2009 22:56:52 +0000 (-0700)
Subject: Add HEAD to list of branches; fix error.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f080cdecef19d166a8411ebbd2ac7e69f75492cf;p=horde.git

Add HEAD to list of branches; fix error.
---

diff --git a/framework/Vcs/lib/Horde/Vcs/Cvs.php b/framework/Vcs/lib/Horde/Vcs/Cvs.php
index 9b05cf363..6ed767a44 100644
--- a/framework/Vcs/lib/Horde/Vcs/Cvs.php
+++ b/framework/Vcs/lib/Horde/Vcs/Cvs.php
@@ -564,6 +564,7 @@ class Horde_Vcs_File_Cvs extends Horde_Vcs_File
             case 'init':
                 if (!strncmp('head: ', $line, 6)) {
                     $this->head = substr($line, 6);
+                    $this->branches[$this->head] = 'HEAD';
                 } elseif (!strncmp('branch:', $line, 7)) {
                     $state = 'rev';
                 }
@@ -596,9 +597,9 @@ class Horde_Vcs_File_Cvs extends Horde_Vcs_File
                     strcmp('----------------------------', $line)) {
                     $accum[] = $line;
                 } elseif (count($accum)) {
-                    // spawn a new Horde_Vcs_Log object and add it to the logs
-                    // hash
-                    $log = new Horde_Vcs_Log_Cvs($this);
+                    // Spawn a new Horde_Vcs_Log object and add it to the logs
+                    // hash.
+                    $log = new Horde_Vcs_Log_Cvs($this->rep, $this->filename);
                     $err = $log->processLog($accum);
                     // TODO: error checks - avsm
                     $this->logs[$log->queryRevision()] = $log;