repo.commit_delta_base: removed

Author: Byron

CHANGES

@@ -55,6 +55,10 @@ Repo
   - 'commit_count' as it was just a redirection to the respective commit method
   - 'commits_between', replaced by a note on the iter_commits method as it can 
      achieve the same thing
+  - 'commit_delta_from' as it was a very special case by comparing two different
+     repositories which are likely to have completly different commits. For
+     related repositories, i.e. clones, git-rev-list would be sufficient to find 
+     commits that would need to be transferred for example.
 * Renamed commits to iter_commits to improve the performance, adjusted signature
   to be more versatile
 * 'commits' method has no max-count of returned commits anymore, it now behaves 

lib/git/objects/commit.py

@@ -101,30 +101,8 @@ def summary(self):
 		"""
 		return self.message.split('\n', 1)[0]
 
-	def iter_parents(self, paths='', **kwargs):
-		"""
-		Iterate _all_ parents of this commit.
-		
-		``paths``
-			Optional path or list of paths limiting the Commits to those that 
-			contain at least one of the paths
-		
-		``kwargs``
-			All arguments allowed by git-rev-list
-			
-		Return:
-			Iterator yielding Commit objects which are parents of self
-		"""
-		# skip ourselves
-		skip = kwargs.get("skip", 1)
-		if skip == 0:	# skip ourselves 
-			skip = 1
-		kwargs['skip'] = skip
-		
-		return self.iter_items( self.repo, self, paths, **kwargs )
-
 	@classmethod
-	def count(cls, repo, rev, paths=''):
+	def count(cls, repo, rev, paths='', **kwargs):
 		"""
 		Count the number of commits reachable from this revision
 
@@ -138,10 +116,12 @@ def count(cls, repo, rev, paths=''):
 			is an optinal path or a list of paths restricting the return value 
 			to commits actually containing the paths
 
+		``kwargs``
+			Additional options to be passed to git-rev-list
 		Returns
 			int
 		"""
-		return len(repo.git.rev_list(rev, '--', paths).strip().splitlines())
+		return len(repo.git.rev_list(rev, '--', paths, **kwargs).strip().splitlines())
 
 	@classmethod
 	def iter_items(cls, repo, rev, paths='', **kwargs):
@@ -173,59 +153,28 @@ def iter_items(cls, repo, rev, paths='', **kwargs):
 		# the test system might confront us with string values - 
 		proc = repo.git.rev_list(rev, '--', paths, **options)
 		return cls._iter_from_process_or_stream(repo, proc)
-
-	@classmethod
-	def _iter_from_process_or_stream(cls, repo, proc_or_stream):
-		"""
-		Parse out commit information into a list of Commit objects
-
-		``repo``
-			is the Repo
-
-		``proc``
-			git-rev-list process instance (raw format)
-
-		Returns
-			iterator returning Commit objects
+		
+	def iter_parents(self, paths='', **kwargs):
 		"""
-		stream = proc_or_stream
-		if not hasattr(stream,'next'):
-			stream = proc_or_stream.stdout
-			
-		for line in stream:
-			id = line.split()[1]
-			assert line.split()[0] == "commit"
-			tree = stream.next().split()[1]
-
-			parents = []
-			next_line = None
-			for parent_line in stream:
-				if not parent_line.startswith('parent'):
-					next_line = parent_line
-					break
-				# END abort reading parents
-				parents.append(parent_line.split()[-1])
-			# END for each parent line
-			
-			author, authored_date = utils.parse_actor_and_date(next_line)
-			committer, committed_date = utils.parse_actor_and_date(stream.next())
-			
-			# empty line
-			stream.next()
-			
-			message_lines = []
-			next_line = None
-			for msg_line in stream:
-				if not msg_line.startswith('    '):
-					break
-				# END abort message reading 
-				message_lines.append(msg_line.strip())
-			# END while there are message lines
-			message = '\n'.join(message_lines)
+		Iterate _all_ parents of this commit.
+		
+		``paths``
+			Optional path or list of paths limiting the Commits to those that 
+			contain at least one of the paths
+		
+		``kwargs``
+			All arguments allowed by git-rev-list
 			
-			yield Commit(repo, id=id, parents=tuple(parents), tree=tree, author=author, authored_date=authored_date,
-						  committer=committer, committed_date=committed_date, message=message)
-		# END for each line in stream
+		Return:
+			Iterator yielding Commit objects which are parents of self
+		"""
+		# skip ourselves
+		skip = kwargs.get("skip", 1)
+		if skip == 0:	# skip ourselves 
+			skip = 1
+		kwargs['skip'] = skip
+		
+		return self.iter_items( self.repo, self, paths, **kwargs )
 
 	@classmethod
 	def diff(cls, repo, a, b=None, paths=None):
@@ -301,6 +250,60 @@ def stats(self):
 			text = self.repo.git.diff(self.parents[0].id, self.id, '--', numstat=True)
 		return stats.Stats._list_from_string(self.repo, text)
 
+	@classmethod
+	def _iter_from_process_or_stream(cls, repo, proc_or_stream):
+		"""
+		Parse out commit information into a list of Commit objects
+
+		``repo``
+			is the Repo
+
+		``proc``
+			git-rev-list process instance (raw format)
+
+		Returns
+			iterator returning Commit objects
+		"""
+		stream = proc_or_stream
+		if not hasattr(stream,'next'):
+			stream = proc_or_stream.stdout
+			
+		for line in stream:
+			id = line.split()[1]
+			assert line.split()[0] == "commit"
+			tree = stream.next().split()[1]
+
+			parents = []
+			next_line = None
+			for parent_line in stream:
+				if not parent_line.startswith('parent'):
+					next_line = parent_line
+					break
+				# END abort reading parents
+				parents.append(parent_line.split()[-1])
+			# END for each parent line
+			
+			author, authored_date = utils.parse_actor_and_date(next_line)
+			committer, committed_date = utils.parse_actor_and_date(stream.next())
+			
+			# empty line
+			stream.next()
+			
+			message_lines = []
+			next_line = None
+			for msg_line in stream:
+				if not msg_line.startswith('    '):
+					break
+				# END abort message reading 
+				message_lines.append(msg_line.strip())
+			# END while there are message lines
+			message = '\n'.join(message_lines)
+			
+			yield Commit(repo, id=id, parents=tuple(parents), tree=tree, author=author, authored_date=authored_date,
+						  committer=committer, committed_date=committed_date, message=message)
+		# END for each line in stream
+		
+		
 	def __str__(self):
 		""" Convert commit to string which is SHA1 """
 		return self.id

lib/git/repo.py

@@ -202,20 +202,6 @@ def iter_commits(self, rev=None, paths='', **kwargs):
 
 		return Commit.iter_items(self, rev, paths, **kwargs)
 
-	def commit_deltas_from(self, other_repo, ref='master', other_ref='master'):
-		"""
-		Returns a list of commits that is in ``other_repo`` but not in self
-
-		Returns 
-			git.Commit[]
-		"""
-		repo_refs = self.git.rev_list(ref, '--').strip().splitlines()
-		other_repo_refs = other_repo.git.rev_list(other_ref, '--').strip().splitlines()
-
-		diff_refs = list(set(other_repo_refs) - set(repo_refs))
-		return map(lambda ref: Commit(other_repo, ref ), diff_refs)
-
-
 	def _get_daemon_export(self):
 		filename = os.path.join(self.path, self.DAEMON_EXPORT_FILE)
 		return os.path.exists(filename)