Merge branch 'dev-1.0' into 1067-IceTipHistoryDiffUpdater-model-varia…

…ble-seems-useless
pharo-vcs · Nov 6, 2018 · 129a4b0 · 129a4b0
2 parents b8ca3ed + 6cc6800
commit 129a4b0
Show file tree

Hide file tree

Showing 298 changed files with 706 additions and 933 deletions.
diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/basicPushTo..st 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) ]
diff --git a/...Libgit.package/IceGitLocalBranch.class/instance/pushBranchToRemote.gitRemote.progress..st b/...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)
diff --git a/...g-Libgit.package/IceGitLocalBranch.class/instance/pushTag.toRemote.gitRemote.progress..st b/...g-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)
diff --git a/...g-Libgit.package/IceGitLocalBranch.class/instance/pushTagsToRemote.gitRemote.progress..st b/...g-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 ]
diff --git 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) ] ]
+	repository handleLibgitError: [ 
+		self basicPushTo: aRemote ]
diff --git a/Iceberg-Libgit.package/IceGitLocalBranch.class/instance/setUpstreamIfMissing..st 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)
diff --git a/...erg-Plugin-GitHub.package/GLMCompositePresentation.extension/instance/swappedColorDiff.st b/...erg-Plugin-GitHub.package/GLMCompositePresentation.extension/instance/swappedColorDiff.st
diff --git a/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/properties.json b/Iceberg-Plugin-GitHub.package/GLMCompositePresentation.extension/properties.json
diff --git a/...tHub.package/GLMMorphicRenderer.extension/instance/renderSwappedColorDiffPresentation..st b/...tHub.package/GLMMorphicRenderer.extension/instance/renderSwappedColorDiffPresentation..st
diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/properties.json b/Iceberg-Plugin-GitHub.package/GLMMorphicRenderer.extension/properties.json
diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/README.md b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/README.md
diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/instance/render..st b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/instance/render..st
diff --git a/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/properties.json b/Iceberg-Plugin-GitHub.package/GLMMorphicSwappedColorDiffRenderer.class/properties.json
diff --git a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/README.md b/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/README.md
diff --git a/...gin-GitHub.package/GLMSwappedColorDiffPresentation.class/instance/renderGlamorouslyOn..st b/...gin-GitHub.package/GLMSwappedColorDiffPresentation.class/instance/renderGlamorouslyOn..st
diff --git a/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/properties.json b/Iceberg-Plugin-GitHub.package/GLMSwappedColorDiffPresentation.class/properties.json
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/README.md b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/README.md
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/defaultSpec.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/defaultSpec.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/for..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/class/for..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorLabel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/authorPanel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentLabel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commentPanel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commit.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/commit.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/dateLabel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/datePanel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idLabel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/idPanel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeCommit..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeCommit..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeWidgets.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/initializeWidgets.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsLabel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel..st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel..st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel.st b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/instance/parentsPanel.st
diff --git a/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/properties.json b/Iceberg-Plugin-GitHub.package/IceCommitInfoModel.class/properties.json
diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st b/Iceberg-Plugin-GitHub.package/IceDiff.extension/instance/changes.st
diff --git a/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json b/Iceberg-Plugin-GitHub.package/IceDiff.extension/properties.json