Fixed tag tests. Working on #191

pharo-vcs · Oct 25, 2016 · c0a180f · c0a180f
1 parent 5fc9d42
commit c0a180f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranches..st b/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranches..st
@@ -0,0 +1,3 @@
+walk definition
+uptoBranches: branches
+	^ branches do: [ :branch | self uptoBranch: branch ]
diff --git a/Iceberg.package/IceBranch.class/instance/ownCommits.st b/Iceberg.package/IceBranch.class/instance/ownCommits.st
@@ -1,4 +1,7 @@
 commits
 ownCommits
 	"Return the commits that are only in this branch."
-	^ self backend commitsOnlyIn: self name
+	^ self repository newCommitWalk
+		fromBranch: self;
+		uptoBranches: self repository localBranches;
+		commits.
diff --git a/Iceberg.package/IceMCGitRepository.class/instance/commitsOnlyIn..st b/Iceberg.package/IceMCGitRepository.class/instance/commitsOnlyIn..st
diff --git a/Iceberg.package/IceMCGitRepository.class/instance/localBranchNames.st b/Iceberg.package/IceMCGitRepository.class/instance/localBranchNames.st
diff --git a/Iceberg.package/IceMCGitRepository.class/instance/localBranches.st b/Iceberg.package/IceMCGitRepository.class/instance/localBranches.st
@@ -0,0 +1,5 @@
+querying
+localBranches
+	^ (self command: 'branch') lines 
+		reject: [ :line | line matchesRegex: '\* \(detached from (.*)\)' ]
+		thenCollect: [ :line | IceBranch named: (line allButFirst: 2) inRepository: self frontend ]
diff --git a/Iceberg.package/IceRepository.class/instance/localBranchNames.st b/Iceberg.package/IceRepository.class/instance/localBranchNames.st
diff --git a/Iceberg.package/IceRepository.class/instance/localBranches.st b/Iceberg.package/IceRepository.class/instance/localBranches.st
@@ -0,0 +1,3 @@
+querying
+localBranches
+	^ self backend localBranches