Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6ffd4b0

Browse files
committed
Corrected conflict with pep8 changes from apollo13.
2 parents4b43ca7 +39f85c4 commit6ffd4b0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎lib/git/commit.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def list_from_string(cls, repo, text):
171171
returncommits
172172

173173
@classmethod
174-
defdiff(cls,repo,a,b=None,paths=None):
174+
defdiff(cls,repo,a,b=None,paths=None):
175175
"""
176176
Show diffs between two trees:
177177

‎lib/git/repo.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def tags(self):
100100
"""
101101
returnTag.find_all(self)
102102

103-
defcommits(self,start='master',path='',max_count=10,skip=0):
103+
defcommits(self,start='master',path='',max_count=10,skip=0):
104104
"""
105105
A list of Commit objects representing the history of a given ref/commit
106106
@@ -143,7 +143,7 @@ def commits_between(self, frm, to, path = ''):
143143
"""
144144
returnCommit.find_all(self,"%s..%s"% (frm,to),path).reverse()
145145

146-
defcommits_since(self,start='master',path='',since='1970-01-01'):
146+
defcommits_since(self,start='master',path='',since='1970-01-01'):
147147
"""
148148
The Commits objects that are newer than the specified date.
149149
Commits are returned in chronological order.
@@ -164,7 +164,7 @@ def commits_since(self, start = 'master', path = '', since = '1970-01-01'):
164164

165165
returnCommit.find_all(self,start,path,**options)
166166

167-
defcommit_count(self,start='master',path=''):
167+
defcommit_count(self,start='master',path=''):
168168
"""
169169
The number of commits reachable by the given branch/commit
170170
@@ -200,7 +200,7 @@ def commit(self, id, path = ''):
200200
raiseValueError,'Invalid identifier %s'%id
201201
returncommits[0]
202202

203-
defcommit_deltas_from(self,other_repo,ref='master',other_ref='master'):
203+
defcommit_deltas_from(self,other_repo,ref='master',other_ref='master'):
204204
"""
205205
Returns a list of commits that is in ``other_repo`` but not in self
206206
@@ -213,7 +213,7 @@ def commit_deltas_from(self, other_repo, ref = 'master', other_ref = 'master'):
213213
diff_refs=list(set(other_repo_refs)-set(repo_refs))
214214
returnmap(lambdaref:Commit.find_all(other_repo,ref,max_count=1)[0],diff_refs)
215215

216-
deftree(self,treeish='master'):
216+
deftree(self,treeish='master'):
217217
"""
218218
The Tree object for the given treeish reference
219219
@@ -242,7 +242,7 @@ def blob(self, id):
242242
"""
243243
returnBlob(self,id=id)
244244

245-
deflog(self,commit='master',path=None,**kwargs):
245+
deflog(self,commit='master',path=None,**kwargs):
246246
"""
247247
The commit log for a treeish
248248
@@ -330,7 +330,7 @@ def fork_bare(self, path, **kwargs):
330330
self.git.clone(self.path,path,**options)
331331
returnRepo(path)
332332

333-
defarchive_tar(self,treeish='master',prefix=None):
333+
defarchive_tar(self,treeish='master',prefix=None):
334334
"""
335335
Archive the given treeish
336336
@@ -359,7 +359,7 @@ def archive_tar(self, treeish = 'master', prefix = None):
359359
options['prefix']=prefix
360360
returnself.git.archive(treeish,**options)
361361

362-
defarchive_tar_gz(self,treeish='master',prefix=None):
362+
defarchive_tar_gz(self,treeish='master',prefix=None):
363363
"""
364364
Archive and gzip the given treeish
365365
@@ -470,7 +470,7 @@ def is_dirty(self):
470470
defactive_branch(self):
471471
"""
472472
The name of the currently active branch.
473-
473+
474474
Returns
475475
str (the branch name)
476476
"""

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp