Merge pull request #1035 from pharo-vcs/859-set-upstream

859-set-upstream

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) ]

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)

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)

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 ]

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 ]

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)