[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    [PATCH] comment for cvs import
From:       Christian Loose <christian.loose () hamburg ! de>
Date:       2002-04-17 17:27:15
[Download RAW message or body]

Hello,

This patch allows to specify a comment for a 'cvs import' in the
import dialog.

Please commit when correct, because I don't have a cvs
account.

Bye

Christian




["cervisia.patch" (text/x-diff)]

Index: cervisiapart.cpp
===================================================================
RCS file: /home/kdecvs/kde/kdesdk/cervisia/cervisiapart.cpp,v
retrieving revision 1.18
diff -u -r1.18 cervisiapart.cpp
--- cervisiapart.cpp	17 Apr 2002 09:40:22 -0000	1.18
+++ cervisiapart.cpp	17 Apr 2002 17:14:37 -0000
@@ -1221,8 +1221,9 @@
                 cmdline += " -I ";
                 cmdline += KShellProcess::quote(ignore);
             }
+            QString comment = l->comment().stripWhiteSpace();
             cmdline += " -m ";
-            cmdline += (QString("\"") + "" + "\" "); // log message?
+            cmdline += (QString("\"") + comment + "\" "); 
             cmdline += l->module();
             cmdline += " ";
             cmdline += l->vendorTag();
Index: checkoutdlg.cpp
===================================================================
RCS file: /home/kdecvs/kde/kdesdk/cervisia/checkoutdlg.cpp,v
retrieving revision 1.7
diff -u -r1.7 checkoutdlg.cpp
--- checkoutdlg.cpp	17 Apr 2002 09:40:22 -0000	1.7
+++ checkoutdlg.cpp	17 Apr 2002 17:14:37 -0000
@@ -45,11 +45,11 @@
 
     QBoxLayout *layout = new QVBoxLayout(this, 10);
 
-    QGridLayout *grid = new QGridLayout((action==Checkout)? 4 : 8, 2, 10);
+    QGridLayout *grid = new QGridLayout((action==Checkout)? 4 : 9, 2, 10);
     layout->addLayout(grid);
     grid->setColStretch(0, 1);
     grid->setColStretch(1, 20);
-    for (int i = 0; i < ((action==Checkout)? 4 : 8); ++i)
+    for (int i = 0; i < ((action==Checkout)? 4 : 9); ++i)
         grid->setRowStretch(i, 0);
 
     repo_combo = new QComboBox(true, this);
@@ -154,10 +154,19 @@
                   (ignore_edit, i18n("&Ignore files:"), this);
               ignore_label->setFixedSize(ignore_label->sizeHint());
               grid->addWidget(ignore_label, resume_row + 3, 0, AlignLeft | AlignVCenter);
+
+              comment_edit = new QLineEdit(this);
+              comment_edit->setMinimumSize(comment_edit->sizeHint());
+              grid->addWidget(comment_edit, resume_row + 4, 1);
+
+              QLabel *comment_label = new QLabel
+                  (comment_edit, i18n("&Comment:"), this);
+              comment_label->setFixedSize(comment_label->sizeHint());
+              grid->addWidget(comment_label, resume_row + 4, 0, AlignLeft | AlignVCenter);
   
               binary_box = new QCheckBox(i18n("Import as &binaries"), this);
               binary_box->setMinimumSize(binary_box->sizeHint());
-              grid->addMultiCellWidget(binary_box, resume_row + 4, 6, 0, 1);
+              grid->addMultiCellWidget(binary_box, resume_row + 5, 7, 0, 1);
               
           }
 
Index: checkoutdlg.h
===================================================================
RCS file: /home/kdecvs/kde/kdesdk/cervisia/checkoutdlg.h,v
retrieving revision 1.2
diff -u -r1.2 checkoutdlg.h
--- checkoutdlg.h	17 Apr 2002 09:40:22 -0000	1.2
+++ checkoutdlg.h	17 Apr 2002 17:14:37 -0000
@@ -44,6 +44,8 @@
         { return releasetag_edit->text(); }
     QString ignoreFiles() const
         { return ignore_edit->text(); }
+    QString comment() const
+        { return comment_edit->text(); }
     bool importBinary() const
         { return binary_box->isChecked(); }
 
@@ -73,6 +75,7 @@
     QComboBox *repo_combo, *module_combo;
     QLineEdit *module_edit, *workdir_edit;
     QLineEdit *branch_edit;
+    QLineEdit *comment_edit;
     QLineEdit *vendortag_edit, *releasetag_edit, *ignore_edit;
     QCheckBox *binary_box;
     QPushButton *ok_button, *cancel_button;

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread]