Merge branch 'master' of git://gitorious.org/git-python/nud

Author: apollo13

lib/git/blob.py

@@ -46,7 +46,7 @@ def size(self):
             int
         """
         if self._size is None:
-            self._size = int(self.repo.git.cat_file(self.id, **{'s': True}).rstrip())
+            self._size = int(self.repo.git.cat_file(self.id, s=True).rstrip())
         return self._size
 
     @property
@@ -57,7 +57,7 @@ def data(self):
         Returns
             str
         """
-        self.data_stored = self.data_stored or self.repo.git.cat_file(self.id, **{'p': True, 'with_raw_output': True})
+        self.data_stored = self.data_stored or self.repo.git.cat_file(self.id, p=True, with_raw_output=True)
         return self.data_stored
 
     @property
@@ -85,7 +85,7 @@ def blame(cls, repo, commit, file):
         Returns
             list: [GitPython.Commit, list: [<line>]]
         """
-        data = repo.git.blame(commit, '--', file, **{'p': True})
+        data = repo.git.blame(commit, '--', file, p=True)
         commits = {}
         blames = []
         info = None
@@ -120,12 +120,12 @@ def blame(cls, repo, commit, file):
                 if info:
                     c = commits.has_key(info['id']) and commits[info['id']]
                     if not c:
-                        c = Commit(repo, **{'id': info['id'],
-                                            'author': Actor.from_string(info['author'] + ' ' + info['author_email']),
-                                            'authored_date': info['author_date'],
-                                            'committer': Actor.from_string(info['committer'] + ' ' + info['committer_email']),
-                                            'committed_date': info['committer_date'],
-                                            'message': info['summary']})
+                        c = Commit(repo, id=info['id'],
+                                         author=Actor.from_string(info['author'] + ' ' + info['author_email']),
+                                         authored_date=info['author_date'],
+                                         committer=Actor.from_string(info['committer'] + ' ' + info['committer_email']),
+                                         committed_date=info['committer_date'],
+                                         message=info['summary'])
                         commits[info['id']] = c
 
                     m = re.search(r'^\t(.*)$', line)

lib/git/commit.py

@@ -62,12 +62,12 @@ def __init__(self, repo, **kwargs):
 
         if self.id:
             if 'parents' in kwargs:
-                self.parents = map(lambda p: Commit(repo, **{'id': p}), kwargs['parents'])
+                self.parents = map(lambda p: Commit(repo, id=p), kwargs['parents'])
             if 'tree' in kwargs:
-                self.tree = tree.Tree(repo, **{'id': kwargs['tree']})
+                self.tree = tree.Tree(repo, id=kwargs['tree'])
 
     def __bake__(self):
-        temp = Commit.find_all(self.repo, self.id, **{'max_count': 1})[0]
+        temp = Commit.find_all(self.repo, self.id, max_count=1)[0]
         self.parents = temp.parents
         self.tree = temp.tree
         self.author = temp.author
@@ -193,13 +193,13 @@ def diff(cls, repo, a, b = None, paths = None):
         if b:
             paths.insert(0, b)
         paths.insert(0, a)
-        text = repo.git.diff(*paths, **{'full_index': True})
+        text = repo.git.diff(full_index=True, *paths)
         return diff.Diff.list_from_string(repo, text)
 
     @property
     def diffs(self):
         if not self.parents:
-            d = self.repo.git.show(self.id, **{'full_index': True, 'pretty': 'raw'})
+            d = self.repo.git.show(self.id, full_index=True, pretty='raw')
             if re.search(r'diff --git a', d):
                 if not re.search(r'^diff --git a', d):
                     p = re.compile(r'.+?(diff --git a)', re.MULTILINE | re.DOTALL)
@@ -213,14 +213,14 @@ def diffs(self):
     @property
     def stats(self):
         if not self.parents:
-            text = self.repo.git.diff(self.id, **{'numstat': True})
+            text = self.repo.git.diff(self.id, numstat=True)
             text2 = ""
             for line in text.splitlines():
                 (insertions, deletions, filename) = line.split("\t")
                 text2 += "%s\t%s\t%s\n" % (deletions, insertions, filename)
             text = text2
         else:
-            text = self.repo.git.diff(self.parents[0].id, self.id, **{'numstat': True})
+            text = self.repo.git.diff(self.parents[0].id, self.id, numstat=True)
         return stats.Stats.list_from_string(self.repo, text)
 
     def __str__(self):

lib/git/diff.py

@@ -20,11 +20,11 @@ def __init__(self, repo, a_path, b_path, a_commit, b_commit, a_mode, b_mode, new
         if not a_commit or re.search(r'^0{40}$', a_commit):
             self.a_commit = None
         else:
-            self.a_commit = commit.Commit(repo, **{'id': a_commit})
+            self.a_commit = commit.Commit(repo, id=a_commit)
         if not b_commit or re.search(r'^0{40}$', b_commit):
             self.b_commit = None
         else:
-            self.b_commit = commit.Commit(repo, **{'id': b_commit})
+            self.b_commit = commit.Commit(repo, id=b_commit)
 
         self.a_mode = a_mode
         self.b_mode = b_mode

lib/git/head.py

@@ -105,7 +105,7 @@ def from_string(cls, repo, line):
         """
         full_name, ids = line.split("\x00")
         name = full_name.split("/")[-1]
-        c = commit.Commit(repo, **{'id': ids})
+        c = commit.Commit(repo, id=ids)
         return Head(name, c)
 
     def __repr__(self):

lib/git/repo.py

@@ -197,7 +197,7 @@ def commit_deltas_from(self, other_repo, ref = 'master', other_ref = 'master'):
         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.find_all(other_repo, ref, **{'max_count': 1}[0]), diff_refs)
+        return map(lambda ref: Commit.find_all(other_repo, ref, max_count=1)[0], diff_refs)
 
     def tree(self, treeish = 'master', paths = []):
         """
@@ -228,7 +228,7 @@ def blob(self, id):
         Returns
             ``GitPython.Blob``
         """
-        return Blob(self, **{'id': id})
+        return Blob(self, id=id)
 
     def log(self, commit = 'master', path = None, **kwargs):
         """

lib/git/tag.py

@@ -84,7 +84,7 @@ def from_string(cls, repo, line):
         """
         full_name, ids = line.split("\x00")
         name = full_name.split("/")[-1]
-        commit = Commit(repo, **{'id': ids})
+        commit = Commit(repo, id=ids)
         return Tag(name, commit)
 
     def __repr__(self):

lib/git/tree.py

@@ -27,7 +27,7 @@ def __bake__(self):
     @classmethod
     def construct(cls, repo, treeish, paths = []):
         output = repo.git.ls_tree(treeish, *paths)
-        return Tree(repo, **{'id': treeish}).construct_initialize(repo, treeish, output)
+        return Tree(repo, id=treeish).construct_initialize(repo, treeish, output)
 
     def construct_initialize(self, repo, id, text):
         self.repo = repo
@@ -62,9 +62,9 @@ def content_from_string(self, repo, text):
             return None
 
         if typ == "tree":
-            return Tree(repo, **{'id': id, 'mode': mode, 'name': name})
+            return Tree(repo, id=id, mode=mode, name=name)
         elif typ == "blob":
-            return blob.Blob(repo, **{'id': id, 'mode': mode, 'name': name})
+            return blob.Blob(repo, id=id, mode=mode, name=name)
         elif typ == "commit":
             return None
         else: