diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2014-02-10 20:11:58 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2014-02-10 20:11:58 +0100 |
commit | 56d5d0c70cf3a914286fe016030c9edec25c3ae0 (patch) | |
tree | 8c2006f92a65c564227b6dc18f48507303fb4f79 /git/refs/remote.py | |
parent | 0b820e617ab21b372394bf12129c30174f57c5d7 (diff) | |
parent | dbe78c02cbdfd0a539a1e04976e1480ac0daf580 (diff) | |
download | gitpython-56d5d0c70cf3a914286fe016030c9edec25c3ae0.tar.gz |
Merge branch 'feature/spaces-and-cleanup-0.3' into 0.3
* feature/spaces-and-cleanup-0.3:
Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it
Adjusted required versions of pre-requisites, now the majority of the tests work
tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) )
Diffstat (limited to 'git/refs/remote.py')
-rw-r--r-- | git/refs/remote.py | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/git/refs/remote.py b/git/refs/remote.py index 1d45d23f..6f075619 100644 --- a/git/refs/remote.py +++ b/git/refs/remote.py @@ -7,39 +7,39 @@ import os __all__ = ["RemoteReference"] - + class RemoteReference(Head): - """Represents a reference pointing to a remote head.""" - _common_path_default = Head._remote_common_path_default - - - @classmethod - def iter_items(cls, repo, common_path = None, remote=None): - """Iterate remote references, and if given, constrain them to the given remote""" - common_path = common_path or cls._common_path_default - if remote is not None: - common_path = join_path(common_path, str(remote)) - # END handle remote constraint - return super(RemoteReference, cls).iter_items(repo, common_path) - - @classmethod - def delete(cls, repo, *refs, **kwargs): - """Delete the given remote references. - :note: - kwargs are given for compatability with the base class method as we - should not narrow the signature.""" - repo.git.branch("-d", "-r", *refs) - # the official deletion method will ignore remote symbolic refs - these - # are generally ignored in the refs/ folder. We don't though - # and delete remainders manually - for ref in refs: - try: - os.remove(join(repo.git_dir, ref.path)) - except OSError: - pass - # END for each ref - - @classmethod - def create(cls, *args, **kwargs): - """Used to disable this method""" - raise TypeError("Cannot explicitly create remote references") + """Represents a reference pointing to a remote head.""" + _common_path_default = Head._remote_common_path_default + + + @classmethod + def iter_items(cls, repo, common_path = None, remote=None): + """Iterate remote references, and if given, constrain them to the given remote""" + common_path = common_path or cls._common_path_default + if remote is not None: + common_path = join_path(common_path, str(remote)) + # END handle remote constraint + return super(RemoteReference, cls).iter_items(repo, common_path) + + @classmethod + def delete(cls, repo, *refs, **kwargs): + """Delete the given remote references. + :note: + kwargs are given for compatability with the base class method as we + should not narrow the signature.""" + repo.git.branch("-d", "-r", *refs) + # the official deletion method will ignore remote symbolic refs - these + # are generally ignored in the refs/ folder. We don't though + # and delete remainders manually + for ref in refs: + try: + os.remove(join(repo.git_dir, ref.path)) + except OSError: + pass + # END for each ref + + @classmethod + def create(cls, *args, **kwargs): + """Used to disable this method""" + raise TypeError("Cannot explicitly create remote references") |