| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,6 +3,7 @@ | |||
| 3 | 3 | # | |
| 4 | 4 | # This module is part of GitPython and is released under | |
| 5 | 5 | # the BSD License: http://www.opensource.org/licenses/bsd-license.php | |
| 6 | + # flake8: noqa | ||
| 6 | 7 | ||
| 7 | 8 | import os | |
| 8 | 9 | import sys | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,7 @@ | |||
| 5 | 5 | # the BSD License: http://www.opensource.org/licenses/bsd-license.php | |
| 6 | 6 | """ Module containing all exceptions thrown througout the git package, """ | |
| 7 | 7 | ||
| 8 | - from gitdb.exc import * | ||
| 8 | + from gitdb.exc import * # NOQA | ||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | 11 | class InvalidGitRepositoryError(Exception): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | """Initialize the index package""" | |
| 2 | - | ||
| 2 | + # flake8: noqa | ||
| 3 | 3 | from __future__ import absolute_import | |
| 4 | 4 | ||
| 5 | 5 | from .base import * | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,7 @@ | |||
| 1 | 1 | """ | |
| 2 | 2 | Import all submodules main classes into the package space | |
| 3 | 3 | """ | |
| 4 | + # flake8: noqa | ||
| 4 | 5 | from __future__ import absolute_import | |
| 5 | 6 | import inspect | |
| 6 | 7 | from .base import * | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,9 +17,9 @@ class Blob(base.IndexObject): | |||
| 17 | 17 | type = "blob" | |
| 18 | 18 | ||
| 19 | 19 | # valid blob modes | |
| 20 | - executable_mode = 0100755 | ||
| 21 | - file_mode = 0100644 | ||
| 22 | - link_mode = 0120000 | ||
| 20 | + executable_mode = 0o100755 | ||
| 21 | + file_mode = 0o100644 | ||
| 22 | + link_mode = 0o120000 | ||
| 23 | 23 | ||
| 24 | 24 | __slots__ = tuple() | |
| 25 | 25 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -119,10 +119,10 @@ class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable): | |||
| 119 | 119 | __slots__ = "_cache" | |
| 120 | 120 | ||
| 121 | 121 | # actual integer ids for comparison | |
| 122 | - commit_id = 016 # equals stat.S_IFDIR | stat.S_IFLNK - a directory link | ||
| 123 | - blob_id = 010 | ||
| 124 | - symlink_id = 012 | ||
| 125 | - tree_id = 004 | ||
| 122 | + commit_id = 0o16 # equals stat.S_IFDIR | stat.S_IFLNK - a directory link | ||
| 123 | + blob_id = 0o10 | ||
| 124 | + symlink_id = 0o12 | ||
| 125 | + tree_id = 0o04 | ||
| 126 | 126 | ||
| 127 | 127 | _map_id_to_type = { | |
| 128 | 128 | commit_id: Submodule, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,4 +1,4 @@ | |||
| 1 | - | ||
| 1 | + # flake8: noqa | ||
| 2 | 2 | from __future__ import absolute_import | |
| 3 | 3 | # import all modules in order, fix the names they require | |
| 4 | 4 | from .symbolic import * | |
@@ -7,16 +7,4 @@ | |||
| 7 | 7 | from .tag import * | |
| 8 | 8 | from .remote import * | |
| 9 | 9 | ||
| 10 | - # name fixes | ||
| 11 | - from . import head | ||
| 12 | - head.RemoteReference = RemoteReference | ||
| 13 | - del(head) | ||
| 14 | - | ||
| 15 | - | ||
| 16 | - from . import symbolic | ||
| 17 | - for item in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference): | ||
| 18 | - setattr(symbolic, item.__name__, item) | ||
| 19 | - del(symbolic) | ||
| 20 | - | ||
| 21 | - | ||
| 22 | 10 | from .log import * | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -81,7 +81,7 @@ def reset(self, commit='HEAD', index=True, working_tree=False, | |||
| 81 | 81 | ||
| 82 | 82 | try: | |
| 83 | 83 | self.repo.git.reset(mode, commit, add_arg, paths, **kwargs) | |
| 84 | - except GitCommandError, e: | ||
| 84 | + except GitCommandError as e: | ||
| 85 | 85 | # git nowadays may use 1 as status to indicate there are still unstaged | |
| 86 | 86 | # modifications after the reset | |
| 87 | 87 | if e.status != 1: | |
@@ -134,6 +134,7 @@ def set_tracking_branch(self, remote_reference): | |||
| 134 | 134 | :param remote_reference: The remote reference to track or None to untrack | |
| 135 | 135 | any references | |
| 136 | 136 | :return: self""" | |
| 137 | + from .remote import RemoteReference | ||
| 137 | 138 | if remote_reference is not None and not isinstance(remote_reference, RemoteReference): | |
| 138 | 139 | raise ValueError("Incorrect parameter type: %r" % remote_reference) | |
| 139 | 140 | # END handle type | |
@@ -156,6 +157,7 @@ def tracking_branch(self): | |||
| 156 | 157 | """ | |
| 157 | 158 | :return: The remote_reference we are tracking, or None if we are | |
| 158 | 159 | not a tracking branch""" | |
| 160 | + from .remote import RemoteReference | ||
| 159 | 161 | reader = self.config_reader() | |
| 160 | 162 | if reader.has_option(self.k_config_remote) and reader.has_option(self.k_config_remote_ref): | |
| 161 | 163 | ref = Head(self.repo, Head.to_full_path(reader.get_value(self.k_config_remote_ref))) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -625,6 +625,7 @@ def from_path(cls, repo, path): | |||
| 625 | 625 | ||
| 626 | 626 | # Names like HEAD are inserted after the refs module is imported - we have an import dependency | |
| 627 | 627 | # cycle and don't want to import these names in-function | |
| 628 | + from . import HEAD, Head, RemoteReference, TagReference, Reference | ||
| 628 | 629 | for ref_type in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference): | |
| 629 | 630 | try: | |
| 630 | 631 | instance = ref_type(repo, path) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,4 @@ | |||
| 1 | 1 | """Initialize the Repo package""" | |
| 2 | + # flake8: noqa | ||
| 2 | 3 | from __future__ import absolute_import | |
| 3 | 4 | from .base import * | |
| Back | FazBrowse Home | New Git URL |
0 commit comments