Fix #932

Fix update pharo repository in case of locating already cloned repository
pharo-vcs · Aug 2, 2018 · cbb836a · cbb836a
1 parent 1dee75f
commit cbb836a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/Iceberg-Memory.package/IceMemoryProject.class/instance/refresh.st b/Iceberg-Memory.package/IceMemoryProject.class/instance/refresh.st
diff --git a/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/updateLocation..st b/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/updateLocation..st
@@ -3,7 +3,6 @@ updateLocation: aReference
 
 	"change location"
 	self entity location: aReference.
-	"force refresh packages"
-	self entity workingCopy project: self entity project.
-
+	self entity postFetch.
+
 	Iceberg announcer announce: (IceRepositoryModified for: self entity)
diff --git a/Iceberg.package/IceAbstractProject.class/instance/refresh.st b/Iceberg.package/IceAbstractProject.class/instance/refresh.st
diff --git a/Iceberg.package/IceWorkingCopy.class/instance/adoptCommit..st b/Iceberg.package/IceWorkingCopy.class/instance/adoptCommit..st
@@ -1,8 +1,14 @@
 accessing
 adoptCommit: aCommit
 
+	| oldCommit |
 	self referenceCommit = aCommit
 		ifTrue: [ ^ self ].
 
+	oldCommit := self referenceCommit.
 	self referenceCommit: aCommit.
-	self forceCalculateDirtyPackages.
+
+	"If both commits are from a different class but still have the same ID, we do not need to force the calculation of dirty packages.
+	This is required for the case when a working copy existed with an unknown comit but it was not linked to a repository"
+	(oldCommit id = aCommit id)
+		ifFalse: [ self forceCalculateDirtyPackages. ]
diff --git a/Iceberg.package/IceWorkingCopy.class/instance/refreshProject.st b/Iceberg.package/IceWorkingCopy.class/instance/refreshProject.st
@@ -1,6 +1,5 @@
 private-project
 refreshProject
 
-	project refresh.
 	repository commitsInPackageCache: nil.
 	self refreshPackages