diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 13:48:29 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 13:48:29 +0100 |
| commit | c80d727e374321573bb00e23876a67c77ff466e3 (patch) | |
| tree | 7590d6ae544eac56e83639d27e1f9013b38d8a4b /git/objects/submodule/root.py | |
| parent | 965a08c3f9f2fbd62691d533425c699c943cb865 (diff) | |
| download | GitPython-c80d727e374321573bb00e23876a67c77ff466e3.tar.gz GitPython-c80d727e374321573bb00e23876a67c77ff466e3.zip | |
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/root.py')
| -rw-r--r-- | git/objects/submodule/root.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py index f68f7567..871cc21c 100644 --- a/git/objects/submodule/root.py +++ b/git/objects/submodule/root.py @@ -186,7 +186,9 @@ class RootModule(Submodule): # in the new remote as well. if len([r for r in smr.refs if r.remote_head == sm.branch_name]) == 0: raise ValueError( - "Submodule branch named %r was not available in new submodule remote at %r" % (sm.branch_name, sm.url)) + "Submodule branch named %r was not available in new submodule remote at %r" + % (sm.branch_name, sm.url) + ) # END head is not detached # now delete the changed one @@ -245,7 +247,8 @@ class RootModule(Submodule): # this way, it will be checked out in the next step # This will change the submodule relative to us, so # the user will be able to commit the change easily - print >> sys.stderr, "WARNING: Current sha %s was not contained in the tracking branch at the new remote, setting it the the remote's tracking branch" % sm.hexsha + print >> sys.stderr, "WARNING: Current sha %s was not contained in the tracking\ + branch at the new remote, setting it the the remote's tracking branch" % sm.hexsha sm.binsha = rref.commit.binsha # END reset binsha @@ -262,7 +265,8 @@ class RootModule(Submodule): # finally, create a new tracking branch which tracks the # new remote branch progress.update(BEGIN | BRANCHCHANGE, i, len_csms, prefix + - "Changing branch of submodule %r from %s to %s" % (sm.name, psm.branch_path, sm.branch_path)) + "Changing branch of submodule %r from %s to %s" + % (sm.name, psm.branch_path, sm.branch_path)) if not dry_run: smm = sm.module() smmr = smm.remotes |