summaryrefslogtreecommitdiff
path: root/git/refs/reference.py
diff options
context:
space:
mode:
authorCraig Northway <craig.northway@gmail.com>2014-07-25 11:26:48 +1000
committerCraig Northway <craig.northway@gmail.com>2014-07-25 19:19:22 +1000
commita23d0d8617ba3119069e610fc7b0850a17322726 (patch)
treed8bc5213dd7e7c7f0befdf65afecb13d5435f873 /git/refs/reference.py
parent75194159abce545bfa38c3172efb42da9b0017dc (diff)
downloadgitpython-a23d0d8617ba3119069e610fc7b0850a17322726.tar.gz
Autopep8 fixes with maximum line length 120
Diffstat (limited to 'git/refs/reference.py')
-rw-r--r--git/refs/reference.py56
1 files changed, 29 insertions, 27 deletions
diff --git a/git/refs/reference.py b/git/refs/reference.py
index 2aaf185f..c55070d5 100644
--- a/git/refs/reference.py
+++ b/git/refs/reference.py
@@ -3,66 +3,69 @@ import os
from symbolic import SymbolicReference
from head import HEAD
from git.util import (
- LazyMixin,
- Iterable,
- isfile,
- hex_to_bin
- )
+ LazyMixin,
+ Iterable,
+ isfile,
+ hex_to_bin
+)
__all__ = ["Reference"]
#{ Utilities
+
+
def require_remote_ref_path(func):
"""A decorator raising a TypeError if we are not a valid remote, based on the path"""
+
def wrapper(self, *args):
if not self.path.startswith(self._remote_common_path_default + "/"):
raise ValueError("ref path does not point to a remote reference: %s" % path)
return func(self, *args)
- #END wrapper
+ # END wrapper
wrapper.__name__ = func.__name__
return wrapper
#}END utilites
class Reference(SymbolicReference, LazyMixin, Iterable):
+
"""Represents a named reference to any object. Subclasses may apply restrictions though,
i.e. Heads can only point to commits."""
__slots__ = tuple()
_points_to_commits_only = False
_resolve_ref_on_create = True
_common_path_default = "refs"
-
- def __init__(self, repo, path, check_path = True):
+
+ def __init__(self, repo, path, check_path=True):
"""Initialize this instance
:param repo: Our parent repository
-
+
:param path:
Path relative to the .git/ directory pointing to the ref in question, i.e.
refs/heads/master
:param check_path: if False, you can provide any path. Otherwise the path must start with the
default path prefix of this type."""
- if check_path and not path.startswith(self._common_path_default+'/'):
+ if check_path and not path.startswith(self._common_path_default + '/'):
raise ValueError("Cannot instantiate %r from path %s" % (self.__class__.__name__, path))
super(Reference, self).__init__(repo, path)
-
def __str__(self):
return self.name
-
+
#{ Interface
- def set_object(self, object, logmsg = None):
+ def set_object(self, object, logmsg=None):
"""Special version which checks if the head-log needs an update as well"""
oldbinsha = None
head = HEAD(self.repo)
if logmsg is not None:
if not head.is_detached and head.ref == self:
oldbinsha = self.commit.binsha
- #END handle commit retrieval
- #END handle message is set
-
+ # END handle commit retrieval
+ # END handle message is set
+
super(Reference, self).set_object(object, logmsg)
-
+
if oldbinsha is not None:
# /* from refs.c in git-source
# * Special hack: If a branch is updated directly and HEAD
@@ -77,31 +80,30 @@ class Reference(SymbolicReference, LazyMixin, Iterable):
# * scenarios (even 100% of the default ones).
# */
head.log_append(oldbinsha, logmsg)
- #END check if the head
+ # END check if the head
# NOTE: Don't have to overwrite properties as the will only work without a the log
@property
def name(self):
""":return: (shortest) Name of this reference - it may contain path components"""
- # first two path tokens are can be removed as they are
+ # first two path tokens are can be removed as they are
# refs/heads or refs/tags or refs/remotes
tokens = self.path.split('/')
if len(tokens) < 3:
return self.path # could be refs/HEAD
return '/'.join(tokens[2:])
-
+
@classmethod
- def iter_items(cls, repo, common_path = None):
+ def iter_items(cls, repo, common_path=None):
"""Equivalent to SymbolicReference.iter_items, but will return non-detached
references as well."""
return cls._iter_items(repo, common_path)
-
+
#}END interface
-
-
+
#{ Remote Interface
-
+
@property
@require_remote_ref_path
def remote_name(self):
@@ -112,7 +114,7 @@ class Reference(SymbolicReference, LazyMixin, Iterable):
tokens = self.path.split('/')
# /refs/remotes/<remote name>/<branch_name>
return tokens[2]
-
+
@property
@require_remote_ref_path
def remote_head(self):
@@ -121,5 +123,5 @@ class Reference(SymbolicReference, LazyMixin, Iterable):
a branch"""
tokens = self.path.split('/')
return '/'.join(tokens[3:])
-
+
#} END remote interface