Remove the old remote when renaming a remote

hpi-swa · Oct 18, 2023 · cfa9671 · cfa9671
1 parent 9712cae
commit cfa9671
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Squot.package/SquotRemotesBrowser.class/instance/actionEditRemote.st b/src/Squot.package/SquotRemotesBrowser.class/instance/actionEditRemote.st
@@ -1,10 +1,14 @@
 actions
 actionEditRemote
 	self selectedRemoteName ifNil: [^ self].
-	self withUnitOfWork: [| remote |
+	self withUnitOfWork: [| remote newRemote |
 		remote := self selectedRemote.
-		self addRemote:
-			(SquotRemoteDialog
-				getRemoteWithTitle: 'Edit Remote'
-				name: remote name
-				url: remote url)].
+		newRemote := SquotRemoteDialog
+							getRemoteWithTitle: 'Edit Remote'
+							name: remote name
+							url: remote url.
+		newRemote ifNotNil: [
+			newRemote name = remote name ifFalse: [
+				"only remove the remote if the name changes, otherwise the refs can be kept"
+				self unitOfWork removeRemoteNamed: remote name].
+			self addRemote: newRemote]].
diff --git a/src/Squot.package/SquotRemotesBrowser.class/methodProperties.json b/src/Squot.package/SquotRemotesBrowser.class/methodProperties.json
@@ -4,7 +4,7 @@
 		"openOnWorkingCopy:" : "mad 9/21/2023 17:08" },
 	"instance" : {
 		"actionAddRemote" : "mad 9/21/2023 17:58",
-		"actionEditRemote" : "mad 9/21/2023 18:06",
+		"actionEditRemote" : "mad 10/18/2023 15:54",
 		"actionRemoveRemote" : "mad 9/21/2023 18:06",
 		"addRemote:" : "mad 9/21/2023 18:24",
 		"buildAddRemoteButton:" : "mad 9/21/2023 17:02",