listAllRemoteBranchesInRepository:error: no longer returns HEAD and m…

…aster
libgit2 · Mar 24, 2011 · 6d7b5a0 · 6d7b5a0
1 parent e79ee42
commit 6d7b5a0
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/Classes/GTBranch.h b/Classes/GTBranch.h
@@ -82,4 +82,7 @@
 // returns number of commits in the branch or NSNotFound if an error occurred
 - (NSInteger)numberOfCommitsAndReturnError:(NSError **)error;
 
+- (BOOL)isRemote;
+- (BOOL)isLocal;
+
 @end
diff --git a/Classes/GTBranch.m b/Classes/GTBranch.m
@@ -138,7 +138,20 @@ + (NSArray *)listAllLocalBranchesInRepository:(GTRepository *)repo error:(NSErro
 
 + (NSArray *)listAllRemoteBranchesInRepository:(GTRepository *)repo error:(NSError **)error {
 
-	return [self listAllBranchesInRepository:repo withPrefix:[self remoteNamePrefix] error:error];
+	static NSArray *unwantedRemoteBranches = nil;
+	if(unwantedRemoteBranches == nil) {
+		unwantedRemoteBranches = [NSArray arrayWithObjects:@"HEAD", @"master", nil];
+	}
+
+	NSArray *remoteBranches =[self listAllBranchesInRepository:repo withPrefix:[self remoteNamePrefix] error:error];
+	NSMutableArray *filteredList = [NSMutableArray arrayWithCapacity:remoteBranches.count];
+	for(GTBranch *branch in remoteBranches) {
+		if(![unwantedRemoteBranches containsObject:branch.shortName]) {
+			[filteredList addObject:branch];
+		}
+	}
+
+	return filteredList;
 }
 
 + (NSArray *)listAllBranchesInRepository:(GTRepository *)repo withPrefix:(NSString *)prefix error:(NSError **)error {
@@ -162,4 +175,12 @@ - (NSInteger)numberOfCommitsAndReturnError:(NSError **)error {
 	return [self.repository.walker countFromSha:self.sha error:error];
 }
 
+- (BOOL)isRemote {
+	return [self.name hasPrefix:[[self class] remoteNamePrefix]];
+}
+
+- (BOOL)isLocal {
+	return [self.name hasPrefix:[[self class] localNamePrefix]];
+}
+
 @end
diff --git a/Tests/GTBranchTest.m b/Tests/GTBranchTest.m
@@ -24,7 +24,7 @@ - (void)testCanOpenHeadInRepo {
 	GHAssertNotNil(current, nil);
 }
 
-- (void)testCanListBranchesInRepo {
+- (void)testCanListLocalBranchesInRepo {
 
 	NSError *error = nil;
 	GTRepository *repo = [GTRepository repoByOpeningRepositoryInDirectory:[NSURL fileURLWithPath:TEST_REPO_PATH()] error:&error];
@@ -35,6 +35,16 @@ - (void)testCanListBranchesInRepo {
 	GHAssertEquals(2, (int)branches.count, nil);
 }
 
+- (void)testCanListRemoteBranchesInRepo {
+	NSError *error = nil;
+	GTRepository *repo = [GTRepository repoByOpeningRepositoryInDirectory:[NSURL fileURLWithPath:TEST_REPO_PATH()] error:&error];
+	GHAssertNil(error, [error localizedDescription]);
+
+	NSArray *branches = [GTBranch listAllRemoteBranchesInRepository:repo error:&error];
+	GHAssertNotNil(branches, [error localizedDescription], nil);
+	GHAssertEquals(0, (int)branches.count, nil);
+}
+
 - (void)testCanCountCommitsInBranch {
 
 	NSError *error = nil;