Merge pull request #1053 from jecisc/775-Reviewing-a-PR-is-broken

775-Reviewing-a-PR-is-broken
pharo-vcs · Oct 31, 2018 · dbfa9be · dbfa9be
2 parents 8d5878e + 3cd4ff7
commit dbfa9be
Show file tree

Hide file tree

Showing 26 changed files with 116 additions and 0 deletions.
diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st b/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st
@@ -0,0 +1,4 @@
+*Iceberg-Plugin-GitHub
+changes
+	"I am called by Iceberg's UI to get UI nodes for the tree"
+	^ (IceDiffNode on: tree) children
diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json b/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "IceDiff"
+}
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/README.md b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/README.md
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/class/on..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/class/on..st
@@ -0,0 +1,6 @@
+instance-creation
+on: anIceNode
+
+	^ self new
+		node: anIceNode;
+		yourself
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/balloonText.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/balloonText.st
@@ -0,0 +1,4 @@
+morph-compatibility
+balloonText
+
+	^ nil
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/browse.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/browse.st
@@ -0,0 +1,4 @@
+as yet unclassified
+browse
+
+	^ node value browse
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBeBrowsed.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBeBrowsed.st
@@ -0,0 +1,4 @@
+ui
+canBeBrowsed
+
+	^ node value canBeBrowsed
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBrowseReferences.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/canBrowseReferences.st
@@ -0,0 +1,4 @@
+ui
+canBrowseReferences
+
+	^ node value canBrowseReferences
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/children.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/children.st
@@ -0,0 +1,4 @@
+accessing
+children
+
+	^ node children collect: [ :e | IceDiffNode on: e ]
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/contents.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/contents.st
@@ -0,0 +1,4 @@
+morph-compatibility
+contents
+
+	^ self children
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/description.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/description.st
@@ -0,0 +1,4 @@
+accessing
+description
+
+	^ node description
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasContents.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasContents.st
@@ -0,0 +1,4 @@
+morph-compatibility
+hasContents
+
+	^ node notEmpty
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasEquivalentIn..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/hasEquivalentIn..st
@@ -0,0 +1,5 @@
+morph-compatibility
+hasEquivalentIn: aCollection 
+
+	self haltIf: [ aCollection notEmpty ].
+	^ false
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/highlightingColor.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/highlightingColor.st
@@ -0,0 +1,4 @@
+morph-compatibility
+highlightingColor
+
+	^ self theme selectionColor
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/icon.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/icon.st
@@ -0,0 +1,4 @@
+ui
+icon
+
+	^ node value icon
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/install.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/install.st
@@ -0,0 +1,4 @@
+actions
+install
+
+	^ node value install
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/key.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/key.st
@@ -0,0 +1,4 @@
+accessing
+key
+
+	^ node key
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/myVersion.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/myVersion.st
@@ -0,0 +1,4 @@
+accessing
+myVersion
+
+	^ node value leftContents
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node..st
@@ -0,0 +1,4 @@
+accessing
+node: anIceNode
+
+	node := anIceNode
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/node.st
@@ -0,0 +1,4 @@
+accessing
+node
+
+	^ node
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/printOn..st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/printOn..st
@@ -0,0 +1,4 @@
+printing
+printOn: aStream
+
+	self description printOn: aStream
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/theirVersion.st b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/instance/theirVersion.st
@@ -0,0 +1,4 @@
+accessing
+theirVersion
+
+	^ node value rightContents
diff --git a/Iceberg-Plugin-GitHub.package/IceDiffNode.class/properties.json b/Iceberg-Plugin-GitHub.package/IceDiffNode.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "Iceberg-Plugin-GitHub-Old",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"node",
+		"diff"
+	],
+	"name" : "IceDiffNode",
+	"type" : "normal"
+}
diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/compose.st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/compose.st
@@ -0,0 +1,5 @@
+building
+compose
+	self tabulator with: [ :browser |
+		browser initialExtent: self initialExtent.
+		self composeBrowserOn: browser ]
diff --git a/...g-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseCommitFor..st b/...g-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseCommitFor..st
@@ -0,0 +1,3 @@
+actions
+mergeBaseCommitFor: commitInfo
+	^ commitInfo repository lookupCommit: (self mergeBaseFor: commitInfo) 
diff --git a/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseFor..st b/Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/mergeBaseFor..st
@@ -0,0 +1,8 @@
+actions
+mergeBaseFor: commitInfo
+	self flag: #bug.
+	"Should use #commonAncestorWith:"
+
+	^ commitInfo repository
+		mergeBaseBetween: commitInfo id 
+		and: self baseSHA