--- a/common/SCMAbstractCommitDialog.st Wed Nov 14 21:41:23 2012 +0000
+++ b/common/SCMAbstractCommitDialog.st Thu Nov 15 01:42:14 2012 +0000
@@ -9,7 +9,7 @@
!
Object subclass:#FileEntry
- instanceVariableNames:'application entry include'
+ instanceVariableNames:'application entry include name'
classVariableNames:''
poolDictionaries:''
privateIn:SCMAbstractCommitDialog
@@ -717,20 +717,9 @@
!SCMAbstractCommitDialog methodsFor:'change & update'!
updateFileList
- | entries showOnlyModified |
+ "raise an error: must be redefined in concrete subclass(es)"
- showOnlyModified := fileListShowOnlyModifiedHolder value.
- entries := self workingCopy status.
- entries := entries reject:
- [:e|
- e status isUnversionedOrIgnoredOrMissing or:
- [
- fileListShowOnlyModifiedHolder value and:[ e status isNormal ]
- ]].
- entries := entries collect:[:entry|FileEntry application: self entry: entry].
- self fileListHolder value: entries
-
- "Created: / 08-02-2012 / 18:05:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self subclassResponsibility
! !
!SCMAbstractCommitDialog methodsFor:'hooks'!
@@ -818,11 +807,11 @@
!SCMAbstractCommitDialog::FileEntry class methodsFor:'instance creation'!
-application:applicationArg entry:entryArg
+application:applicationArg entry:entryArg name: nameArg
- ^self new application:applicationArg entry:entryArg
+ ^self new application:applicationArg entry:entryArg name: nameArg
- "Created: / 09-02-2012 / 14:34:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Created: / 15-11-2012 / 01:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SCMAbstractCommitDialog::FileEntry methodsFor:'accessing'!
@@ -852,15 +841,17 @@
!
path
- ^entry path
+ ^entry pathName
"Created: / 09-02-2012 / 14:39:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-11-2012 / 01:36:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
pathText
- ^entry pathText
+ ^name
"Created: / 09-02-2012 / 14:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-11-2012 / 01:36:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
revision
@@ -870,19 +861,21 @@
!
statusIcon
- ^entry statusIcon
+ ^nil
"Created: / 09-02-2012 / 14:36:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 15-11-2012 / 01:30:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SCMAbstractCommitDialog::FileEntry methodsFor:'initialization'!
-application:applicationArg entry:entryArg
+application:applicationArg entry:entryArg name: nameArg
application := applicationArg.
entry := entryArg.
- include := true
+ include := true.
+ name := nameArg.
- "Modified: / 09-02-2012 / 14:35:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Created: / 15-11-2012 / 01:36:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SCMAbstractCommitDialog class methodsFor:'documentation'!
@@ -892,6 +885,11 @@
^thisContext method mclass theNonMetaclass instVarNamed: #revision
!
+version_HG
+ "Never, ever change this method. Ask JV or CG why"
+ ^thisContext method mclass theNonMetaclass instVarNamed: #revision
+!
+
version_SVN
^ '$Id:: $'
! !