diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2008-09-05 22:24:13 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2008-09-05 22:24:13 +0200 |
| commit | 3131d1a5295508f583ae22788a1065144bec3cee (patch) | |
| tree | 7b35b4b87dba41b417cdc4ce276c3f2af3fca7c3 /lib/git/blob.py | |
| parent | 1adc79ac67e5eabaa8b8509150c59bc5bd3fd4e6 (diff) | |
| parent | 590638f9a56440a2c41cc04f52272ede04c06a43 (diff) | |
| download | gitpython-3131d1a5295508f583ae22788a1065144bec3cee.tar.gz | |
Merge branch 'master' of git://gitorious.org/git-python/nud
Diffstat (limited to 'lib/git/blob.py')
| -rw-r--r-- | lib/git/blob.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/git/blob.py b/lib/git/blob.py index fd83fe1d..0b4b19c2 100644 --- a/lib/git/blob.py +++ b/lib/git/blob.py @@ -46,7 +46,7 @@ class Blob(object): 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 @@ class Blob(object): 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 @@ class Blob(object): 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 @@ class Blob(object): 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) |