diff --git a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/createRepository..st b/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/createRepository..st deleted file mode 100644 index dae10006b4..0000000000 --- a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/createRepository..st +++ /dev/null @@ -1,23 +0,0 @@ -*Iceberg-Metacello-Integration -createRepository: aRepositorySpec - - | type | - type := aRepositorySpec type. - type = 'ftp' - ifTrue: [ | description headerSize index host directory | - description := aRepositorySpec description. - headerSize := 'ftp://' size. - index := description indexOf: $/ startingAt: headerSize + 1. - host := description copyFrom: headerSize + 1 to: index - 1. - directory := description copyFrom: index + 1 to: description size. - ^ MCFtpRepository - host: host - directory: directory - user: aRepositorySpec username - password: aRepositorySpec password]. - Smalltalk - at: #Iceberg - ifPresent: [ :cl | - (cl enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ]) - ifTrue: [ ^ cl mcRepositoryFor: aRepositorySpec description ] ]. - ^ super createRepository: aRepositorySpec \ No newline at end of file diff --git a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/extractTypeFromDescription..st b/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/extractTypeFromDescription..st deleted file mode 100644 index 97a7e0b4b9..0000000000 --- a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/instance/extractTypeFromDescription..st +++ /dev/null @@ -1,7 +0,0 @@ -*Iceberg-Metacello-Integration -extractTypeFromDescription: description - (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. - IceMetacelloRepositoryType allTypes - detect: [ :each | each isSuitableForLocation: description ] - ifFound: [ :class | ^ class type ]. - ^super extractTypeFromDescription: description \ No newline at end of file diff --git a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/properties.json b/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/properties.json deleted file mode 100644 index d55156f5f5..0000000000 --- a/Iceberg-Metacello-Integration.package/MetacelloPharoCommonPlatform.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "MetacelloPharoCommonPlatform" -} \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/README.md b/Iceberg-UI.package/IceAbstractBranchModel.class/README.md new file mode 100644 index 0000000000..09fa2f3a5d --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/README.md @@ -0,0 +1,13 @@ +Description +-------------------- + +I am an abstract class to define a common API for my subclasses that will manage some actions for some branch view of Iceberg. My subclasses will encapsulate a branch or a remote. + +I am use in the branch view of the main browser of Iceberg. + +Public API and Key Messages +-------------------- + +- #children It should return the children of my element. It will probably return the branches of a remote for the remotes and nothing for the branches. +- #nameToDisplay String to show to the user. +- #status Status to show to the user about incomming/unpublished commits. \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/instance/children.st b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/children.st new file mode 100644 index 0000000000..7b67ad4db4 --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/children.st @@ -0,0 +1,5 @@ +accessing +children + "It should return the children of my element. It will probably return the branches of a remote for the remotes and nothing for the branches." + + ^ self subclassResponsibility \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/instance/isBranchModel.st b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/isBranchModel.st new file mode 100644 index 0000000000..ea3fd26df8 --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/isBranchModel.st @@ -0,0 +1,3 @@ +testing +isBranchModel + ^ false \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/instance/nameToDisplay.st b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/nameToDisplay.st new file mode 100644 index 0000000000..786749cc86 --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/nameToDisplay.st @@ -0,0 +1,3 @@ +accessing +nameToDisplay + ^ self subclassResponsibility \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/instance/repository.st b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/repository.st new file mode 100644 index 0000000000..d9dea5f578 --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/repository.st @@ -0,0 +1,3 @@ +accessing +repository + ^ self subclassResponsibility \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/instance/status.st b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/status.st new file mode 100644 index 0000000000..fb85b93ace --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/instance/status.st @@ -0,0 +1,3 @@ +accessing +status + ^ self subclassResponsibility \ No newline at end of file diff --git a/Iceberg-UI.package/IceAbstractBranchModel.class/properties.json b/Iceberg-UI.package/IceAbstractBranchModel.class/properties.json new file mode 100644 index 0000000000..04e0be9445 --- /dev/null +++ b/Iceberg-UI.package/IceAbstractBranchModel.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "CyrilFerlicot 7/9/2017 03:25", + "super" : "Object", + "category" : "Iceberg-UI-Utils", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "IceAbstractBranchModel", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/README.md b/Iceberg-UI.package/IceBranchGroupModel.class/README.md new file mode 100644 index 0000000000..c18e4d8fbc --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/README.md @@ -0,0 +1,24 @@ +Description +-------------------- + +I represent a group of branches. I am used in two principal cases. + +1) We want to group the branches of a remote +2) We want to group the local branches + +Examples +-------------------- + + "For a remote" + IceBranchGroupModel repository: anIceRepository remote: anIceRemote. + + "For local branches" + IceBranchGroupModel localFromRepository: anIceRepository + +Internal Representation and Key Implementation Points. +-------------------- + + Instance Variables + branches: This block takes the repository as parameter and should return the branches of the group + groupName: Name of the group. In case I represent a remote it will be the remote name, else it will probably be "Local" + repository: The repository where to get the branches diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/class/localFromRepository..st b/Iceberg-UI.package/IceBranchGroupModel.class/class/localFromRepository..st new file mode 100644 index 0000000000..2ece63802b --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/class/localFromRepository..st @@ -0,0 +1,9 @@ +instance creation +localFromRepository: aRepository + ^ self + repository: aRepository + branches: #localBranches + groupName: + ('Local' asText + allBold; + yourself) \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.branches.groupName..st b/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.branches.groupName..st new file mode 100644 index 0000000000..126e568645 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.branches.groupName..st @@ -0,0 +1,7 @@ +instance creation +repository: aRepository branches: aCollection groupName: aString + ^ self new + repository: aRepository; + branches: aCollection; + groupName: aString; + yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.remote..st b/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.remote..st new file mode 100644 index 0000000000..be7f0b560a --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/class/repository.remote..st @@ -0,0 +1,3 @@ +instance creation +repository: aRepository remote: aRemote + ^ self repository: aRepository branches: [ :repository | aRemote branchesFrom: repository ] groupName: aRemote asString \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches..st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches..st new file mode 100644 index 0000000000..2e6e254538 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches..st @@ -0,0 +1,3 @@ +accessing +branches: aBlockOrSymbol + branches := aBlockOrSymbol \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches.st new file mode 100644 index 0000000000..c4ca253df7 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/branches.st @@ -0,0 +1,3 @@ +accessing +branches + ^ branches cull: self repository \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/children.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/children.st new file mode 100644 index 0000000000..1556eb1563 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/children.st @@ -0,0 +1,3 @@ +accessing +children + ^ self branches collect: [ :branch | IceBranchModel parent: self branch: branch ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName..st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName..st new file mode 100644 index 0000000000..75bacdfce8 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName..st @@ -0,0 +1,3 @@ +accessing +groupName: aString + groupName := aString \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName.st new file mode 100644 index 0000000000..27a30cdec2 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/groupName.st @@ -0,0 +1,3 @@ +accessing +groupName + ^ groupName \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/nameToDisplay.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/nameToDisplay.st new file mode 100644 index 0000000000..3a6d7672a3 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/nameToDisplay.st @@ -0,0 +1,3 @@ +accessing +nameToDisplay + ^ self groupName \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository..st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository..st new file mode 100644 index 0000000000..552da47cdd --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository..st @@ -0,0 +1,3 @@ +accessing +repository: anIceRepository + repository := anIceRepository \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository.st new file mode 100644 index 0000000000..5be9763862 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/repository.st @@ -0,0 +1,3 @@ +accessing +repository + ^ repository \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/instance/status.st b/Iceberg-UI.package/IceBranchGroupModel.class/instance/status.st new file mode 100644 index 0000000000..fc5185e3f9 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/instance/status.st @@ -0,0 +1,3 @@ +accessing +status + ^ self branches size asString , ' branches' \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchGroupModel.class/properties.json b/Iceberg-UI.package/IceBranchGroupModel.class/properties.json new file mode 100644 index 0000000000..c797228649 --- /dev/null +++ b/Iceberg-UI.package/IceBranchGroupModel.class/properties.json @@ -0,0 +1,15 @@ +{ + "commentStamp" : "CyrilFerlicot 7/9/2017 03:35", + "super" : "IceAbstractBranchModel", + "category" : "Iceberg-UI-Utils", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "repository", + "branches", + "groupName" + ], + "name" : "IceBranchGroupModel", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/README.md b/Iceberg-UI.package/IceBranchModel.class/README.md new file mode 100644 index 0000000000..48d52089f1 --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/README.md @@ -0,0 +1,16 @@ +Description +-------------------- + +I represent an unique branch. I should be contained in an IceBranchGroupModel. + +Examples +-------------------- + + IceBranchModel parent: anIceBranchGroupModel branch: anIceBranch + +Internal Representation and Key Implementation Points. +-------------------- + + Instance Variables + branch: The branch I should display info for. + parentGroup: The branch group inside of which I am. diff --git a/Iceberg-UI.package/IceBranchModel.class/class/parent.branch..st b/Iceberg-UI.package/IceBranchModel.class/class/parent.branch..st new file mode 100644 index 0000000000..3fd52d10eb --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/class/parent.branch..st @@ -0,0 +1,6 @@ +instance creation +parent: anIceBranchGroupModel branch: anIceBranch + ^ self new + parentGroup: anIceBranchGroupModel; + branch: anIceBranch; + yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/branch..st b/Iceberg-UI.package/IceBranchModel.class/instance/branch..st new file mode 100644 index 0000000000..f85549320f --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/branch..st @@ -0,0 +1,3 @@ +accessing +branch: anIceBranch + branch := anIceBranch \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/branch.st b/Iceberg-UI.package/IceBranchModel.class/instance/branch.st new file mode 100644 index 0000000000..327429e494 --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/branch.st @@ -0,0 +1,3 @@ +accessing +branch + ^ branch \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/children.st b/Iceberg-UI.package/IceBranchModel.class/instance/children.st new file mode 100644 index 0000000000..7ae6a189a4 --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/children.st @@ -0,0 +1,3 @@ +accessing +children + ^ #() \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/compareCurrentToMe.st b/Iceberg-UI.package/IceBranchModel.class/instance/compareCurrentToMe.st new file mode 100644 index 0000000000..70d823c91a --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/compareCurrentToMe.st @@ -0,0 +1,3 @@ +action +compareCurrentToMe + self repository compareCurrentBranchWithBranch: self branch \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/isBranchModel.st b/Iceberg-UI.package/IceBranchModel.class/instance/isBranchModel.st new file mode 100644 index 0000000000..b1f877b19d --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/isBranchModel.st @@ -0,0 +1,3 @@ +testing +isBranchModel + ^ true \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/nameToDisplay.st b/Iceberg-UI.package/IceBranchModel.class/instance/nameToDisplay.st new file mode 100644 index 0000000000..01bb671f2c --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/nameToDisplay.st @@ -0,0 +1,3 @@ +accessing +nameToDisplay + ^ self repository descriptionTextForBranch: self branch \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup..st b/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup..st new file mode 100644 index 0000000000..28eea6d9fa --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup..st @@ -0,0 +1,3 @@ +accessing +parentGroup: anIceBranchGroupModel + parentGroup := anIceBranchGroupModel \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup.st b/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup.st new file mode 100644 index 0000000000..3eed23d15e --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/parentGroup.st @@ -0,0 +1,3 @@ +accessing +parentGroup + ^ parentGroup \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/repository.st b/Iceberg-UI.package/IceBranchModel.class/instance/repository.st new file mode 100644 index 0000000000..3800e1ee5b --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/repository.st @@ -0,0 +1,3 @@ +accessing +repository + ^ self parentGroup repository \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoryModel.class/instance/statusForBranch..st b/Iceberg-UI.package/IceBranchModel.class/instance/status.st similarity index 75% rename from Iceberg-UI.package/IceRepositoryModel.class/instance/statusForBranch..st rename to Iceberg-UI.package/IceBranchModel.class/instance/status.st index 2b3280d77d..d10032462a 100644 --- a/Iceberg-UI.package/IceRepositoryModel.class/instance/statusForBranch..st +++ b/Iceberg-UI.package/IceBranchModel.class/instance/status.st @@ -1,9 +1,9 @@ accessing -statusForBranch: aBranch +status | incoming outgoing allStatus | - incoming := aBranch incomingCommits size. - outgoing := aBranch outgoingCommits size. + incoming := self branch incomingCommits size. + outgoing := self branch outgoingCommits size. allStatus := OrderedCollection new. (incoming = 0 and: [ outgoing = 0 ]) ifTrue: [ allStatus add: 'Up to date' ]. diff --git a/Iceberg-UI.package/IceBranchModel.class/instance/switchToMe.st b/Iceberg-UI.package/IceBranchModel.class/instance/switchToMe.st new file mode 100644 index 0000000000..cf2fc5ac84 --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/instance/switchToMe.st @@ -0,0 +1,3 @@ +action +switchToMe + self repository switchBranchTo: self branch \ No newline at end of file diff --git a/Iceberg-UI.package/IceBranchModel.class/properties.json b/Iceberg-UI.package/IceBranchModel.class/properties.json new file mode 100644 index 0000000000..e3a50d098b --- /dev/null +++ b/Iceberg-UI.package/IceBranchModel.class/properties.json @@ -0,0 +1,14 @@ +{ + "commentStamp" : "CyrilFerlicot 7/9/2017 03:36", + "super" : "IceAbstractBranchModel", + "category" : "Iceberg-UI-Utils", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "parentGroup", + "branch" + ], + "name" : "IceBranchModel", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-UI.package/IcePackageModel.class/instance/nameText.st b/Iceberg-UI.package/IcePackageModel.class/instance/nameText.st index 27e10961f6..f8f4547254 100644 --- a/Iceberg-UI.package/IcePackageModel.class/instance/nameText.st +++ b/Iceberg-UI.package/IcePackageModel.class/instance/nameText.st @@ -1,3 +1,3 @@ acessing nameText - ^ self highlight: self package name \ No newline at end of file + ^ self highlight: self packageName \ No newline at end of file diff --git a/Iceberg-UI.package/IcePackageModel.class/instance/packageName.st b/Iceberg-UI.package/IcePackageModel.class/instance/packageName.st new file mode 100644 index 0000000000..e303c3e41f --- /dev/null +++ b/Iceberg-UI.package/IcePackageModel.class/instance/packageName.st @@ -0,0 +1,3 @@ +acessing +packageName + ^ self package name \ No newline at end of file diff --git a/Iceberg-UI.package/IceRemote.extension/instance/branchesFrom..st b/Iceberg-UI.package/IceRemote.extension/instance/branchesFrom..st new file mode 100644 index 0000000000..d629f14c2f --- /dev/null +++ b/Iceberg-UI.package/IceRemote.extension/instance/branchesFrom..st @@ -0,0 +1,6 @@ +*Iceberg-UI +branchesFrom: aRepository + "I return all the branches of my remote from a repository" + + ^ aRepository branches + select: [ :branch | branch isRemote and: [ branch remoteName = self remoteName ] ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceRemote.extension/properties.json b/Iceberg-UI.package/IceRemote.extension/properties.json new file mode 100644 index 0000000000..6572c9e66a --- /dev/null +++ b/Iceberg-UI.package/IceRemote.extension/properties.json @@ -0,0 +1,3 @@ +{ + "name" : "IceRemote" +} \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/addRepositoryBranchesTo..st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/addRepositoryBranchesTo..st index 1ce9fc7c54..e75451fb98 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/addRepositoryBranchesTo..st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/addRepositoryBranchesTo..st @@ -1,16 +1,23 @@ building addRepositoryBranchesTo: composite | branches | - - (branches := composite fastTable) + (branches := composite fastTreeTable) title: 'Branches'; - display: #branches; - column: 'Name' evaluated: [ :branch :model | model descriptionTextForBranch: branch ]; - column: 'Status' evaluated: [ :branch :model | model statusForBranch: branch ]. - + display: [ :repository | + | localisations | + localisations := repository remotes collect: [ :remote | IceBranchGroupModel repository: repository remote: remote ] as: OrderedCollection. + repository hasLocalBraches + ifTrue: [ localisations addFirst: (IceBranchGroupModel localFromRepository: repository) ]. + localisations ]; + children: #children; + column: 'Name' evaluated: #nameToDisplay; + column: 'Status' evaluated: #status; + allExpanded. + "actions" branches addAction: self branchCreateNewAction. + "selection actions" - branches + branches addSelectionAction: self branchSwitchAction; - addSelectionAction: self branchCompareWithCurrentAction \ No newline at end of file + addSelectionAction: self branchCompareWithCurrentAction \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchCompareWithCurrentAction.st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchCompareWithCurrentAction.st index 31c4fdbc0b..37976f38bb 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchCompareWithCurrentAction.st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchCompareWithCurrentAction.st @@ -2,7 +2,9 @@ menu actions - branches branchCompareWithCurrentAction ^ GLMGenericAction new action: [ :presentation :model | - model compareCurrentBranchWithBranch: presentation selection. + presentation selection compareCurrentToMe. presentation pane browser update ]; - showTitle: 'Compare with current branch'; - yourself + enabledCondition: [ :presentation :model | (model isCurrentBranch: presentation selection branch) not ]; + condition: [ :presentation | presentation selection ifNil: [ false ] ifNotNil: #isBranchModel ]; + showTitle: 'Compare with current branch'; + yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchSwitchAction.st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchSwitchAction.st index 1f08e78758..bd67b3d077 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchSwitchAction.st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/branchSwitchAction.st @@ -2,10 +2,10 @@ menu actions - branches branchSwitchAction ^ GLMGenericAction new action: [ :presentation :model | - model switchBranchTo: presentation selection. + presentation selection switchToMe. presentation pane browser update ]; - showTitle: 'Switch to this branch'; - enabledCondition: [ :presentation :model | - (model isCurrentBranch: presentation selection) not ]; + showTitle: 'Switch to this branch'; + enabledCondition: [ :presentation :model | (model isCurrentBranch: presentation selection branch) not ]; + condition: [ :presentation | presentation selection ifNil: [ false ] ifNotNil: #isBranchModel ]; shortcut: $b; - yourself + yourself \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composePackagesListIn..st b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composePackagesListIn..st index 8ff4f220e8..f14211ec7f 100644 --- a/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composePackagesListIn..st +++ b/Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composePackagesListIn..st @@ -14,7 +14,9 @@ composePackagesListIn: composite addSelectionAction: self unloadAndRemovePackageAction; addSelectionAction: self removePackageAction; addSelectionAction: self removePackageFromDiskAction; + enableFilter: [ :packageModel :pattern | packageModel packageName includesSubstring: pattern caseSensitive: false ]; "Plugin actions" dynamicActionsOnSelection: [ :presentation | - presentation entity pluginPackageActionsFor: presentation selection entity ]; + presentation selection ifNotNil: [ + presentation entity pluginPackageActionsFor: presentation selection entity ]]; updateOn: IceCommited from: #announcer \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoryModel.class/instance/descriptionTextForBranch..st b/Iceberg-UI.package/IceRepositoryModel.class/instance/descriptionTextForBranch..st index ba85b95005..1c7451c3e2 100644 --- a/Iceberg-UI.package/IceRepositoryModel.class/instance/descriptionTextForBranch..st +++ b/Iceberg-UI.package/IceRepositoryModel.class/instance/descriptionTextForBranch..st @@ -1,12 +1,9 @@ accessing descriptionTextForBranch: aBranch - | text | - - self flag: #todo. "This method is (almost) duplicated in - IceHistoryBrowser>>descriptionTextForBranch:repository:. This can be solved by - using an IceBranchModel instead the branch directly" - text := aBranch name asText. - (self isCurrentBranch: aBranch) - ifTrue: [ text allBold ]. - - ^ text \ No newline at end of file + ^ aBranch isRemote + ifTrue: [ aBranch basename ] + ifFalse: [ | text | + text := aBranch name asText. + (self isCurrentBranch: aBranch) + ifTrue: [ text allBold ]. + text ] \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoryModel.class/instance/hasLocalBraches.st b/Iceberg-UI.package/IceRepositoryModel.class/instance/hasLocalBraches.st new file mode 100644 index 0000000000..d70d77b2ee --- /dev/null +++ b/Iceberg-UI.package/IceRepositoryModel.class/instance/hasLocalBraches.st @@ -0,0 +1,3 @@ +testing +hasLocalBraches + ^ self repository hasLocalBraches \ No newline at end of file diff --git a/Iceberg-UI.package/IceRepositoryModel.class/instance/localBranches.st b/Iceberg-UI.package/IceRepositoryModel.class/instance/localBranches.st new file mode 100644 index 0000000000..163a33f200 --- /dev/null +++ b/Iceberg-UI.package/IceRepositoryModel.class/instance/localBranches.st @@ -0,0 +1,3 @@ +accessing +localBranches + ^ self repository localBranches \ No newline at end of file diff --git a/Iceberg.package/IceClassChangeSet.class/instance/myVersion.st b/Iceberg.package/IceClassChangeSet.class/instance/myVersion.st index 3bc7ae963a..0eeac143af 100644 --- a/Iceberg.package/IceClassChangeSet.class/instance/myVersion.st +++ b/Iceberg.package/IceClassChangeSet.class/instance/myVersion.st @@ -1,3 +1,3 @@ *Iceberg-UI myVersion - ^ self classDefinition ifNotNil: #toSource + ^ self classDefinition ifNotNil: #diffToSource diff --git a/Iceberg.package/IceClassChangeSet.class/instance/theirVersion.st b/Iceberg.package/IceClassChangeSet.class/instance/theirVersion.st index cfaf60f088..a5f287ec1b 100644 --- a/Iceberg.package/IceClassChangeSet.class/instance/theirVersion.st +++ b/Iceberg.package/IceClassChangeSet.class/instance/theirVersion.st @@ -1,3 +1,3 @@ *Iceberg-UI theirVersion - ^ self classDefinition ifNotNil: #fromSource + ^ self classDefinition ifNotNil: #diffFromSource diff --git a/Iceberg.package/IceClassChangeSet.class/instance/updateDiff..st b/Iceberg.package/IceClassChangeSet.class/instance/updateDiff..st index 28cc037c6a..8ea4586cd2 100644 --- a/Iceberg.package/IceClassChangeSet.class/instance/updateDiff..st +++ b/Iceberg.package/IceClassChangeSet.class/instance/updateDiff..st @@ -1,10 +1,10 @@ *Iceberg-UI updateDiff: aDiffModel - self classDefinition + self classDefinition ifNil: [ super updateDiff: aDiffModel ] ifNotNil: [ :cd | aDiffModel contextClass: nil; - leftText: cd toSource; - rightText: cd fromSource + leftText: cd diffToSource; + rightText: cd diffFromSource ] diff --git a/Iceberg.package/IceLocalBranch.class/properties.json b/Iceberg.package/IceLocalBranch.class/properties.json index b4b3517563..e1606c79e4 100644 --- a/Iceberg.package/IceLocalBranch.class/properties.json +++ b/Iceberg.package/IceLocalBranch.class/properties.json @@ -6,8 +6,6 @@ "pools" : [ ], "classvars" : [ ], "instvars" : [ - "versionDictionary", - "loading", "upstream" ], "name" : "IceLocalBranch", diff --git a/Iceberg.package/IceMethodChange.class/instance/myVersion.st b/Iceberg.package/IceMethodChange.class/instance/myVersion.st index 3b99bd40b6..21bfafd189 100644 --- a/Iceberg.package/IceMethodChange.class/instance/myVersion.st +++ b/Iceberg.package/IceMethodChange.class/instance/myVersion.st @@ -1,3 +1,3 @@ *Iceberg-UI myVersion - ^ self operation toSource \ No newline at end of file + ^ self operation diffToSource diff --git a/Iceberg.package/IceMethodChange.class/instance/theirVersion.st b/Iceberg.package/IceMethodChange.class/instance/theirVersion.st index b34e829fd4..c5f3700e90 100644 --- a/Iceberg.package/IceMethodChange.class/instance/theirVersion.st +++ b/Iceberg.package/IceMethodChange.class/instance/theirVersion.st @@ -1,3 +1,3 @@ *Iceberg-UI theirVersion - ^ self operation fromSource \ No newline at end of file + ^ self operation diffFromSource diff --git a/Iceberg.package/IceMethodChange.class/instance/updateDiff..st b/Iceberg.package/IceMethodChange.class/instance/updateDiff..st index 80a7fb944b..e6196afd8a 100644 --- a/Iceberg.package/IceMethodChange.class/instance/updateDiff..st +++ b/Iceberg.package/IceMethodChange.class/instance/updateDiff..st @@ -1,6 +1,6 @@ *Iceberg-UI -updateDiff: aDiffModel +updateDiff: aDiffModel aDiffModel contextClass: self operation targetClass; - leftText: self operation toSource; - rightText: self operation fromSource. \ No newline at end of file + leftText: self operation diffToSource; + rightText: self operation diffFromSource. diff --git a/Iceberg.package/IceRepository.class/instance/hasLocalBraches.st b/Iceberg.package/IceRepository.class/instance/hasLocalBraches.st new file mode 100644 index 0000000000..1f8b668f5d --- /dev/null +++ b/Iceberg.package/IceRepository.class/instance/hasLocalBraches.st @@ -0,0 +1,3 @@ +testing +hasLocalBraches + ^ self localBranches isNotEmpty \ No newline at end of file diff --git a/Iceberg.package/MorphicUIManager.extension/instance/confirm.label.trueChoice.falseChoice.cancelChoice.default..st b/Iceberg.package/MorphicUIManager.extension/instance/confirm.label.trueChoice.falseChoice.cancelChoice.default..st deleted file mode 100644 index e4a7d69414..0000000000 --- a/Iceberg.package/MorphicUIManager.extension/instance/confirm.label.trueChoice.falseChoice.cancelChoice.default..st +++ /dev/null @@ -1,17 +0,0 @@ -*Iceberg-Adapters -confirm: queryString label: title trueChoice: trueChoice falseChoice: falseChoice cancelChoice: cancelChoice default: defaultOption - "Put up a yes/no/cancel menu with caption queryString. The actual wording for the choices will be as provided in the trueChoice, falseChoice and cancelChoice parameters. - defaultOption should be one of true, false or nil to set the default button. - Answer true if the response is the true-choice, false if it's the false-choice, nil if the cancelChoice. - This is a modal question -- the user must respond." - - (ProvideAnswerNotification signal: queryString) ifNotNil: [:answer | - ^answer]. - ^ self theme - customQuestionIn: self modalMorph - text: queryString - yesText: trueChoice - noText: falseChoice - cancelText: cancelChoice - default: defaultOption - title: title \ No newline at end of file diff --git a/Iceberg.package/MorphicUIManager.extension/properties.json b/Iceberg.package/MorphicUIManager.extension/properties.json deleted file mode 100644 index 79ec76899a..0000000000 --- a/Iceberg.package/MorphicUIManager.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "MorphicUIManager" -} \ No newline at end of file