Mercurial Mercurial > hg > stx-libscm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes
authorvranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
Thu, 15 Nov 2012 19:18:29 +0000
changeset 60 cdffb053cc0f
parent 59 b8722ad42c3b
child 61 fd129d0c603e
Fixes
common/SCMAbstractCommitDialog.st file | annotate | diff | comparison | revisions
common/SCMAbstractCommitTask.st file | annotate | diff | comparison | revisions
common/common.rc file | annotate | diff | comparison | revisions 
--- a/common/SCMAbstractCommitDialog.st	Thu Nov 15 16:41:36 2012 +0000
+++ b/common/SCMAbstractCommitDialog.st	Thu Nov 15 19:18:29 2012 +0000
@@ -542,9 +542,9 @@
 !
 
 doBrowseWorkingCopy
-    self workingCopy browse
+    self task package root browse
 
-    "Modified: / 04-02-2012 / 17:15:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 17:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doShowDiffsForEntry
--- a/common/SCMAbstractCommitTask.st	Thu Nov 15 16:41:36 2012 +0000
+++ b/common/SCMAbstractCommitTask.st	Thu Nov 15 19:18:29 2012 +0000
@@ -146,8 +146,10 @@
                 containers := paths
             ]
         ].
-        ActivityNotification notify:'Commiting ' , commitLabel.
-        self doCommit: msg files: containers.
+        containers notEmptyOrNil ifTrue: [ 
+            ActivityNotification notify:'Commiting ' , commitLabel.
+            self doCommit: msg files: containers.
+        ].
         ActivityNotification notify:'Shrinking changes'.
         self doShrinkChanges.
     ].
@@ -156,26 +158,24 @@
     "Created: / 11-04-2008 / 09:20:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 19-08-2009 / 12:27:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 14-03-2012 / 17:42:25 / jv"
-    "Modified: / 15-11-2012 / 09:44:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 16:53:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doCommit: msg files: containers
     "Actually commit the changes, To be overridden by subclasses"
 
-    containers isEmptyOrNil ifTrue: [ ^ self ].
-
-"/    self synchronized:[
+    self synchronized:[
         self package workingCopy commit: msg files: containers.
-        self package repository push.
 
-                 "Update the working copy. We need svn info
-                 to report commited revision"
-"/                (UpdateCommand new)
-"/                    workingCopy:self workingCopy;
-"/                    execute
-"/    ].
+"/      "Update the working copy. We need svn info
+"/       to report commited revision"
+"/      (UpdateCommand new)
+"/          workingCopy:self workingCopy;
+"/          execute
+    ].
 
     "Created: / 15-11-2012 / 09:39:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 16:55:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doPrepareWorkingCopy
--- a/common/common.rc	Thu Nov 15 16:41:36 2012 +0000
+++ b/common/common.rc	Thu Nov 15 19:18:29 2012 +0000
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.1\0"
-      VALUE "ProductDate", "Thu, 15 Nov 2012 10:16:38 GMT\0"
+      VALUE "ProductDate", "Thu, 15 Nov 2012 17:16:32 GMT\0"
     END
 
   END
hg/stx-libscm