Avoid using a branch's commit history (see #140).

pharo-vcs · Oct 24, 2016 · 403331c · 403331c
1 parent 7ad96f0
commit 403331c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st b/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st
@@ -0,0 +1,3 @@
+walk definition
+uptoBranch: anIceBranch 
+	self uptoCommit: anIceBranch lastCommit
diff --git a/Iceberg.package/IceBranch.class/instance/commitsNotIn..st b/Iceberg.package/IceBranch.class/instance/commitsNotIn..st
@@ -1,3 +1,6 @@
 commits
 commitsNotIn: anotherBranch
-	^ self commits copyWithoutAll: anotherBranch commits
+	^ self repository newCommitWalk
+		fromBranch: self;
+		uptoBranch: anotherBranch;
+		commits
diff --git a/Iceberg.package/IceBranch.class/properties.json b/Iceberg.package/IceBranch.class/properties.json
@@ -9,8 +9,8 @@
 		"name",
 		"repository",
 		"versionDictionary",
-		"commits",
-		"loading" ],
+		"loading",
+		"commits" ],
 	"name" : "IceBranch",
 	"pools" : [
 		 ],