Skip to content

Commit

Permalink
Fixes #191
Browse files Browse the repository at this point in the history
  • Loading branch information
npasserini committed Oct 25, 2016
1 parent fce4a8e commit 24a078b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ testMetacelloIntegrationForTags
self assert: ((repository loadedCode versionFor: (repository packageNamed: packageName)) isKindOf: IceSavedPackageVersion ).
self assert: repository incommingCommits isEmpty.
self assert: repository outgoingCommits isEmpty.

repository loadedPackages do: [ :package |
self assert: package incommingCommits isEmpty.
self assert: package outgoingCommits isEmpty
].
4 changes: 1 addition & 3 deletions Iceberg.package/IceBranch.class/instance/outgoingCommits.st
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
commits
outgoingCommits
^ self upstream
ifNotNil: [ self commitsNotIn: self upstream ]
ifNil: [ self ownCommits ]
^ self outgoingCommitsWalk commits
10 changes: 10 additions & 0 deletions Iceberg.package/IceBranch.class/instance/outgoingCommitsWalk.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
commits
outgoingCommitsWalk
| walk |
walk := self repository newCommitWalk fromBranch: self.
self upstream
ifNotNil: [ walk uptoBranch: self upstream ]
ifNil: [ walk uptoBranches: (
self repository localBranches copyWithout: self) ].

^ walk.
7 changes: 0 additions & 7 deletions Iceberg.package/IceBranch.class/instance/ownCommits.st

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
querying
outgoingCommits
^ self repository newCommitWalk
fromHead;
uptoCommit: self repository currentBranch upstream lastCommit;
^ self repository currentBranch outgoingCommitsWalk
modifyingPackage: self;
commits
commits

0 comments on commit 24a078b

Please sign in to comment.