From kde-commits  Tue Dec 07 23:17:59 2004
From: Christian Loose <christian.loose () hamburg ! de>
Date: Tue, 07 Dec 2004 23:17:59 +0000
To: kde-commits
Subject: kdesdk/cervisia
Message-Id: <20041207231759.B5B301BAE5 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110246149121362

CVS commit by cloose: 

last part of fix for BR #90346:

- New kconf_update script to change repository list in cervisiapartrc.
- Activate kconf_update scripts.
- Use the new method in the "Configure Access to Repositories" dialog
  to normalize the user-entered CVSROOT specification.

BUG: 90346


  A            cervisia-change_repos_list.pl   1.1
  M +7 -0      ChangeLog   1.146
  M +1 -1      Makefile.am   1.65
  M +9 -0      cervisia.upd   1.16
  M +15 -2     repositorydlg.cpp   1.33


--- kdesdk/cervisia/cervisia.upd  #1.15:1.16
@@ -82,2 +82,11 @@
 RemoveKey=CVSPath
 RemoveKey=Compression
+#
+Id=kde3.4/20041112
+File=cvsservicerc
+Script=cervisia-normalize_cvsroot.pl,perl
+#
+Id=kde3.4/20041207
+File=cervisiapartrc
+Group=Repositories
+Script=cervisia-change_repos_list.pl,perl

--- kdesdk/cervisia/Makefile.am  #1.64:1.65
@@ -52,5 +52,5 @@
 
 update_DATA = cervisia.upd
-update_SCRIPTS = move_repositories.pl change_colors.pl cervisia-normalize_cvsroot.pl
+update_SCRIPTS = move_repositories.pl change_colors.pl cervisia-normalize_cvsroot.pl cervisia-change_repos_list.pl
 updatedir = $(kde_datadir)/kconf_update
 

--- kdesdk/cervisia/repositorydlg.cpp  #1.32:1.33
@@ -23,7 +23,9 @@
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kdebug.h>
 
 #include "addrepositorydlg.h"
 #include "cvsservice_stub.h"
+#include "misc.h"
 #include "progressdlg.h"
 #include "repositories.h"
@@ -76,4 +78,5 @@ RepositoryListItem::RepositoryListItem(K
     , m_isLoggedIn(loggedin)
 {
+    kdDebug() << "RepositoryListItem::RepositoryListItem(): repo=" << repo << endl;
     setText(0, repo);
     
@@ -260,4 +263,8 @@ void RepositoryDialog::readConfigFile()
         m_serviceConfig->setGroup(QString::fromLatin1("Repository-") +
                                   ritem->repository());
+
+        kdDebug() << "(1) RepositoryDialog::readConfigFile(): repository = "
+                  << ritem->repository() << endl;
+
         QString rsh       = m_serviceConfig->readEntry("rsh", QString());
         QString server    = m_serviceConfig->readEntry("cvs_server", QString());
@@ -307,5 +314,5 @@ void RepositoryDialog::slotAddClicked()
     if( dlg.exec() )
     {
-        QString repo      = dlg.repository();
+        QString repo      = Cervisia::NormalizeRepository(dlg.repository());
         QString rsh       = dlg.rsh();
         QString server    = dlg.server();
@@ -393,4 +400,7 @@ void RepositoryDialog::slotLoginClicked(
         return;
 
+    kdDebug() << "RepositoryDialog::slotLoginClicked(): repo="
+              << item->repository() << endl;
+
     DCOPRef job = m_cvsService->login(item->repository());
     if( !m_cvsService->ok() )
@@ -467,4 +477,7 @@ void RepositoryDialog::writeRepositoryDa
                               item->repository());
     
+    kdDebug() << "(1) RepositoryDialog::writeRepositoryData(): repository = "
+              << item->repository() << endl;
+
     m_serviceConfig->writeEntry("rsh", item->rsh());
     m_serviceConfig->writeEntry("cvs_server", item->server());

--- kdesdk/cervisia/ChangeLog  #1.145:1.146
@@ -1,2 +1,9 @@
+2004-12-08  Christian Loose  <christian.loose@kdemail.net>
+
+        * Fix BR  #90346:
+          Normalize user-entered CVSROOT specification before adding
+          a new group to the cvsservicerc configuration file. This
+          prevents duplicate entries in the repository list.
+
 2004-11-30  Christian Loose  <christian.loose@kdemail.net>