? cvslog_namespace_74.patch
Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.172.2.2
diff -u -p -r1.172.2.2 cvs.module
--- cvs.module	5 Mar 2008 00:39:19 -0000	1.172.2.2
+++ cvs.module	11 Aug 2008 14:57:51 -0000
@@ -1,6 +1,6 @@
 <?php
 // $Id: cvs.module,v 1.172.2.2 2008/03/05 00:39:19 thehunmonkgroup Exp $
-// $Name:  $
+// $Name: DRUPAL-5 $
 
 /**
  * @file
@@ -468,8 +468,8 @@ function cvs_nodeapi(&$node, $op, $arg =
       case 'load':
         $result = db_query('SELECT * FROM {cvs_projects} WHERE nid = %d', $node->nid);
         if ($project = db_fetch_object($result)) {
-          $node->cvs_repository = $project->rid;
-          $node->cvs_directory = $project->directory;
+          $node->cvs['cvs_repository'] = $project->rid;
+          $node->cvs['cvs_directory'] = $project->directory;
         }
         break;
       case 'insert':
@@ -486,7 +486,7 @@ function cvs_nodeapi(&$node, $op, $arg =
           if (!empty($node->cvs_repository) && !db_num_rows(db_query('SELECT * FROM {cvs_repositories} WHERE rid=%d', $node->cvs_repository))) {
             form_set_error('cvs_repository', t('You must select a valid CVS repository.'));
           }
-          if (!$admin && $project && $node->cvs_repository != $project->cvs_repository) {
+          if (!$admin && $project && $node->cvs_repository != $project->cvs['cvs_repository']) {
             form_set_error('cvs_repository', t('You do not have permission to modify the CVS repository for this project.'));
           }
           if (empty($node->cvs_repository)) {
@@ -725,7 +725,7 @@ function cvs_alter_project_project_form(
     '#title' => t('CVS integration'),
     '#collapsible' => TRUE,
   );
-  $default_repo = isset($node->cvs_repository) ? $node->cvs_repository : variable_get('cvs_default_repo', 0);
+  $default_repo = isset($node->cvs['cvs_repository']) ? $node->cvs['cvs_repository'] : variable_get('cvs_default_repo', 0);
   if (count($repositories) > 1) {
     $form['cvs_nodeapi']['cvs_repository'] = array(
       '#type' => 'select',
@@ -738,12 +738,12 @@ function cvs_alter_project_project_form(
   $form['cvs_nodeapi']['cvs_directory'] = array(
     '#type' => 'textfield',
     '#title' => t('CVS directory'),
-    '#default_value' => $node->cvs_directory,
+    '#default_value' => $node->cvs['cvs_directory'],
     '#size' => 40,
     '#maxlength' => 255,
     '#description' => t("Specify the project's directory within the selected CVS repository. Directory names should start with a leading slash and end with a trailing slash, and must be unique for each project. For example: <code>/modules/foo/</code>, <code>/themes/foo/</code> or <code>/translations/foo/</code>. If there is no CVS repository associated with the project, this setting should be left blank."),
   );
-  if ($default_repo == 0 || $node->cvs_directory) {
+  if ($default_repo == 0 || $node->cvs['cvs_directory']) {
     // If the default for the repository selector is <none> (either
     // because the project has already been saved with 0 for the
     // repository, or because that's the site-wide default), or if we
@@ -1047,8 +1047,8 @@ function cvs_alter_project_release_form_
   // node, see if another tag exists which has the same version info
   // but isn't associated with a release.
   if (user_access('administer projects') || ($release->tag == 'HEAD')) {
-    $project = node_load($release->pid);
-    $args[] = $release->pid;
+    $project = node_load($release->project_release['pid']);
+    $args[] = $release->project_release['pid'];
     $head_where = '';
     if (!user_access('administer projects')) {
       // A non-admin editing a HEAD node. Search for another tag (if
@@ -1068,7 +1068,7 @@ function cvs_alter_project_release_form_
   if (!empty($tags)) {
     $form['rel_id']['tag'] = array(
       '#type' => 'select',
-      '#title' => $release->rebuild ? t('CVS branch') : t('CVS tag'),
+      '#title' => $release->project_release['rebuild'] ? t('CVS branch') : t('CVS tag'),
       '#options' => $tags,
       '#required' => TRUE,
     );