From a8f8582274cd6a368a79e569e2995cee7d6ea9f9 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sun, 18 Oct 2009 18:01:52 +0200
Subject: added initial frame for remote handling- remotes are somewhat related
 to either parsing the command output or to reading the repo configuration
 which would be faster

---
 lib/git/refs.py | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

(limited to 'lib/git/refs.py')

diff --git a/lib/git/refs.py b/lib/git/refs.py
index 4445f252..1a58bb05 100644
--- a/lib/git/refs.py
+++ b/lib/git/refs.py
@@ -15,6 +15,7 @@ class Reference(LazyMixin, Iterable):
 	Represents a named reference to any object
 	"""
 	__slots__ = ("repo", "path")
+	_common_path_default = "refs"
 	
 	def __init__(self, repo, path, object = None):
 		"""
@@ -75,7 +76,7 @@ class Reference(LazyMixin, Iterable):
 		return Object.new(self.repo, self.path)
 	
 	@classmethod
-	def iter_items(cls, repo, common_path = "refs", **kwargs):
+	def iter_items(cls, repo, common_path = None, **kwargs):
 		"""
 		Find all refs in the repository
 
@@ -84,7 +85,9 @@ class Reference(LazyMixin, Iterable):
 
 		``common_path``
 			Optional keyword argument to the path which is to be shared by all
-			returned Ref objects
+			returned Ref objects.
+			Defaults to class specific portion if None assuring that only 
+			refs suitable for the actual class are returned.
 
 		``kwargs``
 			Additional options given as keyword arguments, will be passed
@@ -100,7 +103,10 @@ class Reference(LazyMixin, Iterable):
 
 		options = {'sort': "committerdate",
 				   'format': "%(refname)%00%(objectname)%00%(objecttype)%00%(objectsize)"}
-				   
+		
+		if common_path is None:
+			common_path = cls._common_path_default
+		
 		options.update(kwargs)
 
 		output = repo.git.for_each_ref(common_path, **options)
@@ -157,7 +163,8 @@ class Head(Reference):
 		>>> head.commit.id
 		'1c09f116cbc2cb4100fb6935bb162daa4723f455'
 	"""
-
+	_common_path_default = "refs/heads"
+	
 	@property
 	def commit(self):
 		"""
@@ -166,20 +173,6 @@ class Head(Reference):
 		"""
 		return self.object
 		
-	@classmethod
-	def iter_items(cls, repo, common_path = "refs/heads", **kwargs):
-		"""
-		Returns
-			Iterator yielding Head items
-			
-		For more documentation, please refer to git.base.Ref.list_items
-		"""
-		return super(Head,cls).iter_items(repo, common_path, **kwargs)
-
-	def __repr__(self):
-		return '<git.Head "%s">' % self.name
-		
-		
 
 class TagRef(Reference):
 	"""
@@ -197,6 +190,7 @@ class TagRef(Reference):
 	"""
 	
 	__slots__ = tuple()
+	_common_path_default = "refs/tags"
 	
 	@property
 	def commit(self):
@@ -223,16 +217,12 @@ class TagRef(Reference):
 			return self.object
 		return None
 
-	@classmethod
-	def iter_items(cls, repo, common_path = "refs/tags", **kwargs):
-		"""
-		Returns
-			Iterator yielding commit items
-			
-		For more documentation, please refer to git.base.Ref.list_items
-		"""
-		return super(TagRef,cls).iter_items(repo, common_path, **kwargs)
-		
 		
 # provide an alias
 Tag = TagRef
+
+class RemoteRef(Head):
+	"""
+	Represents a reference pointing to a remote head.
+	"""
+	_common_path_default = "refs/remotes"
-- 
cgit v1.2.1


From a07cdbae1d485fd715a5b6eca767f211770fea4d Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Mon, 19 Oct 2009 18:06:19 +0200
Subject: Added remote module and test cases - about to implement remote option
 handling

---
 lib/git/refs.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'lib/git/refs.py')

diff --git a/lib/git/refs.py b/lib/git/refs.py
index 1a58bb05..618babc2 100644
--- a/lib/git/refs.py
+++ b/lib/git/refs.py
@@ -226,3 +226,26 @@ class RemoteRef(Head):
 	Represents a reference pointing to a remote head.
 	"""
 	_common_path_default = "refs/remotes"
+	
+	@property
+	def remote_name(self):
+		"""
+		Returns
+			Name of the remote we are a reference of, such as 'origin' for a reference
+			named 'origin/master'
+		"""
+		tokens = self.path.split('/')
+		# /refs/remotes/<remote name>/<branch_name>
+		return tokens[2]
+		
+	@property
+	def remote_branch(self):
+		"""
+		Returns
+			Name of the remote branch itself, i.e. master.
+			
+		NOTE: The returned name is usually not qualified enough to uniquely identify
+		a branch
+		"""
+		tokens = self.path.split('/')
+		return '/'.join(tokens[3:])
-- 
cgit v1.2.1