diff options
| author | Antoine Musso <hashar@free.fr> | 2014-11-16 20:56:53 +0100 |
|---|---|---|
| committer | Antoine Musso <hashar@free.fr> | 2014-11-16 21:05:53 +0100 |
| commit | 614907b7445e2ed8584c1c37df7e466e3b56170f (patch) | |
| tree | 4b6e09110cd356799e9fa0f188fae55e5fa81fca /git/index/fun.py | |
| parent | be34ec23c48d6d5d8fd2ef4491981f6fb4bab8e6 (diff) | |
| download | gitpython-614907b7445e2ed8584c1c37df7e466e3b56170f.tar.gz | |
pep8 linting (whitespace before/after)
E201 whitespace after '('
E202 whitespace before ')'
E203 whitespace before ':'
E225 missing whitespace around operator
E226 missing whitespace around arithmetic operator
E227 missing whitespace around bitwise or shift operator
E228 missing whitespace around modulo operator
E231 missing whitespace after ','
E241 multiple spaces after ','
E251 unexpected spaces around keyword / parameter equals
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index 2fb09675..aea7e50f 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -209,7 +209,7 @@ def write_tree_from_cache(entries, odb, sl, si=0): # enter recursion # ci - 1 as we want to count our current item as well - sha, tree_entry_list = write_tree_from_cache(entries, odb, slice(ci-1, xi), rbound+1) + sha, tree_entry_list = write_tree_from_cache(entries, odb, slice(ci - 1, xi), rbound + 1) tree_items_append((sha, S_IFDIR, base)) # skip ahead @@ -244,7 +244,7 @@ def aggressive_tree_merge(odb, tree_shas): # one and two way is the same for us, as we don't have to handle an existing # index, instrea - if len(tree_shas) in (1,2): + if len(tree_shas) in (1, 2): for entry in traverse_tree_recursive(odb, tree_shas[-1], ''): out_append(_tree_entry_to_baseindexentry(entry, 0)) # END for each entry @@ -265,7 +265,7 @@ def aggressive_tree_merge(odb, tree_shas): # its a conflict, otherwise we take the changed version # This should be the most common branch, so it comes first if( base[0] != ours[0] and base[0] != theirs[0] and ours[0] != theirs[0] ) or \ - ( base[1] != ours[1] and base[1] != theirs[1] and ours[1] != theirs[1] ): + (base[1] != ours[1] and base[1] != theirs[1] and ours[1] != theirs[1]): # changed by both out_append(_tree_entry_to_baseindexentry(base, 1)) out_append(_tree_entry_to_baseindexentry(ours, 2)) |