summaryrefslogtreecommitdiff
path: root/git/objects/submodule/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 13:48:29 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 13:48:29 +0100
commitc80d727e374321573bb00e23876a67c77ff466e3 (patch)
tree7590d6ae544eac56e83639d27e1f9013b38d8a4b /git/objects/submodule/base.py
parent965a08c3f9f2fbd62691d533425c699c943cb865 (diff)
downloadgitpython-c80d727e374321573bb00e23876a67c77ff466e3.tar.gz
Bumped version, updated changelog, reduced code smell
There is more work to do though, as many imports are still incorrect. Also, there are still print statements
Diffstat (limited to 'git/objects/submodule/base.py')
-rw-r--r--git/objects/submodule/base.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index e3d58077..6951fd63 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -28,7 +28,6 @@ import git
import os
import sys
-import time
__all__ = ["Submodule", "UpdateProgress"]
@@ -140,7 +139,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
return self._name
def __repr__(self):
- return "git.%s(name=%s, path=%s, url=%s, branch_path=%s)" % (type(self).__name__, self._name, self.path, self.url, self.branch_path)
+ return "git.%s(name=%s, path=%s, url=%s, branch_path=%s)"\
+ % (type(self).__name__, self._name, self.path, self.url, self.branch_path)
@classmethod
def _config_parser(cls, repo, parent_commit, read_only):
@@ -236,7 +236,7 @@ class Submodule(util.IndexObject, Iterable, Traversable):
# assure we never put backslashes into the url, as some operating systems
# like it ...
- if url != None:
+ if url is not None:
url = to_native_path_linux(url)
# END assure url correctness
@@ -449,7 +449,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
# handles dry_run
if mrepo is not None and mrepo.head.commit.binsha != binsha:
progress.update(BEGIN | UPDWKTREE, 0, 1, prefix +
- "Updating working tree at %s for submodule %r to revision %s" % (self.path, self.name, hexsha))
+ "Updating working tree at %s for submodule %r to revision %s"
+ % (self.path, self.name, hexsha))
if not dry_run:
if is_detached:
# NOTE: for now we force, the user is no supposed to change detached
@@ -638,7 +639,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
mod = self.module()
if mod.is_dirty(untracked_files=True):
raise InvalidGitRepositoryError(
- "Cannot delete module at %s with any modifications, unless force is specified" % mod.working_tree_dir)
+ "Cannot delete module at %s with any modifications, unless force is specified"
+ % mod.working_tree_dir)
# END check for dirt
# figure out whether we have new commits compared to the remotes