diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/basicPushTo..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/basicPushTo..st new file mode 100644 index 0000000000..0ba36771f5 --- /dev/null +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/basicPushTo..st @@ -0,0 +1,26 @@ +private-pushing +basicPushTo: aRemote + | gitRemote | + + gitRemote := (LGitRemote of: self repositoryHandle named: aRemote name) lookup. + [ + | pushProgress | + pushProgress := IcePushTransferProgress new. + "Push branch" + self + pushBranchToRemote: aRemote + gitRemote: gitRemote + progress: pushProgress. + "Push tags" + self + pushTagsToRemote: aRemote + gitRemote: gitRemote + progress: pushProgress. + + "Verify we have an stream" + self setUpstreamIfMissing: aRemote ] + on: LGit_GIT_ENONFASTFORWARD + do: [ :e | + e resignalAs: (IceRemoteDesynchronized new + remote: aRemote; + yourself) ] \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushBranchToRemote.gitRemote.progress..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushBranchToRemote.gitRemote.progress..st new file mode 100644 index 0000000000..7e5b96aed1 --- /dev/null +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushBranchToRemote.gitRemote.progress..st @@ -0,0 +1,13 @@ +private-pushing +pushBranchToRemote: aRemote gitRemote: gitRemote progress: pushProgress + + gitRemote + pushWithRefSpec: (LGitRefSpec new + source: self fullname; + destination: self fullname; + yourself) + pushOptions: (LGitPushOptions defaults + callbacks: ((LGitRemoteCallbacks withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself) \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTag.toRemote.gitRemote.progress..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTag.toRemote.gitRemote.progress..st new file mode 100644 index 0000000000..0785dbbdc3 --- /dev/null +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTag.toRemote.gitRemote.progress..st @@ -0,0 +1,13 @@ +private-pushing +pushTag: tag toRemote: aRemote gitRemote: gitRemote progress: pushProgress + + gitRemote + pushWithRefSpec: (LGitRefSpec new + source: 'refs/tags/' , tag name; + destination: 'refs/tags/' , tag name; + yourself) + pushOptions: (LGitPushOptions defaults + callbacks: ((LGitRemoteCallbacks withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself) \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTagsToRemote.gitRemote.progress..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTagsToRemote.gitRemote.progress..st new file mode 100644 index 0000000000..118bcd167d --- /dev/null +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTagsToRemote.gitRemote.progress..st @@ -0,0 +1,9 @@ +private-pushing +pushTagsToRemote: aRemote gitRemote: gitRemote progress: pushProgress + + self tags do: [ :tag | + self + pushTag: tag + toRemote: aRemote + gitRemote: gitRemote + progress: pushProgress ] \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTo..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTo..st index 370057442a..0dbfe0a455 100644 --- a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTo..st +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/pushTo..st @@ -1,45 +1,5 @@ API-remotes pushTo: aRemote - repository - handleLibgitError: [ | gitRemote | - gitRemote := (LGitRemote of: self repositoryHandle named: aRemote name) lookup. - [ - | pushProgress | - pushProgress := IcePushTransferProgress new. - gitRemote - pushWithRefSpec: - (LGitRefSpec new - source: self fullname; - destination: self fullname; - yourself) - pushOptions: - (LGitPushOptions defaults - callbacks: ((LGitRemoteCallbacks withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself ); - yourself). - - "Push tags!" - self tags - do: [ :tag | - | tagProgress | - gitRemote - pushWithRefSpec: - (LGitRefSpec new - source: 'refs/tags/' , tag name; - destination: 'refs/tags/' , tag name; - yourself) - pushOptions: - (LGitPushOptions defaults - callbacks: ((LGitRemoteCallbacks withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself); - yourself) ] ] - on: LGit_GIT_ENONFASTFORWARD - do: [ :e | - e - resignalAs: - (IceRemoteDesynchronized new - remote: aRemote; - yourself) ] ] \ No newline at end of file + repository handleLibgitError: [ + self basicPushTo: aRemote ] \ No newline at end of file diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/setUpstreamIfMissing..st b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/setUpstreamIfMissing..st new file mode 100644 index 0000000000..a000b7619b --- /dev/null +++ b/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/setUpstreamIfMissing..st @@ -0,0 +1,5 @@ +private-pushing +setUpstreamIfMissing: aRemote + + self hasUpstream ifTrue: [ ^ self ]. + self setUpstream: (aRemote remoteBranchNamed: self gitRef) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/instance/swappedColorDiff.st b/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/instance/swappedColorDiff.st deleted file mode 100644 index e309f6647b..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/instance/swappedColorDiff.st +++ /dev/null @@ -1,3 +0,0 @@ -*Iceberg-Plugin-GitHub -swappedColorDiff - ^ self custom: GLMSwappedColorDiffPresentation new \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/properties.json b/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/properties.json deleted file mode 100644 index eb85f0dc4f..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "GLMCompositePresentation" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/instance/renderSwappedColorDiffPresentation..st b/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/instance/renderSwappedColorDiffPresentation..st deleted file mode 100644 index 0e8722a344..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/instance/renderSwappedColorDiffPresentation..st +++ /dev/null @@ -1,3 +0,0 @@ -*Iceberg-Plugin-GitHub -renderSwappedColorDiffPresentation: aPresentation - ^ GLMMorphicSwappedColorDiffRenderer render: aPresentation from: self \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/properties.json b/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/properties.json deleted file mode 100644 index 3a64d41973..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "GLMMorphicRenderer" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/README.md b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/README.md deleted file mode 100644 index 54024ec2da..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/README.md +++ /dev/null @@ -1 +0,0 @@ -A glamour renderer for the swapped diff morph \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/instance/render..st b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/instance/render..st deleted file mode 100644 index 20f43cd679..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/instance/render..st +++ /dev/null @@ -1,12 +0,0 @@ -rendering -render: aPresentation - | textMorph | - textMorph := (SwappedColorDiffMorph - from: aPresentation displayValue first - to: aPresentation displayValue last - contextClass: aPresentation contextClassValue) - layoutFrame: (LayoutFrame identity); - vResizing: #spaceFill; - hResizing: #spaceFill; - yourself. - ^textMorph \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/properties.json b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/properties.json deleted file mode 100644 index 2316a5dbf0..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "EstebanLorenzano 5/5/2017 12:19", - "super" : "GLMMorphicWidgetRenderer", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "GLMMorphicSwappedColorDiffRenderer", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/README.md b/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/README.md deleted file mode 100644 index bdbaeedbcc..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/README.md +++ /dev/null @@ -1 +0,0 @@ -A glamour presentation for the swapped diff morph \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/instance/renderGlamorouslyOn..st b/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/instance/renderGlamorouslyOn..st deleted file mode 100644 index 06efff43f1..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/instance/renderGlamorouslyOn..st +++ /dev/null @@ -1,4 +0,0 @@ -rendering -renderGlamorouslyOn: aRenderer - self registerAnnouncements. - ^ aRenderer renderSwappedColorDiffPresentation: self \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/properties.json b/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/properties.json deleted file mode 100644 index b15c730d89..0000000000 --- a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "EstebanLorenzano 5/8/2017 13:57", - "super" : "GLMDiffPresentation", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "GLMSwappedColorDiffPresentation", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/README.md b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/README.md deleted file mode 100644 index 817311e356..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/README.md +++ /dev/null @@ -1,3 +0,0 @@ -I'm a simple spec model to show IceCommitInfo details. - -(self for: aCommitInfo) openWithSpec. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/defaultSpec.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/defaultSpec.st deleted file mode 100644 index e9930826ef..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/defaultSpec.st +++ /dev/null @@ -1,13 +0,0 @@ -specs -defaultSpec - - - ^ SpecLayout composed - newColumn: [ :c | - c - newRow: [:row | row add: #dateLabel width: 80 * World displayScaleFactor; add: #datePanel ] height: 25 * World displayScaleFactor; - newRow: [:row | row add: #idLabel width: 80 * World displayScaleFactor; add: #idPanel ] height: 25 * World displayScaleFactor; - newRow: [:row | row add: #parentsLabel width: 80 * World displayScaleFactor; add: #parentsPanel ] height: 25 * World displayScaleFactor; - newRow: [:row | row add: #authorLabel width: 80 * World displayScaleFactor; add: #authorPanel ] height: 25 * World displayScaleFactor; - newRow: [:row | row add: #commentLabel width: 80 * World displayScaleFactor; add: #commentPanel ] ]; - yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/for..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/for..st deleted file mode 100644 index b7c06e90bf..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/for..st +++ /dev/null @@ -1,5 +0,0 @@ -instance creation -for: aCommit - ^ self basicNew - initializeCommit: aCommit; - yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel..st deleted file mode 100644 index caaffe025f..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authorLabel: anObject - authorLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel.st deleted file mode 100644 index 67cd47b031..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authorLabel - ^ authorLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel..st deleted file mode 100644 index 44cdd338eb..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authorPanel: anObject - authorPanel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel.st deleted file mode 100644 index a49a35ede3..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authorPanel - ^ authorPanel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel..st deleted file mode 100644 index ad5bfc5dd7..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -commentLabel: anObject - commentLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel.st deleted file mode 100644 index 6d349bd9df..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -commentLabel - ^ commentLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel..st deleted file mode 100644 index 09bf0c3b4d..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -commentPanel: anObject - commentPanel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel.st deleted file mode 100644 index d2dccb2956..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -commentPanel - ^ commentPanel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commit.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commit.st deleted file mode 100644 index 8b930f5eb2..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commit.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -commit - ^ commit \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel..st deleted file mode 100644 index dd663e776c..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -dateLabel: anObject - dateLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel.st deleted file mode 100644 index 036a0ff0d1..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -dateLabel - ^ dateLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel..st deleted file mode 100644 index 668b0fb966..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -datePanel: anObject - datePanel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel.st deleted file mode 100644 index 841ebf9d5d..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -datePanel - ^ datePanel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel..st deleted file mode 100644 index 357540f559..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -idLabel: anObject - idLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel.st deleted file mode 100644 index 5b4ce2ef03..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -idLabel - ^ idLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel..st deleted file mode 100644 index aa13553b83..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -idPanel: anObject - idPanel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel.st deleted file mode 100644 index 38cfb4af6c..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -idPanel - ^ idPanel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeCommit..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeCommit..st deleted file mode 100644 index c39d8ed0f6..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeCommit..st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initializeCommit: aCommit - commit := aCommit. - self initialize \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeWidgets.st deleted file mode 100644 index 7492b1f29d..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeWidgets.st +++ /dev/null @@ -1,24 +0,0 @@ -initialization -initializeWidgets - idLabel := self newLabel. - idPanel := self newTextInput enabled: false. - dateLabel := self newLabel. - datePanel := self newTextInput enabled: false. - authorLabel := self newLabel. - authorPanel := self newTextInput enabled: false. - commentLabel := self newLabel. - commentPanel := self newText enabled: false. - parentsLabel := self newLabel. - parentsPanel := self newTextInput enabled: false. - - idLabel label: 'Commit Id'. - idPanel text: self commit id asString, ' [', self commit shortId, ']'. - dateLabel label: 'Date & time'. - datePanel text: self commit datetime asLocalStringYMDHM. - authorLabel label: 'Author'. - authorPanel text: self commit author. - commentLabel label: 'Comment'. - commentPanel text: self commit comment. - parentsLabel label: 'Ancestors(s)'. - parentsPanel text: self commit ancestors asCommaString - \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel..st deleted file mode 100644 index 5fc52b482a..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parentsLabel: anObject - parentsLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel.st deleted file mode 100644 index 241b2f63fb..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parentsLabel - ^ parentsLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel..st deleted file mode 100644 index 23a679db97..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parentsPanel: anObject - parentsPanel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel.st deleted file mode 100644 index f06027d985..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -parentsPanel - ^ parentsPanel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/properties.json b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/properties.json deleted file mode 100644 index d5c84a864f..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "commentStamp" : "", - "super" : "ComposablePresenter", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "commit", - "idLabel", - "idPanel", - "authorLabel", - "authorPanel", - "dateLabel", - "datePanel", - "commentLabel", - "commentPanel", - "parentsLabel", - "parentsPanel" - ], - "name" : "IceCommitInfoModel", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st b/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st deleted file mode 100644 index 4a1301b977..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st +++ /dev/null @@ -1,4 +0,0 @@ -*Iceberg-Plugin-GitHub -changes - "I am called by Iceberg's UI to get UI nodes for the tree" - ^ (IceDiffNode on: tree) children \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json b/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json deleted file mode 100644 index 21a1aa299e..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name" : "IceDiff" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/README.md b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/README.md deleted file mode 100644 index 990a231ffd..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/README.md +++ /dev/null @@ -1,2 +0,0 @@ -I'm a builder to help users to build reusable diff-changes-tree elements. -I'm used in several parts, notable in the syncronize window and in the history browser. diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseAction.st deleted file mode 100644 index ab469e3ea7..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseAction.st +++ /dev/null @@ -1,11 +0,0 @@ -actions -browseAction - ^ GLMGenericAction new - action: [ :presentation | presentation selection browse ]; - condition: [ :presentation :ent | - presentation selection notNil - and: [ presentation selection canBeBrowsed ]]; - icon: (self iconNamed: #nautilus); - shortcut: $b; - title: 'Browse'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseReferencesAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseReferencesAction.st deleted file mode 100644 index f422f21c82..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/browseReferencesAction.st +++ /dev/null @@ -1,10 +0,0 @@ -actions -browseReferencesAction - ^ GLMGenericAction new - action: [ :presentation | presentation selection browseReferences ]; - condition: [ :presentation | - presentation selection notNil - and: [ presentation selection canBrowseReferences ]]; - shortcut: $n; - title: 'Browse references'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st deleted file mode 100644 index 7dcf3d702a..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st +++ /dev/null @@ -1,16 +0,0 @@ -building -buildOn: aPresenter - ^ aPresenter fastTree - allExpanded; - children: #children; - icon: #icon; - format: #description; - display: [ self changes ]; - updateOn: IceChangeSetChanged from: #announcer; - addAction: self refreshTreeAction; - addSelectionAction: self inspectAction; - addSelectionAction: self browseAction; - addSelectionAction: self browseReferencesAction; - addSelectionAction: self revertChangeAction; - addSelectionAction: self installAction; - yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/changes.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/changes.st deleted file mode 100644 index 578b8bb69b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/changes.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -changes - ^ self diff changes \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity..st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity..st deleted file mode 100644 index dff9beeaf2..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -entity: anObject - entity := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity.st deleted file mode 100644 index 5291a9d062..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/entity.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -entity - ^ entity ifNil: [ self diff ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/inspectAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/inspectAction.st deleted file mode 100644 index b7e7091b48..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/inspectAction.st +++ /dev/null @@ -1,8 +0,0 @@ -actions -inspectAction - ^ GLMGenericAction new - action: [ :presentation | presentation selection inspect ]; - icon: (self iconNamed: #smallInspectIt); - shortcut: $i; - title: 'Inspect'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/installAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/installAction.st deleted file mode 100644 index 9b5f12752b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/installAction.st +++ /dev/null @@ -1,7 +0,0 @@ -actions -installAction - ^ GLMGenericAction new - action: [ :presentation | presentation selection install ]; - icon: (self iconNamed: #edit); - title: 'Install'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/refreshTreeAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/refreshTreeAction.st deleted file mode 100644 index b4815426ab..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/refreshTreeAction.st +++ /dev/null @@ -1,9 +0,0 @@ -actions -refreshTreeAction - ^ GLMGenericAction new - action: [ :presentation | - self entity rebuild. - presentation update ]; - icon: (self iconNamed: #glamorousRefresh); - shortcut: $r; - title: 'Refresh tree'; showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/revertChangeAction.st b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/revertChangeAction.st deleted file mode 100644 index a24c4c33a2..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/revertChangeAction.st +++ /dev/null @@ -1,10 +0,0 @@ -actions -revertChangeAction - ^ GLMGenericAction new - action: [ :presentation | - self entity revertChange: presentation selection. - presentation update. ]; - condition: [ self entity canRevertChanges ]; - icon: (self iconNamed: #glamorousUndo); - title: 'Revert change'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/properties.json b/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/properties.json deleted file mode 100644 index 687892ab5e..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "commentStamp" : "EstebanLorenzano 9/21/2017 12:55", - "super" : "Object", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "entity", - "diff" - ], - "name" : "IceDiffChangeTreeBuilder", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/README.md b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/README.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/class/on..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/class/on..st deleted file mode 100644 index f11ecfcb41..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/class/on..st +++ /dev/null @@ -1,6 +0,0 @@ -instance-creation -on: anIceNode - - ^ self new - node: anIceNode; - yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/balloonText.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/balloonText.st deleted file mode 100644 index 84b17bee05..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/balloonText.st +++ /dev/null @@ -1,4 +0,0 @@ -morph-compatibility -balloonText - - ^ nil \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/browse.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/browse.st deleted file mode 100644 index 9dcdee0dbf..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/browse.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -browse - - ^ node value browse \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBeBrowsed.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBeBrowsed.st deleted file mode 100644 index e0e95bcb94..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBeBrowsed.st +++ /dev/null @@ -1,4 +0,0 @@ -ui -canBeBrowsed - - ^ node value canBeBrowsed \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBrowseReferences.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBrowseReferences.st deleted file mode 100644 index 97cf709a4f..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBrowseReferences.st +++ /dev/null @@ -1,4 +0,0 @@ -ui -canBrowseReferences - - ^ node value canBrowseReferences \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/children.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/children.st deleted file mode 100644 index 8763863684..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/children.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -children - - ^ node children collect: [ :e | IceDiffNode on: e ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/contents.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/contents.st deleted file mode 100644 index 8dc70144ab..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/contents.st +++ /dev/null @@ -1,4 +0,0 @@ -morph-compatibility -contents - - ^ self children \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/description.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/description.st deleted file mode 100644 index 666735575b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/description.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -description - - ^ node description \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasContents.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasContents.st deleted file mode 100644 index 5fd064d242..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasContents.st +++ /dev/null @@ -1,4 +0,0 @@ -morph-compatibility -hasContents - - ^ node notEmpty \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasEquivalentIn..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasEquivalentIn..st deleted file mode 100644 index 7f4b372a01..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasEquivalentIn..st +++ /dev/null @@ -1,5 +0,0 @@ -morph-compatibility -hasEquivalentIn: aCollection - - self haltIf: [ aCollection notEmpty ]. - ^ false \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/highlightingColor.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/highlightingColor.st deleted file mode 100644 index 8b26cbcd14..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/highlightingColor.st +++ /dev/null @@ -1,4 +0,0 @@ -morph-compatibility -highlightingColor - - ^ self theme selectionColor \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/icon.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/icon.st deleted file mode 100644 index 6bdcbcf2e5..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/icon.st +++ /dev/null @@ -1,4 +0,0 @@ -ui -icon - - ^ node value icon \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/install.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/install.st deleted file mode 100644 index 6470e573d0..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/install.st +++ /dev/null @@ -1,4 +0,0 @@ -actions -install - - ^ node value install \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/key.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/key.st deleted file mode 100644 index bd6e31c474..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/key.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -key - - ^ node key \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/myVersion.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/myVersion.st deleted file mode 100644 index b9253e5084..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/myVersion.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -myVersion - - ^ node value leftContents \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node..st deleted file mode 100644 index 66ba7d73ff..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -node: anIceNode - - node := anIceNode \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node.st deleted file mode 100644 index fb26672f0a..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -node - - ^ node \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/printOn..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/printOn..st deleted file mode 100644 index ea23b3cf1b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/printOn..st +++ /dev/null @@ -1,4 +0,0 @@ -printing -printOn: aStream - - self description printOn: aStream \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/theirVersion.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/theirVersion.st deleted file mode 100644 index 155593d0f8..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/theirVersion.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -theirVersion - - ^ node value rightContents \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/properties.json b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/properties.json deleted file mode 100644 index 8037a82b8b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "commentStamp" : "", - "super" : "Object", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "node", - "diff" - ], - "name" : "IceDiffNode", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/README.md b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/README.md new file mode 100644 index 0000000000..e3373abf58 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I am a nil PR that can be used when the user has no PR to see. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/author.st b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/author.st new file mode 100644 index 0000000000..7a4cb036f7 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/author.st @@ -0,0 +1,3 @@ +accessing +author + ^ 'No PR selected' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/baseLabel.st b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/baseLabel.st new file mode 100644 index 0000000000..0a682b0321 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/baseLabel.st @@ -0,0 +1,3 @@ +accessing +baseLabel + ^ 'No PR selected' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/body.st b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/body.st new file mode 100644 index 0000000000..e2aef76e5b --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/body.st @@ -0,0 +1,3 @@ +accessing +body + ^ '' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/headLabel.st b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/headLabel.st new file mode 100644 index 0000000000..d38a6aab3c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/headLabel.st @@ -0,0 +1,3 @@ +accessing +headLabel + ^ 'No PR selected' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/url.st b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/url.st new file mode 100644 index 0000000000..0ee1d00212 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/instance/url.st @@ -0,0 +1,3 @@ +accessing +url + ^ 'No PR selected' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/properties.json new file mode 100644 index 0000000000..469d6eceda --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubNilPullRequest.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "CyrilFerlicot 10/31/2018 15:13", + "super" : "Object", + "category" : "Iceberg-Plugin-GitHub-Utils", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "IceGitHubNilPullRequest", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPlugin.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubPlugin.class/properties.json index 01edf4d557..09031f0245 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPlugin.class/properties.json +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPlugin.class/properties.json @@ -1,7 +1,7 @@ { "commentStamp" : "EstebanLorenzano 9/18/2018 17:09", "super" : "IcePlugin", - "category" : "Iceberg-Plugin-GitHub", + "category" : "Iceberg-Plugin-GitHub-Core", "classinstvars" : [ ], "pools" : [ ], "classvars" : [ ], diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/branchName.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/branchName.st index 489386977c..e4ddff6fde 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/branchName.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/branchName.st @@ -1,3 +1,3 @@ accessing branchName - ^ self branch basename \ No newline at end of file + ^ self branch name \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/commits.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/commits.st new file mode 100644 index 0000000000..0ddaad4584 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/commits.st @@ -0,0 +1,3 @@ +accessing +commits + ^ self branch commits \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/mergeIntoWorkingCopy.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/mergeIntoWorkingCopy.st index 803ae2f0f0..6e669ebfa5 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/mergeIntoWorkingCopy.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequest.class/instance/mergeIntoWorkingCopy.st @@ -2,5 +2,5 @@ actions mergeIntoWorkingCopy self repository ensureBranch: self branchName; - checkoutBranch: self branchName; - merge: self branch lastCommit \ No newline at end of file + checkoutBranch: self branchName. + self branch merge \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/README.md b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/README.md deleted file mode 100644 index 9613b7a6bc..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I'm an actions toolbar, to be used with IceGitHubPullRequestBrowser. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/class/defaultSpec.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/class/defaultSpec.st deleted file mode 100644 index 5801983076..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/class/defaultSpec.st +++ /dev/null @@ -1,9 +0,0 @@ -specs -defaultSpec - - ^ SpecLayout composed - newRow: [ :row | - row - add: #mergeButton; - add: #acceptButton; - add: #rejectButton ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/initializeWidgets.st deleted file mode 100644 index 4a0c14d95e..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/initializeWidgets.st +++ /dev/null @@ -1,15 +0,0 @@ -initialization -initializeWidgets - mergeButton := self newButton. - acceptButton := self newButton. - rejectButton := self newButton. - - mergeButton - label: 'Merge into image'; - action: [ mergeBlock value ]. - acceptButton - label: 'Accept pull request'; - action: [ acceptBlock value ]. - rejectButton - label: 'Reject pull request'; - action: [ rejectBlock value ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onAccept..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onAccept..st deleted file mode 100644 index bb78061a5d..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onAccept..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -onAccept: aBlock - acceptBlock := aBlock \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onMerge..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onMerge..st deleted file mode 100644 index 978c3ec4e8..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onMerge..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -onMerge: aBlock - mergeBlock := aBlock \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onReject..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onReject..st deleted file mode 100644 index 5bdbc546a5..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/onReject..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -onReject: aBlock - rejectBlock := aBlock \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/README.md b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/README.md deleted file mode 100644 index 92d983f2e7..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/README.md +++ /dev/null @@ -1,2 +0,0 @@ -I'm a browser to show a pull request in detailt. -Since a PR is not much more than a branch, I extend the branch browser :) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/defaultExtent.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/defaultExtent.st deleted file mode 100644 index 3fc880b54a..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/defaultExtent.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -defaultExtent - ^ 850@600 \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/acceptPullRequest.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/acceptPullRequest.st deleted file mode 100644 index 09ad486d5d..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/acceptPullRequest.st +++ /dev/null @@ -1,10 +0,0 @@ -actions -acceptPullRequest - IceGitHubAcceptPullRequestModel new - onAccept: [ :model | - IceGitHubAPI ensureCredentials. - self pullRequest - acceptMessage: model message - type: model type ]; - openWithSpec - \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreeTo.with..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreeTo.with..st deleted file mode 100644 index 84d123f1e0..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreeTo.with..st +++ /dev/null @@ -1,14 +0,0 @@ -building -addChangesTreeTo: a with: commitInfo - (IceDiffChangeTreeBuilder new - entity: commitInfo; - diff: (commitInfo ifNotNil: [ commitInfo diffTo: (self mergeBaseCommitFor: commitInfo) ]); - buildOn: a) title: 'Changes vs. destination'. - (IceDiffChangeTreeBuilder new - entity: commitInfo; - diff: (commitInfo ifNotNil: [ commitInfo diffFromHead ]); - buildOn: a) title: 'Changes since selection'. - (IceDiffChangeTreeBuilder new - entity: commitInfo; - diff: (commitInfo ifNotNil: [ commitInfo diffToParent ]); - buildOn: a) title: 'Changes vs. parent' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreesTo..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreesTo..st deleted file mode 100644 index 823d5c0d31..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addChangesTreesTo..st +++ /dev/null @@ -1,7 +0,0 @@ -building -addChangesTreesTo: browser - browser transmit - from: #commits; - to: #changes; - andShow: [ :a :commitInfo | - self addChangesTreeTo: a with: commitInfo ]. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addCommitInfoTo..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addCommitInfoTo..st deleted file mode 100644 index 916d317e3c..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addCommitInfoTo..st +++ /dev/null @@ -1,9 +0,0 @@ -building -addCommitInfoTo: browser - browser transmit - from: #commits; - to: #diff; - andShow: [ :a | - a morph - title: 'Commit info'; - display: [ :commitInfo | self createCommitInfoFrom: commitInfo ] ]. diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addDiffTo..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addDiffTo..st deleted file mode 100644 index 46c9bf7595..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/addDiffTo..st +++ /dev/null @@ -1,14 +0,0 @@ -building -addDiffTo: browser - browser transmit - from: #commits; - from: #changes; - to: #diff; - andShow: [ :a | - a swappedColorDiff - title: 'Left: working copy / Right: incoming updates'; - display: [ :commitInfo :change | self buildDiffInput: change ]. - a morph - title: 'Commit info'; - display: [ :commitInfo | (IceCommitInfoModel for: commitInfo) buildWithSpec ] ] - \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/baseSHA.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/baseSHA.st deleted file mode 100644 index c6b1587b90..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/baseSHA.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -baseSHA - ^ self pullRequest baseSHA \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/buildDiffInput..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/buildDiffInput..st deleted file mode 100644 index 379fd56d14..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/buildDiffInput..st +++ /dev/null @@ -1,6 +0,0 @@ -building -buildDiffInput: change - ^ { - change myVersion ifNil: ''. - change theirVersion ifNil: '' - } diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/compose.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/compose.st deleted file mode 100644 index 4aff97c0d4..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/compose.st +++ /dev/null @@ -1,5 +0,0 @@ -building -compose - self tabulator with: [ :browser | - browser initialExtent: self initialExtent. - self composeBrowserOn: browser ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeBrowserOn..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeBrowserOn..st deleted file mode 100644 index 9f7a759060..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeBrowserOn..st +++ /dev/null @@ -1,24 +0,0 @@ -building -composeBrowserOn: browser - browser - row: [:row | - row - column: #commits; - column: #changes ]; - row: #diff; - row: #actions size: 35. - - browser transmit to: #commits; andShow: [ :a | self composeCommitsIn: a ]. - - self addChangesTreesTo: browser. - self addDiffTo: browser. - self addCommitInfoTo: browser. - - browser transmit to: #actions; andShow: [ :a | - a morph - morph: [ - IceGitHubPullRequestActionsModel new - onMerge: [ self mergePullRequestIntoImage ]; - onAccept: [ self acceptPullRequest ]; - onReject: [ self rejectPullRequest ]; - buildWithSpec ] ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeCommitsIn..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeCommitsIn..st deleted file mode 100644 index 06ebcef7df..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/composeCommitsIn..st +++ /dev/null @@ -1,35 +0,0 @@ -building -composeCommitsIn: composite - composite fastTable - title: 'Commits'; - display: #commits; - column: 'Date & time' - evaluated: [:commit | - commit datetime asLocalStringYMDHM asText - in: [ :text | - commit isMerged - ifTrue: [ text ] - ifFalse: [ text allBold ] ] ] - width: 120 * World displayScaleFactor; - column: 'Id' evaluated: [ :commit | - commit shortId asText in: [ :text | - commit isMerged - ifTrue: [ text ] - ifFalse: [ text allBold ] ] ] width: 50 * World displayScaleFactor; - column: 'Author' evaluated: [ :commit | - commit author asText in: [ :text | - commit isMerged - ifTrue: [ text ] - ifFalse: [ text allBold ] ] ] width: 120 * World displayScaleFactor; - column: 'Parents' evaluated: [ :commit | - (', ' join: commit ancestors) asText in: [ :text | - commit isMerged - ifTrue: [ text ] - ifFalse: [ text allBold ] ] ] width: 100 * World displayScaleFactor; - column: 'Comment' evaluated: [ :commit | - commit comment asText in: [ :text | - commit isMerged - ifTrue: [ text ] - ifFalse: [ text allBold ] ] ] width: 300 * World displayScaleFactor; - - addSelectionAction: self inspectAction diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/createCommitInfoFrom..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/createCommitInfoFrom..st deleted file mode 100644 index 6e7bc7a529..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/createCommitInfoFrom..st +++ /dev/null @@ -1,10 +0,0 @@ -building -createCommitInfoFrom: commitInfo - | info | - info := OrderedDictionary newFromPairs: { - 'Commit Id:'. commitInfo id asString, ' [', commitInfo shortId, ']'. - 'Ancestors(s):'. commitInfo ancestors asCommaString. - 'Timestamp:'. commitInfo datetime asLocalStringYMDHM. - 'Author:'. commitInfo author. - 'Comment:'. commitInfo comment }. - ^ (IceTipReadOnlyForm items: info) buildWithSpec \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/initialExtent.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/initialExtent.st deleted file mode 100644 index 507b9872a8..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/initialExtent.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -initialExtent - ^ self class defaultExtent \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/inspectAction.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/inspectAction.st deleted file mode 100644 index 894fe5ee20..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/inspectAction.st +++ /dev/null @@ -1,8 +0,0 @@ -action creations -inspectAction - ^ GLMGenericAction new - action: [ :presentation | presentation selection inspect ]; - shortcut: $i; - title: 'Inspect'; - yourself - diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseCommitFor..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseCommitFor..st deleted file mode 100644 index f371bcbfe0..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseCommitFor..st +++ /dev/null @@ -1,3 +0,0 @@ -actions -mergeBaseCommitFor: commitInfo - ^ commitInfo repository lookupCommit: (self mergeBaseFor: commitInfo) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseFor..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseFor..st deleted file mode 100644 index 7df9a6d6b9..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseFor..st +++ /dev/null @@ -1,8 +0,0 @@ -actions -mergeBaseFor: commitInfo - self flag: #bug. - "Should use #commonAncestorWith:" - - ^ commitInfo repository - mergeBaseBetween: commitInfo id - and: self baseSHA \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/open.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/open.st deleted file mode 100644 index 4c859547aa..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/open.st +++ /dev/null @@ -1,3 +0,0 @@ -scripting opening -open - self openOn: self pullRequest branch \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/titleIcon.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/titleIcon.st deleted file mode 100644 index f26803567e..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/titleIcon.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -titleIcon - ^ self class icon \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/properties.json deleted file mode 100644 index 9e9ad9e5c4..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "commentStamp" : "", - "super" : "GLMCompositePresentation", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "pullRequest" - ], - "name" : "IceGitHubPullRequestBrowser", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconForStatus..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconForStatus..st index 390e49fa88..6d375b0bd3 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconForStatus..st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconForStatus..st @@ -1,7 +1,3 @@ private iconForStatus: status - status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. - status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. - status = 'pending' ifTrue: [ ^ self iconNamed: #testYellow ]. - - ^ self iconNamed: #testNotRun \ No newline at end of file + ^ self iconNamed: (self iconNameForStatus: status) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconNameForStatus..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconNameForStatus..st new file mode 100644 index 0000000000..b16c6571df --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconNameForStatus..st @@ -0,0 +1,7 @@ +private +iconNameForStatus: status + status = 'success' ifTrue: [ ^ #testGreen ]. + status = 'failure' ifTrue: [ ^ #testRed ]. + status = 'pending' ifTrue: [ ^ #testYellow ]. + + ^ #testNotRun \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/for..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/for..st deleted file mode 100644 index 1e3d22b3e2..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/for..st +++ /dev/null @@ -1,5 +0,0 @@ -instance creation -for: aPullRequest - ^ self basicNew - initializePullRequest: aPullRequest; - yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/new.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/new.st deleted file mode 100644 index 3762f9549b..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/class/new.st +++ /dev/null @@ -1,3 +0,0 @@ -instance creation -new - self error: 'Use #for:' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initialize.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initialize.st deleted file mode 100644 index 1224bfef79..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initialize.st +++ /dev/null @@ -1,5 +0,0 @@ -initialization -initialize - super initialize. - self retrieveStatuses. - self retrieveDetail. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializePullRequest..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializePullRequest..st deleted file mode 100644 index 285ac7f5a4..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializePullRequest..st +++ /dev/null @@ -1,4 +0,0 @@ -initialization -initializePullRequest: aPullRequest - pullRequest := aPullRequest. - self initialize \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializeWidgets.st index afe71e7ecc..38da3f643b 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializeWidgets.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/initializeWidgets.st @@ -7,21 +7,11 @@ initializeWidgets mergeableLabel := self newLabel label: 'Mergeable'. statusLabel := self newLabel label: 'Status'. - urlText := self newTextInput - enabled: false; - text: self pullRequest url. - authorText := self newTextInput - enabled: false; - text: self pullRequest author. - fromText := self newTextInput - enabled: false; - text: self pullRequest headLabel. - toText := self newTextInput - enabled: false; - text: self pullRequest baseLabel. + urlText := self newTextInput enabled: false. + authorText := self newTextInput enabled: false. + fromText := self newTextInput enabled: false. + toText := self newTextInput enabled: false. mergeablePanel := self newMergeablePanel. statusPanel := self newStatusPanel. checksTable := self newChecksTable. - bodyText := self newText - enabled: false; - text: self pullRequest body. \ No newline at end of file + bodyText := self newText enabled: false. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/pullRequest..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/pullRequest..st new file mode 100644 index 0000000000..1c6826a1ce --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestDetailModel.class/instance/pullRequest..st @@ -0,0 +1,10 @@ +initialization +pullRequest: aPullRequest + pullRequest := aPullRequest. + urlText text: self pullRequest url. + authorText text: self pullRequest author. + fromText text: self pullRequest headLabel. + toText text: self pullRequest baseLabel. + bodyText text: self pullRequest body. + self retrieveStatuses. + self retrieveDetail \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/README.md b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/README.md deleted file mode 100644 index 2bd7636426..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I'm a browser to show all open pull requests in a repository. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/defaultExtent.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/defaultExtent.st deleted file mode 100644 index 6055a158e3..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/defaultExtent.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -defaultExtent - ^ 700@700 \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/buildOn..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/buildOn..st deleted file mode 100644 index 9c6ca9b160..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/buildOn..st +++ /dev/null @@ -1,25 +0,0 @@ -building -buildOn: browser - browser - row: #pullRequests; - row: #detail span: 2. - - browser transmit to: #pullRequests; andShow: [ :a | - a fastTable - title: 'Open pull requests'; - display: [ self pullRequests ]; - addAction: self refreshAction; - selectionAct: [ :presentation | - self viewPullRequest: presentation selection ] - entitled: 'Review pull request...'; - onChangeOfPort: #strongSelection act: [ :presentation | - self viewPullRequest: presentation selection ]; - column: '#' evaluated: #number width: 50; - column: 'State' evaluated: #state width: 50; - column: 'Author' evaluated: #author width: 120; - column: 'Title' evaluated: #title ]. - - browser transmit from: #pullRequests; to: #detail; andShow: [ :a | - a morph - title: [ :pr | '#{1} {2}' format: {pr number. pr title} ]; - morph: [ :presentation :pr | (IceGitHubPullRequestDetailModel for: pr) buildWithSpec ] ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/compose.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/compose.st deleted file mode 100644 index 8adb319b67..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/compose.st +++ /dev/null @@ -1,5 +0,0 @@ -building -compose - self tabulator with: [ :browser | - browser initialExtent: self initialExtent. - self buildOn: browser ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/initialExtent.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/initialExtent.st deleted file mode 100644 index 906bf6e3d8..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/initialExtent.st +++ /dev/null @@ -1,3 +0,0 @@ -api -initialExtent - ^ self class defaultExtent \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/open.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/open.st deleted file mode 100644 index b0da1b77d4..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/open.st +++ /dev/null @@ -1,3 +0,0 @@ -scripting opening -open - ^ self openOn: Object new \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshAction.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshAction.st deleted file mode 100644 index 28de672113..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshAction.st +++ /dev/null @@ -1,11 +0,0 @@ -building -refreshAction - ^ GLMGenericAction new - action: [ :presentation | - UIManager default - informUser: 'Refreshing pull request list' - during: [ self refreshPullRequests ]. - presentation update ]; - icon: (self iconNamed: #refresh); - title: 'Refresh'; - showTitle \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st deleted file mode 100644 index 6795bdd0ef..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st +++ /dev/null @@ -1,3 +0,0 @@ -actions -refreshPullRequests - self pullRequests: self fetchPullRequests \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository..st deleted file mode 100644 index 4fcd72fb51..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -repository: anObject - repository := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/titleIcon.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/titleIcon.st deleted file mode 100644 index f26803567e..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/titleIcon.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -titleIcon - ^ self class icon \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/viewPullRequest..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/viewPullRequest..st deleted file mode 100644 index 2ff6988227..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/viewPullRequest..st +++ /dev/null @@ -1,8 +0,0 @@ -actions -viewPullRequest: aPullRequest - UIManager default - informUser: ('Opening pull request {1} {2}' format: { aPullRequest number. aPullRequest title }) - during: [ - IceGitHubPullRequestBrowser new - pullRequest: aPullRequest; - open ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/properties.json deleted file mode 100644 index 454100a40a..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "commentStamp" : "", - "super" : "GLMCompositePresentation", - "category" : "Iceberg-Plugin-GitHub-Old", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "repository", - "remote", - "pullRequests" - ], - "name" : "IceGitHubPullRequestListBrowser", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubRemoveBranchesCommand.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubRemoveBranchesCommand.class/properties.json index ad6eb27ec7..1786d5a992 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubRemoveBranchesCommand.class/properties.json +++ b/Iceberg-Plugin-GitHub.package/IceGitHubRemoveBranchesCommand.class/properties.json @@ -5,10 +5,7 @@ "classinstvars" : [ ], "pools" : [ ], "classvars" : [ ], - "instvars" : [ - "branches", - "branchesByName" - ], + "instvars" : [ ], "name" : "IceGitHubRemoveBranchesCommand", "type" : "normal" } \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubSelectListModel.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubSelectListModel.class/properties.json index 296145a209..c4a4227f07 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubSelectListModel.class/properties.json +++ b/Iceberg-Plugin-GitHub.package/IceGitHubSelectListModel.class/properties.json @@ -9,7 +9,6 @@ "selectedItems", "listPanel", "selectButton", - "title", "acceptBlock" ], "name" : "IceGitHubSelectListModel", diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/README.md b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/README.md new file mode 100644 index 0000000000..def075d94c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/README.md @@ -0,0 +1,6 @@ +Description +-------------------- + +I a browser centered on a Pull Request. + +I display the list of commits of the PR for review, allow the user to merge the PR and to accept/reject it of the user has the rights on the repository. diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/defaultSpec.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/defaultSpec.st new file mode 100644 index 0000000000..d36555066c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/defaultSpec.st @@ -0,0 +1,19 @@ +specs +defaultSpec + ^ SpecLayout composed + newColumn: [ :mainC | + mainC + newRow: [ :row | + row + newColumn: [ :column | + column + newRow: #commitLabel height: self labelHeight; + newRow: #commits ] ]; + addHSplitter; + newRow: [ :row | row add: #diff ]; + newRow: [ :row | + row + add: #mergeButton; + add: #acceptButton; + add: #rejectButton ] height: self toolbarHeight ]; + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/on.pullRequest..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/on.pullRequest..st new file mode 100644 index 0000000000..18120588fa --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/on.pullRequest..st @@ -0,0 +1,7 @@ +instance creation +on: aModel pullRequest: aPullRequest + ^ self basicNew + pullRequest: aPullRequest; + setModelBeforeInitialization: aModel; + initialize; + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/icon.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/taskbarIcon.st similarity index 82% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/icon.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/taskbarIcon.st index cf3b7e9ee2..f6488d6595 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/class/icon.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/class/taskbarIcon.st @@ -1,3 +1,3 @@ accessing -icon +taskbarIcon ^ self iconNamed: #komitterSmalltalkhubRemote \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/acceptButton..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptButton..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/acceptButton..st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptButton..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/acceptButton.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptButton.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/acceptButton.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptButton.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptPullRequest.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptPullRequest.st new file mode 100644 index 0000000000..b0990bc79f --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/acceptPullRequest.st @@ -0,0 +1,7 @@ +actions +acceptPullRequest + IceGitHubAcceptPullRequestModel new + onAccept: [ :model | + IceGitHubAPI ensureCredentials. + self pullRequest acceptMessage: model message type: model type ]; + openWithSpec \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel..st new file mode 100644 index 0000000000..4bfd586ff1 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel..st @@ -0,0 +1,3 @@ +accessing +commitLabel: anObject + commitLabel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel.st new file mode 100644 index 0000000000..b2bc51b042 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commitLabel.st @@ -0,0 +1,3 @@ +accessing +commitLabel + ^ commitLabel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits..st new file mode 100644 index 0000000000..758990a94e --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits..st @@ -0,0 +1,3 @@ +accessing +commits: anObject + commits := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits.st new file mode 100644 index 0000000000..6213b8cd51 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/commits.st @@ -0,0 +1,3 @@ +accessing +commits + ^ commits \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/diff..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/diff..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/diff..st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/diff..st diff --git a/Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/diff.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/diff.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceDiffChangeTreeBuilder.class/instance/diff.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/diff.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initialExtent.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initialExtent.st new file mode 100644 index 0000000000..9cfa803acf --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initialExtent.st @@ -0,0 +1,3 @@ +api +initialExtent + ^ (1050 @ 800) scaledByDisplayScaleFactor \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeCommitsTable.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeCommitsTable.st new file mode 100644 index 0000000000..ad96e90bab --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeCommitsTable.st @@ -0,0 +1,16 @@ +initialization +initializeCommitsTable + | textStylingBlock | + textStylingBlock := [ :string :commit | + commit isMerged + ifTrue: [ string asText ] + ifFalse: [ string asText allBold ] ]. + + commits widget + beResizable; + addColumn: (IceTipTableColumn id: 'Date & time' action: [ :commit | textStylingBlock value: commit datetime asLocalStringYMDHM value: commit ] width: 120 * World displayScaleFactor); + addColumn: (IceTipTableColumn id: 'Id' action: [ :commit | textStylingBlock value: commit shortId value: commit ] width: 50 * World displayScaleFactor); + addColumn: (IceTipTableColumn id: 'Author' action: [ :commit | textStylingBlock value: commit author value: commit ] width: 120 * World displayScaleFactor); + addColumn: (IceTipTableColumn id: 'Comment' action: [ :commit | textStylingBlock value: commit comment value: commit ] width: 300 * World displayScaleFactor); + dataSource: self newCommitsDataSource; + selectRowIndex: 1 \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeDiff.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeDiff.st new file mode 100644 index 0000000000..904e9ce246 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeDiff.st @@ -0,0 +1,4 @@ +initialization +initializeDiff + diff beForMerge. + diff selectedModel: self commits widget dataSource elements anyOne \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializePresenter.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializePresenter.st new file mode 100644 index 0000000000..19111ef53c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializePresenter.st @@ -0,0 +1,8 @@ +initialization +initializePresenter + super initializePresenter. + self commits widget onAnnouncement: FTSelectionChanged send: #uptadeSelectedCommit: to: self. + + mergeButton action: [ self mergePullRequestIntoImage ]. + acceptButton action: [ self acceptPullRequest ]. + rejectButton action: [ self rejectPullRequest ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeWidgets.st new file mode 100644 index 0000000000..02d1ac6c04 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/initializeWidgets.st @@ -0,0 +1,22 @@ +initialization +initializeWidgets + commitLabel := self newLabel. + commits := self newIceTable. + diff := self instantiate: IceTipCommitInfoPresenter. + mergeButton := self newButton. + acceptButton := self newButton. + rejectButton := self newButton. + + commitLabel label: 'Commits'. + self initializeCommitsTable. + self initializeDiff. + mergeButton label: 'Merge into image'. + acceptButton label: 'Accept pull request'. + rejectButton label: 'Reject pull request'. + + self focusOrder + add: commits; + add: diff; + add: mergeButton; + add: acceptButton; + add: rejectButton \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/mergeButton..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergeButton..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/mergeButton..st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergeButton..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/mergeButton.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergeButton.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/mergeButton.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergeButton.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergePullRequestIntoImage.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergePullRequestIntoImage.st similarity index 74% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergePullRequestIntoImage.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergePullRequestIntoImage.st index 80245be739..cea60e8871 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergePullRequestIntoImage.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/mergePullRequestIntoImage.st @@ -1,8 +1,7 @@ actions mergePullRequestIntoImage - (UIManager default confirm: ('I will create a new local branch named {1}. Should I continue?' format: { self pullRequest branchName })) - ifFalse: [ ^ self ]. + (UIManager default confirm: ('I will create a new local branch named {1}. Should I continue?' format: { self pullRequest branchName })) ifFalse: [ ^ self ]. IceGitHubAPI ensureCredentials. - self pullRequest merge \ No newline at end of file + self pullRequest mergeIntoWorkingCopy \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newCommitsDataSource.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newCommitsDataSource.st new file mode 100644 index 0000000000..ed5c3281a5 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newCommitsDataSource.st @@ -0,0 +1,8 @@ +instance creation +newCommitsDataSource + | commitModels | + commitModels := self pullRequest commits collect: [ :each | (IceTipCommitModel repositoryModel: self repositoryModel on: each) beCached ]. + ^ IceTipDataSource new + tool: self; + elements: commitModels; + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContext.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContext.st new file mode 100644 index 0000000000..6e988f7044 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContext.st @@ -0,0 +1,3 @@ +accessing +newContext + ^ IceTipPullRequestsContext for: self \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContextWithSelection..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContextWithSelection..st new file mode 100644 index 0000000000..2564ea2d7d --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/newContextWithSelection..st @@ -0,0 +1,5 @@ +accessing +newContextWithSelection: aCommitModel + ^ self newContext + item: aCommitModel; + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/pullRequest..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/pullRequest..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/pullRequest..st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/pullRequest..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/pullRequest.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/pullRequest.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/pullRequest.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/pullRequest.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/rejectButton..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectButton..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/rejectButton..st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectButton..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/rejectButton.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectButton.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/instance/rejectButton.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectButton.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/rejectPullRequest.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectPullRequest.st similarity index 50% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/rejectPullRequest.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectPullRequest.st index 95f689001d..30ecb0b03e 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/rejectPullRequest.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/rejectPullRequest.st @@ -1,8 +1,7 @@ actions rejectPullRequest - IceGitHubRejectPullRequestModel new + IceGitHubRejectPullRequestModel new onAccept: [ :model | IceGitHubAPI ensureCredentials. - self pullRequest - rejectMessage: model message ]; + self pullRequest rejectMessage: model message ]; openWithSpec \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel..st new file mode 100644 index 0000000000..0ee8f74be7 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel..st @@ -0,0 +1,3 @@ +accessing +repositoryModel: anObject + repositoryModel := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel.st new file mode 100644 index 0000000000..e550ac4891 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/repositoryModel.st @@ -0,0 +1,3 @@ +accessing +repositoryModel + ^ repositoryModel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/setModelBeforeInitialization..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/setModelBeforeInitialization..st new file mode 100644 index 0000000000..40f42c4e73 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/setModelBeforeInitialization..st @@ -0,0 +1,3 @@ +model access +setModelBeforeInitialization: aModel + self repositoryModel: aModel \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/title.st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/title.st similarity index 70% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/title.st rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/title.st index 0f13a51b04..a3fc1bdca6 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/title.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/title.st @@ -1,3 +1,3 @@ accessing title - ^ 'Browsing pull request: #{1} {2}' format: { self pullRequest number. self pullRequest title } \ No newline at end of file + ^ 'Browsing pull request: #{1} {2}' format: { self pullRequest number. self pullRequest title } \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/uptadeSelectedCommit..st b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/uptadeSelectedCommit..st new file mode 100644 index 0000000000..addd84320c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/instance/uptadeSelectedCommit..st @@ -0,0 +1,3 @@ +initialization +uptadeSelectedCommit: anEvent + self diff selectedModel: (anEvent newSelectedRowIndexes ifNotEmpty: [ :indexes | (self commits widget dataSource elementAt: indexes first) ] ifEmpty: [ nil ]) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/properties.json b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/properties.json similarity index 53% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/properties.json rename to Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/properties.json index 390cdcf8bf..eacc957e48 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestActionsModel.class/properties.json +++ b/Iceberg-Plugin-GitHub.package/IceGitHubTipPullRequestBrowser.class/properties.json @@ -1,18 +1,20 @@ { - "commentStamp" : "", + "commentStamp" : "CyrilFerlicot 11/6/2018 11:20", "super" : "ComposablePresenter", "category" : "Iceberg-Plugin-GitHub-View", "classinstvars" : [ ], "pools" : [ ], "classvars" : [ ], "instvars" : [ + "repositoryModel", + "pullRequest", + "commitLabel", + "commits", + "diff", "mergeButton", "acceptButton", - "rejectButton", - "mergeBlock", - "acceptBlock", - "rejectBlock" + "rejectButton" ], - "name" : "IceGitHubPullRequestActionsModel", + "name" : "IceGitHubTipPullRequestBrowser", "type" : "normal" } \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubViewPullRequestAction.class/instance/basicExecute.st b/Iceberg-Plugin-GitHub.package/IceGitHubViewPullRequestAction.class/instance/basicExecute.st index dc764fbf89..fee1974f9b 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubViewPullRequestAction.class/instance/basicExecute.st +++ b/Iceberg-Plugin-GitHub.package/IceGitHubViewPullRequestAction.class/instance/basicExecute.st @@ -1,12 +1,10 @@ executing basicExecute credentials := IceGitHubAPI ensureCredentials. - - UIManager default - informUser: ('Retrieving pull requests from {1}' format: { self remote }) - during: [ - IceGitHubPullRequestListBrowser new - repository: self repository; + + UIManager default + informUser: ('Retrieving pull requests from {1}' format: {self remote}) + during: [ (IceTipGitHubPullRequestListBrowser onRepository: self repository) remote: self remote; refreshPullRequests; - open ] \ No newline at end of file + openWithSpec ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/class/defaultMenuIconName.st b/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/class/defaultMenuIconName.st index 6c4215c77d..c050337784 100644 --- a/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/class/defaultMenuIconName.st +++ b/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/class/defaultMenuIconName.st @@ -1,3 +1,3 @@ testing defaultMenuIconName - ^ #branch \ No newline at end of file + ^ #github \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/instance/defaultMenuIcon.st b/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/instance/defaultMenuIcon.st deleted file mode 100644 index 2ab976a7f8..0000000000 --- a/Iceberg-Plugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/instance/defaultMenuIcon.st +++ /dev/null @@ -1,4 +0,0 @@ -execution -defaultMenuIcon - - ^ self iconNamed: #github \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/README.md b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/README.md new file mode 100644 index 0000000000..2741acb03d --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I am a simple command to open the PR review tool. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestActivation.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestActivation.st new file mode 100644 index 0000000000..dfce01ace7 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestActivation.st @@ -0,0 +1,4 @@ +activation +browserPullRequestActivation + + ^ CmdContextMenuActivation byItemOf: CmdExtraMenuGroup for: IceTipRepositoryListContext \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestListContextActivation.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestListContextActivation.st new file mode 100644 index 0000000000..522b72a53d --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/browserPullRequestListContextActivation.st @@ -0,0 +1,4 @@ +activation +browserPullRequestListContextActivation + + ^ CmdContextMenuActivation byRootGroupItemOrder: 20 for: IceTipPullRequestsListContext \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/canBeExecutedInContext..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/canBeExecutedInContext..st new file mode 100644 index 0000000000..45bf165734 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/canBeExecutedInContext..st @@ -0,0 +1,3 @@ +testing +canBeExecutedInContext: aToolContext + ^ aToolContext item isNotNil \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultHelp.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultHelp.st new file mode 100644 index 0000000000..82477a817a --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultHelp.st @@ -0,0 +1,3 @@ +accessing +defaultHelp + ^ 'Open the Pull Request review tool' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuIconName.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuIconName.st new file mode 100644 index 0000000000..3a921cfc72 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuIconName.st @@ -0,0 +1,3 @@ +accessing +defaultMenuIconName + ^ #smallFind \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuItemName.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuItemName.st new file mode 100644 index 0000000000..871e25d9ff --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/class/defaultMenuItemName.st @@ -0,0 +1,3 @@ +accessing +defaultMenuItemName + ^ 'Review pull request' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/execute.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/execute.st new file mode 100644 index 0000000000..f53865cfd1 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/execute.st @@ -0,0 +1,3 @@ +execution +execute + tool viewPullRequest: item \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/readParametersFromContext..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/readParametersFromContext..st new file mode 100644 index 0000000000..c30389e12e --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/instance/readParametersFromContext..st @@ -0,0 +1,5 @@ +execution +readParametersFromContext: aToolContext + super readParametersFromContext: aToolContext. + item := aToolContext item. + tool := aToolContext tool \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/properties.json b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/properties.json new file mode 100644 index 0000000000..573e455ce3 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubOpenPullRequestBrowserCommand.class/properties.json @@ -0,0 +1,14 @@ +{ + "commentStamp" : "CyrilFerlicot 10/31/2018 15:10", + "super" : "IceTipCommand", + "category" : "Iceberg-Plugin-GitHub-Commands", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "item", + "tool" + ], + "name" : "IceTipGitHubOpenPullRequestBrowserCommand", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/README.md b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/README.md new file mode 100644 index 0000000000..2cc7170082 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/README.md @@ -0,0 +1,12 @@ +Description +-------------------- + +I am a spec presenter to show the list of PR available for a remote and informations on them. + +Internal Representation and Key Implementation Points. +-------------------- + + Instance Variables + details: A presenten showing the details for a PR. + pullRequests: An adaptor corresponding to a table containing the pull requests to view. + remote: The remote we should view the PR of. diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/defaultSpec.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/defaultSpec.st new file mode 100644 index 0000000000..52b03a621c --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/defaultSpec.st @@ -0,0 +1,9 @@ +specs +defaultSpec + ^ SpecLayout composed + newColumn: [ :mainColumn | + mainColumn + newRow: #toolbar height: IceTipToolbar defaultHeight; + newRow: #pullRequests height: 150; + addHSplitter; + newRow: #details ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/onRepository..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/onRepository..st new file mode 100644 index 0000000000..10715ebc13 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/onRepository..st @@ -0,0 +1,3 @@ +instance creation +onRepository: aRepository + ^ self on: (IceTipRepositoryModel on: aRepository) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/icon.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/taskbarIcon.st similarity index 82% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/icon.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/taskbarIcon.st index cf3b7e9ee2..f6488d6595 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/class/icon.st +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/class/taskbarIcon.st @@ -1,3 +1,3 @@ accessing -icon +taskbarIcon ^ self iconNamed: #komitterSmalltalkhubRemote \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/contextClass.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/contextClass.st new file mode 100644 index 0000000000..5b419c01dd --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/contextClass.st @@ -0,0 +1,3 @@ +accessing +contextClass + ^ IceTipPullRequestsListContext \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/details.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/details.st new file mode 100644 index 0000000000..55c4ca7063 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/details.st @@ -0,0 +1,3 @@ +accessing +details + ^ details \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st similarity index 83% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st index 92d36d26ae..79fe0a9bda 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/fetchPullRequests.st @@ -4,5 +4,5 @@ fetchPullRequests getPullRequests: self remote owner project: self remote projectName) all collect: [ :each | (IceGitHubPullRequest fromJSON: each) - repository: self repository; + repository: self repository entity; yourself ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initialExtent.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initialExtent.st new file mode 100644 index 0000000000..6cc3d45780 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initialExtent.st @@ -0,0 +1,3 @@ +api +initialExtent + ^ (700@700) scaledByDisplayScaleFactor \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePresenter.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePresenter.st new file mode 100644 index 0000000000..792fd46c73 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePresenter.st @@ -0,0 +1,5 @@ +initialization +initializePresenter + super initializePresenter. + self pullRequests widget onAnnouncement: FTSelectionChanged send: #uptadeSelectedPullRequest: to: self. + self pullRequests widget onAnnouncement: FTStrongSelectionChanged send: #strongSelection: to: self. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePullRequestsTable.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePullRequestsTable.st new file mode 100644 index 0000000000..e56a25f6b7 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializePullRequestsTable.st @@ -0,0 +1,28 @@ +initialization +initializePullRequestsTable + pullRequests widget + beResizable; + addColumn: + (IceTipTableColumn new + id: '#'; + action: [ :pullRequest | pullRequest number asString ]; + width: 50 * World displayScaleFactor; + yourself); + addColumn: + (IceTipTableColumn new + id: 'State'; + action: #state; + width: 50 * World displayScaleFactor; + yourself); + addColumn: + (IceTipTableColumn new + id: 'Author'; + action: #author; + width: 120 * World displayScaleFactor; + yourself); + addColumn: + (IceTipTableColumn new + id: 'Title'; + action: #title; + yourself); + dataSource: self newPullRequestsDataSource \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializeWidgets.st new file mode 100644 index 0000000000..7087499e2a --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/initializeWidgets.st @@ -0,0 +1,11 @@ +initialization +initializeWidgets + super initializeWidgets. + pullRequests := self newIceTable. + details := self instantiate: IceGitHubPullRequestDetailModel. + + self initializePullRequestsTable. + + self focusOrder + add: pullRequests; + add: details \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newContextWithSelection..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newContextWithSelection..st new file mode 100644 index 0000000000..4f09ff6c24 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newContextWithSelection..st @@ -0,0 +1,5 @@ +private +newContextWithSelection: anObject + ^ self newContext + item: anObject; + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newPullRequestsDataSource.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newPullRequestsDataSource.st new file mode 100644 index 0000000000..d6ba88ed46 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/newPullRequestsDataSource.st @@ -0,0 +1,6 @@ +initialization +newPullRequestsDataSource + ^ IceTipDataSource new + tool: self; + elements: #(); + yourself \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/pullRequests..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/pullRequests..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/pullRequests..st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/pullRequests..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/pullRequests.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/pullRequests.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/pullRequests.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/pullRequests.st diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st new file mode 100644 index 0000000000..518a2d7210 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/refreshPullRequests.st @@ -0,0 +1,7 @@ +actions +refreshPullRequests + | table | + table := self pullRequests widget. + table dataSource elements: self fetchPullRequests. + (table hasSelection not and: [ table dataSource hasElements ]) + ifTrue: [ table selectRowIndex: 1 ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/remote..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/remote..st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/remote..st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/remote..st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/remote.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/remote.st similarity index 100% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/remote.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/remote.st diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/repository.st similarity index 61% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/repository.st index 5be9763862..522d37510d 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/repository.st +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/repository.st @@ -1,3 +1,3 @@ accessing repository - ^ repository \ No newline at end of file + ^ model \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/selectedPullRequest.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/selectedPullRequest.st new file mode 100644 index 0000000000..f35014d361 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/selectedPullRequest.st @@ -0,0 +1,5 @@ +accessing +selectedPullRequest + | table | + table := self pullRequests widget. + ^ table dataSource elementAt: table selectedRowIndex \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/strongSelection..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/strongSelection..st new file mode 100644 index 0000000000..94a619d071 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/strongSelection..st @@ -0,0 +1,3 @@ +as yet unclassified +strongSelection: anEvent + self viewPullRequest: (self pullRequests widget dataSource elementAt: anEvent selectedRowIndex) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/title.st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/title.st similarity index 72% rename from Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/title.st rename to Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/title.st index 2a671af2f0..399b1e4a46 100644 --- a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestListBrowser.class/instance/title.st +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/title.st @@ -1,3 +1,3 @@ -accessing +initialization title - ^ 'Pull requests on {1} ({2})' format: { self remote name. self remote url } \ No newline at end of file + ^ 'Pull requests on {1} ({2})' format: { self remote name. self remote url} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/uptadeSelectedPullRequest..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/uptadeSelectedPullRequest..st new file mode 100644 index 0000000000..f46dcf7334 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/uptadeSelectedPullRequest..st @@ -0,0 +1,3 @@ +as yet unclassified +uptadeSelectedPullRequest: anEvent + self details pullRequest: (anEvent newSelectedRowIndexes ifNotEmpty: [ :indexes | self pullRequests widget dataSource elementAt: indexes first ] ifEmpty: [ IceGitHubNilPullRequest new ]) \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/viewPullRequest..st b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/viewPullRequest..st new file mode 100644 index 0000000000..af6aaf7e1f --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/instance/viewPullRequest..st @@ -0,0 +1,11 @@ +actions +viewPullRequest: aPullRequest + UIManager default + informUser: + ('Opening pull request {1} {2}' + format: + {aPullRequest number. + aPullRequest title}) + during: [ "IceGitHubPullRequestBrowser new + pullRequest: aPullRequest; + open" (IceGitHubTipPullRequestBrowser on: self model pullRequest: aPullRequest) openWithSpec ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/properties.json b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/properties.json new file mode 100644 index 0000000000..13aa319ecd --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipGitHubPullRequestListBrowser.class/properties.json @@ -0,0 +1,15 @@ +{ + "commentStamp" : "CyrilFerlicot 10/31/2018 15:13", + "super" : "IceTipBrowser", + "category" : "Iceberg-Plugin-GitHub-View", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "remote", + "pullRequests", + "details" + ], + "name" : "IceTipGitHubPullRequestListBrowser", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/class/browserPullRequestListContextActivation.st b/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/class/browserPullRequestListContextActivation.st new file mode 100644 index 0000000000..e59ab8a72b --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/class/browserPullRequestListContextActivation.st @@ -0,0 +1,5 @@ +*Iceberg-Plugin-GitHub +browserPullRequestListContextActivation + + + ^ CmdContextMenuActivation byRootGroupItemFor: IceTipPullRequestsContext \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/properties.json b/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/properties.json new file mode 100644 index 0000000000..f693ab39b8 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipInspectCommand.extension/properties.json @@ -0,0 +1,3 @@ +{ + "name" : "IceTipInspectCommand" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/README.md b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/README.md new file mode 100644 index 0000000000..985173f167 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I am a simple context for the pull request review browser. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item..st b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item..st new file mode 100644 index 0000000000..4322558210 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item..st @@ -0,0 +1,3 @@ +accessing +item: anObject + item := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item.st b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item.st new file mode 100644 index 0000000000..dd9bcc9514 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/instance/item.st @@ -0,0 +1,3 @@ +accessing +item + ^ item \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/properties.json b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/properties.json new file mode 100644 index 0000000000..9b05d3a475 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsContext.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "CyrilFerlicot 11/6/2018 11:14", + "super" : "IceTipContext", + "category" : "Iceberg-Plugin-GitHub-Commands", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "item" + ], + "name" : "IceTipPullRequestsContext", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/README.md b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/README.md new file mode 100644 index 0000000000..a75b9b2367 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I am a simple context for the github pull requests browser. \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item..st b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item..st new file mode 100644 index 0000000000..4322558210 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item..st @@ -0,0 +1,3 @@ +accessing +item: anObject + item := anObject \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item.st b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item.st new file mode 100644 index 0000000000..dd9bcc9514 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/instance/item.st @@ -0,0 +1,3 @@ +accessing +item + ^ item \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/properties.json b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/properties.json new file mode 100644 index 0000000000..79d226d753 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipPullRequestsListContext.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "CyrilFerlicot 10/31/2018 15:11", + "super" : "IceTipContext", + "category" : "Iceberg-Plugin-GitHub-Commands", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "item" + ], + "name" : "IceTipPullRequestsListContext", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/README.md b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/README.md new file mode 100644 index 0000000000..202ab72efa --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I am a simple command to refresh the content of the github pull requests browser \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultHelp.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultHelp.st new file mode 100644 index 0000000000..81be6bbe89 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultHelp.st @@ -0,0 +1,3 @@ +accessing +defaultHelp + ^ 'Refresh the pull requests availables' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuIconName.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuIconName.st new file mode 100644 index 0000000000..2b09440fd9 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuIconName.st @@ -0,0 +1,3 @@ +accessing +defaultMenuIconName + ^ #glamorousRefresh \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuItemName.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuItemName.st new file mode 100644 index 0000000000..0c99e3c161 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultMenuItemName.st @@ -0,0 +1,3 @@ +accessing +defaultMenuItemName + ^ 'Refresh' \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultPosition.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultPosition.st new file mode 100644 index 0000000000..7512d71084 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/defaultPosition.st @@ -0,0 +1,3 @@ +accessing +defaultPosition + ^ #right \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/toolbarCommitActivation.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/toolbarCommitActivation.st new file mode 100644 index 0000000000..fa020aacb2 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/class/toolbarCommitActivation.st @@ -0,0 +1,5 @@ +activation +toolbarCommitActivation + + + ^ IceTipToolbarActivation byRootGroupItemFor: IceTipPullRequestsListContext \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/execute.st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/execute.st new file mode 100644 index 0000000000..4649424401 --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/execute.st @@ -0,0 +1,5 @@ +execution +execute + UIManager default + informUser: 'Refreshing pull request list' + during: [ tool refreshPullRequests ] \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/readParametersFromContext..st b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/readParametersFromContext..st new file mode 100644 index 0000000000..444d63f57d --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/instance/readParametersFromContext..st @@ -0,0 +1,4 @@ +execution +readParametersFromContext: aToolContext + super readParametersFromContext: aToolContext. + tool := aToolContext tool \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/properties.json b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/properties.json new file mode 100644 index 0000000000..aa88ce42ae --- /dev/null +++ b/Iceberg-Plugin-GitHub.package/IceTipRefreshPullRequestsCommand.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "CyrilFerlicot 10/31/2018 15:09", + "super" : "IceTipCommand", + "category" : "Iceberg-Plugin-GitHub-Commands", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "tool" + ], + "name" : "IceTipRefreshPullRequestsCommand", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-Plugin-GitHub.package/monticello.meta/categories.st b/Iceberg-Plugin-GitHub.package/monticello.meta/categories.st index 60b44d0dde..14761b8cdd 100644 --- a/Iceberg-Plugin-GitHub.package/monticello.meta/categories.st +++ b/Iceberg-Plugin-GitHub.package/monticello.meta/categories.st @@ -1,7 +1,7 @@ SystemOrganization addCategory: #'Iceberg-Plugin-GitHub'! -SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Authentication'! SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Commands'! +SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Core'! +SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Manifest'! SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Model'! -SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Old'! SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Utils'! SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-View'! diff --git a/Iceberg-Plugin-Pharo.package/IcePharoMenuGroup.class/instance/icon.st b/Iceberg-Plugin-Pharo.package/IcePharoMenuGroup.class/instance/icon.st index cdec011566..fcff738d1d 100644 --- a/Iceberg-Plugin-Pharo.package/IcePharoMenuGroup.class/instance/icon.st +++ b/Iceberg-Plugin-Pharo.package/IcePharoMenuGroup.class/instance/icon.st @@ -1,4 +1,3 @@ accessing icon - - ^ (Smalltalk ui iconNamed: #pharo) scaledToSize: 16@16 \ No newline at end of file + ^ (self iconNamed: #pharo) scaledToSize: 16 @ 16 \ No newline at end of file diff --git a/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/class/defaultMenuIconName.st b/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/class/defaultMenuIconName.st index 6c4215c77d..77bc227aab 100644 --- a/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/class/defaultMenuIconName.st +++ b/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/class/defaultMenuIconName.st @@ -1,3 +1,3 @@ testing defaultMenuIconName - ^ #branch \ No newline at end of file + ^ #pharo \ No newline at end of file diff --git a/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/instance/defaultMenuIcon.st b/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/instance/defaultMenuIcon.st deleted file mode 100644 index 7f0a654f1d..0000000000 --- a/Iceberg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/instance/defaultMenuIcon.st +++ /dev/null @@ -1,4 +0,0 @@ -execution -defaultMenuIcon - - ^ (Smalltalk ui iconNamed: #pharo) scaledToSize: 16@16 \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceClassDefinition.extension/instance/icon.st b/Iceberg-TipUI.package/IceClassDefinition.extension/instance/icon.st index ed90948775..d8e7f81078 100644 --- a/Iceberg-TipUI.package/IceClassDefinition.extension/instance/icon.st +++ b/Iceberg-TipUI.package/IceClassDefinition.extension/instance/icon.st @@ -1,4 +1,3 @@ *Iceberg-TipUI icon - - ^ Smalltalk ui icons iconNamed: #class \ No newline at end of file + ^ self iconNamed: #class \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceConflictingOperation.extension/instance/operationIcon.st b/Iceberg-TipUI.package/IceConflictingOperation.extension/instance/operationIcon.st index 1419ab9519..19086ad3c8 100644 --- a/Iceberg-TipUI.package/IceConflictingOperation.extension/instance/operationIcon.st +++ b/Iceberg-TipUI.package/IceConflictingOperation.extension/instance/operationIcon.st @@ -1,4 +1,3 @@ *Iceberg-TipUI operationIcon - - ^ Smalltalk ui icons iconNamed: #changeUpdate \ No newline at end of file + ^ self iconNamed: #changeUpdate \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceDefinition.extension/instance/iconNamed..st b/Iceberg-TipUI.package/IceDefinition.extension/instance/iconNamed..st new file mode 100644 index 0000000000..6f1079b303 --- /dev/null +++ b/Iceberg-TipUI.package/IceDefinition.extension/instance/iconNamed..st @@ -0,0 +1,3 @@ +*Iceberg-TipUI +iconNamed: aSymbol + ^ Smalltalk ui icons iconNamed: aSymbol \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceExtensionDefinition.extension/instance/icon.st b/Iceberg-TipUI.package/IceExtensionDefinition.extension/instance/icon.st index 3e819126d7..09e16a9938 100644 --- a/Iceberg-TipUI.package/IceExtensionDefinition.extension/instance/icon.st +++ b/Iceberg-TipUI.package/IceExtensionDefinition.extension/instance/icon.st @@ -1,4 +1,3 @@ *Iceberg-TipUI icon - - ^ Smalltalk ui icons iconNamed: #group \ No newline at end of file + ^ self iconNamed: #group \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceOperationMerge.extension/instance/icon.st b/Iceberg-TipUI.package/IceOperationMerge.extension/instance/icon.st index 139673caea..21705a9cf9 100644 --- a/Iceberg-TipUI.package/IceOperationMerge.extension/instance/icon.st +++ b/Iceberg-TipUI.package/IceOperationMerge.extension/instance/icon.st @@ -1,8 +1,7 @@ *Iceberg-TipUI icon - self isRightChosen ifTrue: [ - ^ Smalltalk ui icons iconNamed: #changeBlock ]. - self isLeftChosen ifTrue: [ - ^ Smalltalk ui icons iconNamed: #forward ]. + self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. + self isLeftChosen ifTrue: [ ^ self iconNamed: #forward ]. + ^ self operationIcon \ No newline at end of file diff --git a/Iceberg-TipUI.package/IcePackageDefinition.extension/instance/icon.st b/Iceberg-TipUI.package/IcePackageDefinition.extension/instance/icon.st index e663f7bdac..f76ea5930b 100644 --- a/Iceberg-TipUI.package/IcePackageDefinition.extension/instance/icon.st +++ b/Iceberg-TipUI.package/IcePackageDefinition.extension/instance/icon.st @@ -1,4 +1,3 @@ *Iceberg-TipUI icon - - ^ Smalltalk ui icons iconNamed: #dirtyMonticelloPackage \ No newline at end of file + ^ self iconNamed: #dirtyMonticelloPackage \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipAction.class/class/iconNamed..st b/Iceberg-TipUI.package/IceTipAction.class/class/iconNamed..st new file mode 100644 index 0000000000..586156e4ed --- /dev/null +++ b/Iceberg-TipUI.package/IceTipAction.class/class/iconNamed..st @@ -0,0 +1,3 @@ +accessing +iconNamed: aSymbol + ^ Smalltalk ui icons iconNamed: aSymbol \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipBranchModel.class/instance/commits.st b/Iceberg-TipUI.package/IceTipBranchModel.class/instance/commits.st new file mode 100644 index 0000000000..08fcf569ad --- /dev/null +++ b/Iceberg-TipUI.package/IceTipBranchModel.class/instance/commits.st @@ -0,0 +1,3 @@ +accessing +commits + self shouldBeImplemented. \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipBrowser.class/instance/iconNamed..st b/Iceberg-TipUI.package/IceTipBrowser.class/instance/iconNamed..st new file mode 100644 index 0000000000..586156e4ed --- /dev/null +++ b/Iceberg-TipUI.package/IceTipBrowser.class/instance/iconNamed..st @@ -0,0 +1,3 @@ +accessing +iconNamed: aSymbol + ^ Smalltalk ui icons iconNamed: aSymbol \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/README.md b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/README.md new file mode 100644 index 0000000000..32a9055256 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/README.md @@ -0,0 +1,6 @@ +Description +-------------------- + +I'm a panel to show the history of a commitish (usually a branch or a tag). I display infos on it and diffs. + +I'm usually used as part of an IceTipHistoryBrowser. \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/class/defaultSpec.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/class/defaultSpec.st new file mode 100644 index 0000000000..7480bc5f3e --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/class/defaultSpec.st @@ -0,0 +1,6 @@ +specs +defaultSpec + + ^ SpecLayout composed + add: #commitTabPanel; + yourself \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForCommit.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForCommit.st similarity index 96% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForCommit.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForCommit.st index 300573bfb7..863d718ca9 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForCommit.st +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForCommit.st @@ -1,4 +1,4 @@ accessing beForCommit headTabContainer := IceTipHistoryDiffFromHead tab: headTab. - ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorTab. \ No newline at end of file + ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorTab \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForMerge.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForMerge.st new file mode 100644 index 0000000000..6dd705c9ed --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/beForMerge.st @@ -0,0 +1,4 @@ +accessing +beForMerge + headTabContainer := IceTipHistoryDiffToHead tab: headTab. + ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorTab \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitTabPanel..st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/commitTabPanel..st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitTabPanel..st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/commitTabPanel..st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitTabPanel.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/commitTabPanel.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitTabPanel.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/commitTabPanel.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initialize.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initialize.st similarity index 80% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initialize.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initialize.st index 50d1411ada..4aea41ee40 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initialize.st +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initialize.st @@ -1,4 +1,4 @@ initialization -initialize +initialize self beForCommit. super initialize \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeCommitPanel.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initializeCommitPanel.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeCommitPanel.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initializeCommitPanel.st diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initializeWidgets.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initializeWidgets.st new file mode 100644 index 0000000000..64acf52f23 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/initializeWidgets.st @@ -0,0 +1,7 @@ +initialization +initializeWidgets + commitTabPanel := self newTabManager. + + self initializeCommitPanel. + + self focusOrder add: commitTabPanel \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newDiffTab.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newDiffTab.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newDiffTab.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newDiffTab.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newEmptyTab.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newEmptyTab.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newEmptyTab.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newEmptyTab.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newInfoTab.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newInfoTab.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/newInfoTab.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/newInfoTab.st diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refresh.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refresh.st new file mode 100644 index 0000000000..64d2c2d3e5 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refresh.st @@ -0,0 +1,3 @@ +accessing +refresh + selectedModel ifNotNil: [ self showInfoTabs ] ifNil: [ self showEmptyTab ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshCommitInfo.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshCommitInfo.st new file mode 100644 index 0000000000..f3b3272f2e --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshCommitInfo.st @@ -0,0 +1,3 @@ +private +refreshCommitInfo + infoTab contents: (selectedModel info ifNotNil: [ (IceTipReadOnlyForm items: selectedModel info) buildWithSpec ]) \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromAncestor.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromAncestor.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromAncestor.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromAncestor.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromAncestorLabel.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromAncestorLabel.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromAncestorLabel.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromAncestorLabel.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromHead.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromHead.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromHead.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromHead.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromHeadLabel.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromHeadLabel.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshDiffFromHeadLabel.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/refreshDiffFromHeadLabel.st diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/removeAllCommitPanelTabs.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/removeAllCommitPanelTabs.st new file mode 100644 index 0000000000..edd56c569a --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/removeAllCommitPanelTabs.st @@ -0,0 +1,3 @@ +private +removeAllCommitPanelTabs + commitTabPanel tabs copy do: [ :each | commitTabPanel removeTab: each ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/selectedModel..st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/selectedModel..st new file mode 100644 index 0000000000..214969349e --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/selectedModel..st @@ -0,0 +1,4 @@ +accessing +selectedModel: aModel + selectedModel := aModel. + self refresh \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/setModelBeforeInitialization..st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/setModelBeforeInitialization..st new file mode 100644 index 0000000000..ba8505a682 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/setModelBeforeInitialization..st @@ -0,0 +1,3 @@ +model access +setModelBeforeInitialization: anObject + model := anObject \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/showEmptyTab.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/showEmptyTab.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/showEmptyTab.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/showEmptyTab.st diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/showInfoTabs.st b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/showInfoTabs.st similarity index 100% rename from Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/showInfoTabs.st rename to Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/instance/showInfoTabs.st diff --git a/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/properties.json b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/properties.json new file mode 100644 index 0000000000..2c52a827cd --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitInfoPresenter.class/properties.json @@ -0,0 +1,21 @@ +{ + "commentStamp" : "CyrilFerlicot 11/6/2018 11:23", + "super" : "ComposablePresenter", + "category" : "Iceberg-TipUI-View", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ + "model", + "selectedModel", + "commitTabPanel", + "infoTab", + "emptyTab", + "headTabContainer", + "ancestorTabContainer", + "headTab", + "ancestorTab" + ], + "name" : "IceTipCommitInfoPresenter", + "type" : "normal" +} \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitModel.class/instance/ancestors.st b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/ancestors.st new file mode 100644 index 0000000000..623f9cc8c1 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/ancestors.st @@ -0,0 +1,3 @@ +accessing +ancestors + ^ self entity ancestors \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitModel.class/instance/comment.st b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/comment.st new file mode 100644 index 0000000000..aedbe3c079 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/comment.st @@ -0,0 +1,3 @@ +accessing +comment + ^ self entity comment \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitModel.class/instance/datetime.st b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/datetime.st new file mode 100644 index 0000000000..ecb2f66ba9 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/datetime.st @@ -0,0 +1,3 @@ +accessing +datetime + ^ self entity datetime \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipCommitModel.class/instance/isMerged.st b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/isMerged.st new file mode 100644 index 0000000000..6dc03582e4 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipCommitModel.class/instance/isMerged.st @@ -0,0 +1,3 @@ +testing +isMerged + ^ self entity isMerged \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipComposablePresenter.class/class/iconNamed..st b/Iceberg-TipUI.package/IceTipComposablePresenter.class/class/iconNamed..st new file mode 100644 index 0000000000..586156e4ed --- /dev/null +++ b/Iceberg-TipUI.package/IceTipComposablePresenter.class/class/iconNamed..st @@ -0,0 +1,3 @@ +accessing +iconNamed: aSymbol + ^ Smalltalk ui icons iconNamed: aSymbol \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipComposablePresenter.class/instance/iconNamed..st b/Iceberg-TipUI.package/IceTipComposablePresenter.class/instance/iconNamed..st new file mode 100644 index 0000000000..5d6b132d3a --- /dev/null +++ b/Iceberg-TipUI.package/IceTipComposablePresenter.class/instance/iconNamed..st @@ -0,0 +1,3 @@ +accessing +iconNamed: aSymbol + ^ self class iconNamed: aSymbol \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/defaultSpec.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/defaultSpec.st index 46dc392d24..fd5e50240f 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/defaultSpec.st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/defaultSpec.st @@ -8,4 +8,4 @@ defaultSpec newRow: #toolbar height: IceTipToolbar defaultHeight; newRow: #commitList; addHSplitter; - newRow: #commitTabPanel ] \ No newline at end of file + newRow: #commitInfoTabs ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/onBranch..st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/onBranch..st deleted file mode 100644 index 78f8caa6bf..0000000000 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/onBranch..st +++ /dev/null @@ -1,6 +0,0 @@ -instance creation -onBranch: aBranch - ^ self on: (IceTipBranchModel - repositoryModel: (IceTipRepositoryModel on: aBranch repository) beCached - on: aBranch) - beCached \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/panelSpec.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/panelSpec.st index bc04a8a786..d7b5baa35a 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/panelSpec.st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/class/panelSpec.st @@ -7,4 +7,4 @@ panelSpec column newRow: #commitList; addHSplitter; - newRow: #commitTabPanel ] \ No newline at end of file + newRow: #commitInfoTabs ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForMerge.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForMerge.st index 0ae28efd94..b24b602c60 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForMerge.st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/beForMerge.st @@ -1,4 +1,3 @@ accessing beForMerge - headTabContainer := IceTipHistoryDiffToHead tab: headTab. - ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorTab. \ No newline at end of file + self commitInfoTabs beForMerge \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs..st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs..st new file mode 100644 index 0000000000..d45a1d5545 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs..st @@ -0,0 +1,3 @@ +accessing +commitInfoTabs: anObject + commitInfoTabs := anObject \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs.st new file mode 100644 index 0000000000..64097a3a14 --- /dev/null +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/commitInfoTabs.st @@ -0,0 +1,3 @@ +accessing +commitInfoTabs + ^ commitInfoTabs \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeWidgets.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeWidgets.st index 70f948534e..1d359be3bd 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeWidgets.st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/initializeWidgets.st @@ -2,10 +2,9 @@ initialization initializeWidgets super initializeWidgets. commitList := self newIceTable. - commitTabPanel := self newTabManager. + commitInfoTabs := self instantiate: IceTipCommitInfoPresenter. self initializeCommitList. - self initializeCommitPanel. commitList widget onAnnouncement: FTSelectionChanged @@ -14,6 +13,6 @@ initializeWidgets self focusOrder add: commitList; - add: commitTabPanel. + add: commitInfoTabs. self refresh \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refresh.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refresh.st index ac2342d141..87200866f7 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refresh.st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refresh.st @@ -1,9 +1,8 @@ accessing refresh - commitList widget - in: [ :this | this dataSource elements: self model commitModels ]; + | commitModels | + commitModels := self model commitModels. + commitList widget + in: [ :this | this dataSource elements: commitModels ]; refresh. - selectedModel := self model commitModels - ifNotEmpty: #first - ifEmpty: [ nil ]. - self refreshCommitTabPanel \ No newline at end of file + commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitInfo.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitInfo.st deleted file mode 100644 index f51014c851..0000000000 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitInfo.st +++ /dev/null @@ -1,4 +0,0 @@ -private -refreshCommitInfo - infoTab contents: (selectedModel info - ifNotNil: [ (IceTipReadOnlyForm items: selectedModel info) buildWithSpec ]) \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitTabPanel.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitTabPanel.st deleted file mode 100644 index 424c957eec..0000000000 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/refreshCommitTabPanel.st +++ /dev/null @@ -1,5 +0,0 @@ -private -refreshCommitTabPanel - selectedModel - ifNotNil: [ self showInfoTabs ] - ifNil: [ self showEmptyTab ]. \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/removeAllCommitPanelTabs.st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/removeAllCommitPanelTabs.st deleted file mode 100644 index c1c0372b8f..0000000000 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/removeAllCommitPanelTabs.st +++ /dev/null @@ -1,4 +0,0 @@ -private -removeAllCommitPanelTabs - commitTabPanel tabs copy - do: [ :each | commitTabPanel removeTab: each ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/selectionChanged..st b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/selectionChanged..st index b3e157acf5..33397fa6bb 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/selectionChanged..st +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/instance/selectionChanged..st @@ -1,6 +1,3 @@ event handling selectionChanged: ann - selectedModel := ann newSelectedRowIndexes - ifNotEmpty: [ :indexes |(self commitList widget dataSource elementAt: indexes first) ] - ifEmpty: [ nil ]. - self refreshCommitTabPanel \ No newline at end of file + commitInfoTabs selectedModel: (ann newSelectedRowIndexes ifNotEmpty: [ :indexes | self commitList widget dataSource elementAt: indexes first ] ifEmpty: [ nil ]) \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/properties.json b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/properties.json index c163b9a689..4805c27987 100644 --- a/Iceberg-TipUI.package/IceTipHistoryBrowser.class/properties.json +++ b/Iceberg-TipUI.package/IceTipHistoryBrowser.class/properties.json @@ -6,15 +6,8 @@ "pools" : [ ], "classvars" : [ ], "instvars" : [ - "selectedModel", "commitList", - "commitTabPanel", - "infoTab", - "emptyTab", - "headTabContainer", - "ancestorTabContainer", - "headTab", - "ancestorTab" + "commitInfoTabs" ], "name" : "IceTipHistoryBrowser", "type" : "normal" diff --git a/Iceberg-TipUI.package/IceTipRepositoryBrowser.class/instance/newSidebarTreeDataSource.st b/Iceberg-TipUI.package/IceTipRepositoryBrowser.class/instance/newSidebarTreeDataSource.st index f98373b593..54efdaed8d 100644 --- a/Iceberg-TipUI.package/IceTipRepositoryBrowser.class/instance/newSidebarTreeDataSource.st +++ b/Iceberg-TipUI.package/IceTipRepositoryBrowser.class/instance/newSidebarTreeDataSource.st @@ -1,6 +1,6 @@ private factory newSidebarTreeDataSource - ^ IceTipTreeOutlineDataSource new + ^ IceTipTreeDataSource new tool: self; rootForItems: self model repositoryModelsByGroup; childrenBlock: [ :each | each children ]; diff --git a/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/repositoryModelsByGroup.st b/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/repositoryModelsByGroup.st index 68fbb7af9b..6158c18f46 100644 --- a/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/repositoryModelsByGroup.st +++ b/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/repositoryModelsByGroup.st @@ -12,12 +12,6 @@ repositoryModelsByGroup select: [ :each | each entity isLocal ] thenCollect: [ :each | IceTipTreeBranch on: each ]); yourself. - "Tags group" - (IceTipTreeRepositoryGroup on: self) - name: 'Tags'; - icon: (self iconNamed: #glamorousBookmark); - children: (tags collect: [ :each | IceTipTreeTag on: each ]); - yourself. "Remotes group" (IceTipTreeRepositoryGroup on: self) name: 'Remotes'; @@ -33,4 +27,10 @@ repositoryModelsByGroup thenCollect: [ :each | IceTipTreeBranch on: each ]); yourself ]); yourself. + "Tags group" + (IceTipTreeRepositoryGroup on: self) + name: 'Tags'; + icon: (self iconNamed: #glamorousBookmark); + children: (tags collect: [ :each | IceTipTreeTag on: each ]); + yourself. } \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipTableColumn.class/class/id.action.width..st b/Iceberg-TipUI.package/IceTipTableColumn.class/class/id.action.width..st new file mode 100644 index 0000000000..b2300f62ea --- /dev/null +++ b/Iceberg-TipUI.package/IceTipTableColumn.class/class/id.action.width..st @@ -0,0 +1,7 @@ +instance creation +id: aString action: aBlock width: aNumber + ^ self new + id: aString; + action: aBlock; + width: aNumber; + yourself \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/README.md b/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/README.md deleted file mode 100644 index a2a17cf4a7..0000000000 --- a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I'm a tree datasource to generate an Outline component. diff --git a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellColumn.row..st b/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellColumn.row..st deleted file mode 100644 index a3d7d0c8e1..0000000000 --- a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellColumn.row..st +++ /dev/null @@ -1,8 +0,0 @@ -accessing -cellColumn: column row: rowIndex - | item | - - item := self elementAt: rowIndex. - ^ item depth = 0 - ifTrue: [ self newRootCellFor: item ] - ifFalse: [ self newCellFor: item ] \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellIndentFor..st b/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellIndentFor..st deleted file mode 100644 index b08be96e7c..0000000000 --- a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellIndentFor..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -cellIndentFor: item - ^ ((item depth - 1) * 16) + 3 \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/newRootCellFor..st b/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/newRootCellFor..st deleted file mode 100644 index 45411f268e..0000000000 --- a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/newRootCellFor..st +++ /dev/null @@ -1,10 +0,0 @@ -private factory -newRootCellFor: item - | cell | - - cell := FTIndentedCellMorph new. - (self iconFor: item data) - ifNotNil: [ :icon | cell addMorphBack: icon asMorph ]. - cell addMorphBack: (self toString: item data) asMorph asReadOnlyMorph. - - ^ cell \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/properties.json b/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/properties.json deleted file mode 100644 index 9f3d02e1c0..0000000000 --- a/Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "commentStamp" : "EstebanLorenzano 3/8/2018 16:22", - "super" : "IceTipTreeDataSource", - "category" : "Iceberg-TipUI-View-DataSource", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "selectedItems" - ], - "name" : "IceTipTreeOutlineDataSource", - "type" : "normal" -} \ No newline at end of file diff --git a/Iceberg-TipUI.package/IceTraitDefinition.extension/instance/icon.st b/Iceberg-TipUI.package/IceTraitDefinition.extension/instance/icon.st index a5c138f686..6149170835 100644 --- a/Iceberg-TipUI.package/IceTraitDefinition.extension/instance/icon.st +++ b/Iceberg-TipUI.package/IceTraitDefinition.extension/instance/icon.st @@ -1,4 +1,3 @@ *Iceberg-TipUI icon - - ^ Smalltalk ui icons iconNamed: #trait \ No newline at end of file + ^ self iconNamed: #trait \ No newline at end of file diff --git a/Iceberg-TipUI.package/MCAddition.extension/instance/icon.st b/Iceberg-TipUI.package/MCAddition.extension/instance/icon.st index 43db3f0c0a..e0947821ea 100644 --- a/Iceberg-TipUI.package/MCAddition.extension/instance/icon.st +++ b/Iceberg-TipUI.package/MCAddition.extension/instance/icon.st @@ -1,3 +1,3 @@ *Iceberg-TipUI icon - ^ Smalltalk ui icons iconNamed: #changeAdd \ No newline at end of file + ^ self iconNamed: #changeAdd \ No newline at end of file diff --git a/Iceberg-TipUI.package/MCModification.extension/instance/icon.st b/Iceberg-TipUI.package/MCModification.extension/instance/icon.st index e19c2e8c7e..2924470ae7 100644 --- a/Iceberg-TipUI.package/MCModification.extension/instance/icon.st +++ b/Iceberg-TipUI.package/MCModification.extension/instance/icon.st @@ -1,3 +1,3 @@ *Iceberg-TipUI icon - ^ Smalltalk ui icons iconNamed: #changeUpdate \ No newline at end of file + ^ self iconNamed: #changeUpdate \ No newline at end of file diff --git a/Iceberg-TipUI.package/MCRemoval.extension/instance/icon.st b/Iceberg-TipUI.package/MCRemoval.extension/instance/icon.st index 909fc787c1..eff9e9c99f 100644 --- a/Iceberg-TipUI.package/MCRemoval.extension/instance/icon.st +++ b/Iceberg-TipUI.package/MCRemoval.extension/instance/icon.st @@ -1,3 +1,3 @@ *Iceberg-TipUI icon - ^ Smalltalk ui icons iconNamed: #changeRemove \ No newline at end of file + ^ self iconNamed: #changeRemove \ No newline at end of file diff --git a/Iceberg.package/Iceberg.class/class/settingsOn..st b/Iceberg.package/Iceberg.class/class/settingsOn..st index 2c858f7760..41468fa867 100644 --- a/Iceberg.package/Iceberg.class/class/settingsOn..st +++ b/Iceberg.package/Iceberg.class/class/settingsOn..st @@ -1,27 +1,16 @@ settings -settingsOn: aBuilder +settingsOn: aBuilder (aBuilder group: #Iceberg) parent: #SCM; - with: [ - (aBuilder setting: #enableMetacelloIntegration) + with: [ (aBuilder setting: #enableMetacelloIntegration) target: self; order: 0.1; label: 'Enable Metacello integration'; description: 'If selected, Metacello github:// repositories will be loaded using iceberg'; -" icon: (Smalltalk ui icons iconNamed: #smallConfigurationIcon);" - with: [ - (aBuilder pickOne: #remoteTypeSelector) + with: [ (aBuilder pickOne: #remoteTypeSelector) label: 'Remote type'; description: 'When creating an Iceberg repository out of a github:// URL choose whether you want to user an SCP URL (i.e. with the form ''git@github.com:/.git'') or an HTTPS URL (i.e. with the form ''https://github.com//.git'''; - domainValues: { - 'SCP (git@github.com:/.git)' -> #scpUrl. - 'HTTPS (https://github.com//.git)' -> #httpsUrl - }. - ]. - "(aBuilder setting: #showSystemRepositories) - order: 0.2; - label: 'Include system repositories by default'; - description: 'If checked then system repositories (like ''pharo'') will be shown in repositories list by default'; - target: self." - ] + domainValues: + {('SCP (git@github.com:/.git)' -> #scpUrl). + ('HTTPS (https://github.com//.git)' -> #httpsUrl)} ] ] \ No newline at end of file