diff options
Diffstat (limited to 'git/refs')
| -rw-r--r-- | git/refs/head.py | 90 | ||||
| -rw-r--r-- | git/refs/log.py | 80 | ||||
| -rw-r--r-- | git/refs/reference.py | 26 | ||||
| -rw-r--r-- | git/refs/remote.py | 10 | ||||
| -rw-r--r-- | git/refs/symbolic.py | 178 | ||||
| -rw-r--r-- | git/refs/tag.py | 40 |
6 files changed, 211 insertions, 213 deletions
diff --git a/git/refs/head.py b/git/refs/head.py index 6e4879fe..1b3e7f00 100644 --- a/git/refs/head.py +++ b/git/refs/head.py @@ -10,75 +10,75 @@ from git.exc import GitCommandError __all__ = ["HEAD", "Head"] - + class HEAD(SymbolicReference): """Special case of a Symbolic Reference as it represents the repository's HEAD reference.""" _HEAD_NAME = 'HEAD' _ORIG_HEAD_NAME = 'ORIG_HEAD' __slots__ = tuple() - + def __init__(self, repo, path=_HEAD_NAME): if path != self._HEAD_NAME: raise ValueError("HEAD instance must point to %r, got %r" % (self._HEAD_NAME, path)) super(HEAD, self).__init__(repo, path) - + def orig_head(self): """ :return: SymbolicReference pointing at the ORIG_HEAD, which is maintained to contain the previous value of HEAD""" return SymbolicReference(self.repo, self._ORIG_HEAD_NAME) - + def reset(self, commit='HEAD', index=True, working_tree = False, paths=None, **kwargs): """Reset our HEAD to the given commit optionally synchronizing the index and working tree. The reference we refer to will be set to commit as well. - + :param commit: Commit object, Reference Object or string identifying a revision we should reset HEAD to. - + :param index: If True, the index will be set to match the given commit. Otherwise it will not be touched. - + :param working_tree: If True, the working tree will be forcefully adjusted to match the given commit, possibly overwriting uncommitted changes without warning. If working_tree is True, index must be true as well - + :param paths: Single path or list of paths relative to the git root directory that are to be reset. This allows to partially reset individual files. - + :param kwargs: Additional arguments passed to git-reset. - + :return: self""" mode = "--soft" add_arg = None if index: mode = "--mixed" - + # it appears, some git-versions declare mixed and paths deprecated # see http://github.com/Byron/GitPython/issues#issue/2 if paths: mode = None # END special case # END handle index - + if working_tree: mode = "--hard" if not index: raise ValueError( "Cannot reset the working tree if the index is not reset as well") - + # END working tree handling - + if paths: add_arg = "--" # END nicely separate paths from rest - + try: self.repo.git.reset(mode, commit, add_arg, paths, **kwargs) except GitCommandError, e: @@ -87,9 +87,9 @@ class HEAD(SymbolicReference): if e.status != 1: raise # END handle exception - + return self - + class Head(Reference): """A Head is a named reference to a Commit. Every Head instance contains a name @@ -111,7 +111,7 @@ class Head(Reference): _common_path_default = "refs/heads" k_config_remote = "remote" k_config_remote_ref = "merge" # branch to merge from remote - + @classmethod def delete(cls, repo, *heads, **kwargs): """Delete the given heads @@ -124,19 +124,19 @@ class Head(Reference): if force: flag = "-D" repo.git.branch(flag, *heads) - + def set_tracking_branch(self, remote_reference): """ Configure this branch to track the given remote reference. This will alter this branch's configuration accordingly. - + :param remote_reference: The remote reference to track or None to untrack any references :return: self""" if remote_reference is not None and not isinstance(remote_reference, RemoteReference): raise ValueError("Incorrect parameter type: %r" % remote_reference) # END handle type - + writer = self.config_writer() if remote_reference is None: writer.remove_option(self.k_config_remote) @@ -148,10 +148,10 @@ class Head(Reference): writer.set_value(self.k_config_remote, remote_reference.remote_name) writer.set_value(self.k_config_remote_ref, Head.to_full_path(remote_reference.remote_head)) # END handle ref value - + return self - - + + def tracking_branch(self): """ :return: The remote_reference we are tracking, or None if we are @@ -162,50 +162,50 @@ class Head(Reference): remote_refpath = RemoteReference.to_full_path(join_path(reader.get_value(self.k_config_remote), ref.name)) return RemoteReference(self.repo, remote_refpath) # END handle have tracking branch - + # we are not a tracking branch return None - + def rename(self, new_path, force=False): """Rename self to a new path - + :param new_path: Either a simple name or a path, i.e. new_name or features/new_name. The prefix refs/heads is implied - + :param force: If True, the rename will succeed even if a head with the target name already exists. - + :return: self :note: respects the ref log as git commands are used""" flag = "-m" if force: flag = "-M" - + self.repo.git.branch(flag, self, new_path) - self.path = "%s/%s" % (self._common_path_default, new_path) + self.path = "%s/%s" % (self._common_path_default, new_path) return self - + def checkout(self, force=False, **kwargs): """Checkout this head by setting the HEAD to this reference, by updating the index to reflect the tree we point to and by updating the working tree to reflect the latest index. - + The command will fail if changed working tree files would be overwritten. - + :param force: If True, changes to the index and the working tree will be discarded. If False, GitCommandError will be raised in that situation. - + :param kwargs: Additional keyword arguments to be passed to git checkout, i.e. b='new_branch' to create a new branch at the given spot. - + :return: The active branch after the checkout operation, usually self unless a new branch has been created. - + :note: By default it is only allowed to checkout heads - everything else will leave the HEAD detached which is allowed and possible, but remains @@ -214,33 +214,31 @@ class Head(Reference): kwargs['f'] = force if kwargs['f'] == False: kwargs.pop('f') - + self.repo.git.checkout(self, **kwargs) return self.repo.active_branch - + #{ Configruation - + def _config_parser(self, read_only): if read_only: parser = self.repo.config_reader() else: parser = self.repo.config_writer() # END handle parser instance - + return SectionConstraint(parser, 'branch "%s"' % self.name) - + def config_reader(self): """ :return: A configuration parser instance constrained to only read this instance's values""" return self._config_parser(read_only=True) - + def config_writer(self): """ :return: A configuration writer instance with read-and write acccess to options of this head""" return self._config_parser(read_only=False) - - #} END configuration - + #} END configuration diff --git a/git/refs/log.py b/git/refs/log.py index 9a719ec0..d5d8d7d4 100644 --- a/git/refs/log.py +++ b/git/refs/log.py @@ -32,42 +32,42 @@ class RefLogEntry(tuple): _fmt = "%s %s %s <%s> %i %s\t%s\n" _re_hexsha_only = re.compile('^[0-9A-Fa-f]{40}$') __slots__ = tuple() - + def __repr__(self): """Representation of ourselves in git reflog format""" act = self.actor time = self.time return self._fmt % (self.oldhexsha, self.newhexsha, act.name, act.email, time[0], altz_to_utctz_str(time[1]), self.message) - + @property def oldhexsha(self): """The hexsha to the commit the ref pointed to before the change""" return self[0] - + @property def newhexsha(self): """The hexsha to the commit the ref now points to, after the change""" return self[1] - + @property def actor(self): """Actor instance, providing access""" return self[2] - + @property def time(self): """time as tuple: - + * [0] = int(time) * [1] = int(timezone_offset) in time.altzone format """ return self[3] - + @property def message(self): """Message describing the operation that acted on the reference""" return self[4] - + @classmethod def new(self, oldhexsha, newhexsha, actor, time, tz_offset, message): """:return: New instance of a RefLogEntry""" @@ -75,7 +75,7 @@ class RefLogEntry(tuple): raise ValueError("Need actor instance, got %s" % actor) # END check types return RefLogEntry((oldhexsha, newhexsha, actor, (time, tz_offset), message)) - + @classmethod def from_line(cls, line): """:return: New RefLogEntry instance from the given revlog line. @@ -93,32 +93,32 @@ class RefLogEntry(tuple): raise ValueError("Invalid hexsha: %s" % hexsha) # END if hexsha re doesn't match #END for each hexsha - + email_end = info.find('>', 82) if email_end == -1: raise ValueError("Missing token: >") #END handle missing end brace - + actor = Actor._from_string(info[82:email_end+1]) time, tz_offset = parse_date(info[email_end+2:]) - + return RefLogEntry((oldhexsha, newhexsha, actor, (time, tz_offset), msg)) - + class RefLog(list, Serializable): """A reflog contains reflog entries, each of which defines a certain state of the head in question. Custom query methods allow to retrieve log entries by date or by other criteria. - + Reflog entries are orded, the first added entry is first in the list, the last entry, i.e. the last change of the head or reference, is last in the list.""" - + __slots__ = ('_path', ) - + def __new__(cls, filepath=None): inst = super(RefLog, cls).__new__(cls) return inst - + def __init__(self, filepath=None): """Initialize this instance with an optional filepath, from which we will initialize our data. The path is also used to write changes back using @@ -127,7 +127,7 @@ class RefLog(list, Serializable): if filepath is not None: self._read_from_file() # END handle filepath - + def _read_from_file(self): try: fmap = file_contents_ro_filepath(self._path, stream=True, allow_mmap=True) @@ -135,15 +135,15 @@ class RefLog(list, Serializable): # it is possible and allowed that the file doesn't exist ! return #END handle invalid log - + try: self._deserialize(fmap) finally: fmap.close() #END handle closing of handle - + #{ Interface - + @classmethod def from_file(cls, filepath): """ @@ -152,7 +152,7 @@ class RefLog(list, Serializable): :param filepath: path to reflog :raise ValueError: If the file could not be read or was corrupted in some way""" return cls(filepath) - + @classmethod def path(cls, ref): """ @@ -161,7 +161,7 @@ class RefLog(list, Serializable): file though. :param ref: SymbolicReference instance""" return join(ref.repo.git_dir, "logs", to_native_path(ref.path)) - + @classmethod def iter_entries(cls, stream): """ @@ -179,16 +179,16 @@ class RefLog(list, Serializable): return yield new_entry(line.strip()) #END endless loop - + @classmethod def entry_at(cls, filepath, index): """:return: RefLogEntry at the given index :param filepath: full path to the index file from which to read the entry :param index: python list compatible index, i.e. it may be negative to specifiy an entry counted from the end of the list - + :raise IndexError: If the entry didn't exist - + .. note:: This method is faster as it only parses the entry at index, skipping all other lines. Nonetheless, the whole file has to be read if the index is negative @@ -204,20 +204,20 @@ class RefLog(list, Serializable): break #END abort on eof #END handle runup - + if i != index or not line: raise IndexError #END handle exception - + return RefLogEntry.from_line(line.strip()) #END handle index - + def to_file(self, filepath): """Write the contents of the reflog instance to a file at the given filepath. :param filepath: path to file, parent directories are assumed to exist""" lfd = LockedFD(filepath) assure_directory_exists(filepath, is_file=True) - + fp = lfd.open(write=True, stream=True) try: self._serialize(fp) @@ -227,11 +227,11 @@ class RefLog(list, Serializable): lfd.rollback() raise #END handle change - + @classmethod def append_entry(cls, config_reader, filepath, oldbinsha, newbinsha, message): """Append a new log entry to the revlog at filepath. - + :param config_reader: configuration reader of the repository - used to obtain user information. May be None :param filepath: full path to the log file @@ -248,10 +248,10 @@ class RefLog(list, Serializable): #END handle sha type assure_directory_exists(filepath, is_file=True) entry = RefLogEntry((bin_to_hex(oldbinsha), bin_to_hex(newbinsha), Actor.committer(config_reader), (int(time.time()), time.altzone), message)) - + lf = LockFile(filepath) lf._obtain_lock_or_raise() - + fd = open(filepath, 'a') try: fd.write(repr(entry)) @@ -259,9 +259,9 @@ class RefLog(list, Serializable): fd.close() lf._release_lock() #END handle write operation - + return entry - + def write(self): """Write this instance's data to the file we are originating from :return: self""" @@ -270,19 +270,19 @@ class RefLog(list, Serializable): #END assert path self.to_file(self._path) return self - + #} END interface - + #{ Serializable Interface def _serialize(self, stream): lm1 = len(self) - 1 write = stream.write - + # write all entries for e in self: write(repr(e)) #END for each entry - + def _deserialize(self, stream): self.extend(self.iter_entries(stream)) #} END serializable interface diff --git a/git/refs/reference.py b/git/refs/reference.py index 6842845b..d8f0c70f 100644 --- a/git/refs/reference.py +++ b/git/refs/reference.py @@ -31,11 +31,11 @@ class Reference(SymbolicReference, LazyMixin, Iterable): _points_to_commits_only = False _resolve_ref_on_create = True _common_path_default = "refs" - + 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 @@ -44,11 +44,11 @@ class Reference(SymbolicReference, LazyMixin, Iterable): 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): @@ -60,9 +60,9 @@ class Reference(SymbolicReference, LazyMixin, Iterable): oldbinsha = self.commit.binsha #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 @@ -90,18 +90,18 @@ class Reference(SymbolicReference, LazyMixin, Iterable): if len(tokens) < 3: return self.path # could be refs/HEAD return '/'.join(tokens[2:]) - + @classmethod 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 +112,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 +121,5 @@ class Reference(SymbolicReference, LazyMixin, Iterable): a branch""" tokens = self.path.split('/') return '/'.join(tokens[3:]) - + #} END remote interface diff --git a/git/refs/remote.py b/git/refs/remote.py index 6f075619..4c73b094 100644 --- a/git/refs/remote.py +++ b/git/refs/remote.py @@ -7,12 +7,12 @@ 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""" @@ -21,7 +21,7 @@ class RemoteReference(Head): 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. @@ -38,7 +38,7 @@ class RemoteReference(Head): except OSError: pass # END for each ref - + @classmethod def create(cls, *args, **kwargs): """Used to disable this method""" diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py index ef21950f..7a4bf59b 100644 --- a/git/refs/symbolic.py +++ b/git/refs/symbolic.py @@ -27,7 +27,7 @@ class SymbolicReference(object): """Represents a special case of a reference such that this reference is symbolic. It does not point to a specific commit, but to another Head, which itself specifies a commit. - + A typical example for a symbolic reference is HEAD.""" __slots__ = ("repo", "path") _resolve_ref_on_create = False @@ -35,28 +35,28 @@ class SymbolicReference(object): _common_path_default = "" _remote_common_path_default = "refs/remotes" _id_attribute_ = "name" - + def __init__(self, repo, path): self.repo = repo self.path = path - + def __str__(self): return self.path - + def __repr__(self): return '<git.%s "%s">' % (self.__class__.__name__, self.path) - + def __eq__(self, other): if hasattr(other, 'path'): return self.path == other.path return False - + def __ne__(self, other): return not ( self == other ) - + def __hash__(self): return hash(self.path) - + @property def name(self): """ @@ -64,15 +64,15 @@ class SymbolicReference(object): In case of symbolic references, the shortest assumable name is the path itself.""" return self.path - + @property def abspath(self): return join_path_native(self.repo.git_dir, self.path) - + @classmethod def _get_packed_refs_path(cls, repo): return join(repo.git_dir, 'packed-refs') - + @classmethod def _iter_packed_refs(cls, repo): """Returns an iterator yielding pairs of sha1/path pairs for the corresponding refs. @@ -89,12 +89,12 @@ class SymbolicReference(object): # END abort if we do not understand the packing scheme continue # END parse comment - + # skip dereferenced tag object entries - previous line was actual # tag reference for it if line[0] == '^': continue - + yield tuple(line.split(' ', 1)) # END for each line except (OSError,IOError): @@ -104,7 +104,7 @@ class SymbolicReference(object): # but some python version woudn't allow yields within that. # I believe files are closing themselves on destruction, so it is # alright. - + @classmethod def dereference_recursive(cls, repo, ref_path): """ @@ -116,7 +116,7 @@ class SymbolicReference(object): if hexsha is not None: return hexsha # END recursive dereferencing - + @classmethod def _get_ref_info(cls, repo, ref_path): """Return: (sha, target_ref_path) if available, the sha the file at @@ -140,17 +140,17 @@ class SymbolicReference(object): # END handle packed refs if tokens is None: raise ValueError("Reference at %r does not exist" % ref_path) - + # is it a reference ? if tokens[0] == 'ref:': return (None, tokens[1]) - + # its a commit if repo.re_hexsha_only.match(tokens[0]): return (tokens[0], None) - + raise ValueError("Failed to parse reference information from %r" % ref_path) - + def _get_object(self): """ :return: @@ -159,7 +159,7 @@ class SymbolicReference(object): # have to be dynamic here as we may be a tag which can point to anything # Our path will be resolved to the hexsha which will be used accordingly return Object.new_from_sha(self.repo, hex_to_bin(self.dereference_recursive(self.repo, self.path))) - + def _get_commit(self): """ :return: @@ -169,15 +169,15 @@ class SymbolicReference(object): if obj.type == 'tag': obj = obj.object #END dereference tag - + if obj.type != Commit.type: raise TypeError("Symbolic Reference pointed to object %r, commit was required" % obj) #END handle type return obj - + def set_commit(self, commit, logmsg = None): """As set_object, but restricts the type of object to be a Commit - + :raise ValueError: If commit is not a Commit object or doesn't point to a commit :return: self""" @@ -194,21 +194,21 @@ class SymbolicReference(object): raise ValueError("Invalid object: %s" % commit) #END handle exception # END verify type - + if invalid_type: raise ValueError("Need commit, got %r" % commit) #END handle raise - + # we leave strings to the rev-parse method below self.set_object(commit, logmsg) - + return self - - + + def set_object(self, object, logmsg = None): """Set the object we point to, possibly dereference our symbolic reference first. If the reference does not exist, it will be created - + :param object: a refspec, a SymbolicReference or an Object instance. SymbolicReferences will be dereferenced beforehand to obtain the object they point to :param logmsg: If not None, the message will be used in the reflog entry to be @@ -218,23 +218,23 @@ class SymbolicReference(object): if isinstance(object, SymbolicReference): object = object.object #END resolve references - + is_detached = True try: is_detached = self.is_detached except ValueError: pass # END handle non-existing ones - + if is_detached: return self.set_reference(object, logmsg) - + # set the commit on our reference return self._get_reference().set_object(object, logmsg) - + commit = property(_get_commit, set_commit, doc="Query or set commits directly") object = property(_get_object, set_object, doc="Return the object our ref currently refers to") - + def _get_reference(self): """:return: Reference Object we point to :raise TypeError: If this symbolic reference is detached, hence it doesn't point @@ -243,22 +243,22 @@ class SymbolicReference(object): if target_ref_path is None: raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha)) return self.from_path(self.repo, target_ref_path) - + def set_reference(self, ref, logmsg = None): """Set ourselves to the given ref. It will stay a symbol if the ref is a Reference. Otherwise an Object, given as Object instance or refspec, is assumed and if valid, will be set which effectively detaches the refererence if it was a purely symbolic one. - + :param ref: SymbolicReference instance, Object instance or refspec string Only if the ref is a SymbolicRef instance, we will point to it. Everthiny else is dereferenced to obtain the actual object. :param logmsg: If set to a string, the message will be used in the reflog. Otherwise, a reflog entry is not written for the changed reference. The previous commit of the entry will be the commit we point to now. - + See also: log_append() - + :return: self :note: This symbolic reference will not be dereferenced. For that, see ``set_object(...)``""" @@ -279,12 +279,12 @@ class SymbolicReference(object): else: raise ValueError("Unrecognized Value: %r" % ref) # END try commit attribute - + # typecheck if obj is not None and self._points_to_commits_only and obj.type != Commit.type: raise TypeError("Require commit, got %r" % obj) #END verify type - + oldbinsha = None if logmsg is not None: try: @@ -293,27 +293,27 @@ class SymbolicReference(object): oldbinsha = Commit.NULL_BIN_SHA #END handle non-existing #END retrieve old hexsha - + fpath = self.abspath assure_directory_exists(fpath, is_file=True) - + lfd = LockedFD(fpath) fd = lfd.open(write=True, stream=True) fd.write(write_value) lfd.commit() - + # Adjust the reflog if logmsg is not None: self.log_append(oldbinsha, logmsg) #END handle reflog - + return self - + # aliased reference reference = property(_get_reference, set_reference, doc="Returns the Reference we point to") ref = reference - + def is_valid(self): """ :return: @@ -325,7 +325,7 @@ class SymbolicReference(object): return False else: return True - + @property def is_detached(self): """ @@ -337,19 +337,19 @@ class SymbolicReference(object): return False except TypeError: return True - + def log(self): """ :return: RefLog for this reference. Its last entry reflects the latest change applied to this reference - + .. note:: As the log is parsed every time, its recommended to cache it for use instead of calling this method repeatedly. It should be considered read-only.""" return RefLog.from_file(RefLog.path(self)) - + def log_append(self, oldbinsha, message, newbinsha=None): """Append a logentry to the logfile of this ref - + :param oldbinsha: binary sha this ref used to point to :param message: A message describing the change :param newbinsha: The sha the ref points to now. If None, our current commit sha @@ -362,7 +362,7 @@ class SymbolicReference(object): def log_entry(self, index): """:return: RefLogEntry at the given index :param index: python list compatible positive or negative index - + .. note:: This method must read part of the reflog during execution, hence it should be used sparringly, or only if you need just one index. In that case, it will be faster than the ``log()`` method""" @@ -381,14 +381,14 @@ class SymbolicReference(object): if not path.startswith(cls._common_path_default+"/"): full_ref_path = '%s/%s' % (cls._common_path_default, path) return full_ref_path - + @classmethod def delete(cls, repo, path): """Delete the reference at the given path - + :param repo: Repository to delete the reference from - + :param path: Short or full path pointing to the reference, i.e. refs/myreference or just "myreference", hence 'refs/' is implied. @@ -419,13 +419,13 @@ class SymbolicReference(object): dropped_last_line = False continue # END skip comments and lines without our path - + # drop this line made_change = True dropped_last_line = True # END for each line in packed refs reader.close() - + # write the new lines if made_change: # write-binary is required, otherwise windows will @@ -434,14 +434,14 @@ class SymbolicReference(object): # END write out file # END open exception handling # END handle deletion - + # delete the reflog reflog_path = RefLog.path(cls(repo, full_ref_path)) if os.path.isfile(reflog_path): os.remove(reflog_path) #END remove reflog - - + + @classmethod def _create(cls, repo, path, resolve, reference, force, logmsg=None): """internal method used to create a new symbolic reference. @@ -451,12 +451,12 @@ class SymbolicReference(object): instead""" full_ref_path = cls.to_full_path(path) abs_ref_path = join(repo.git_dir, full_ref_path) - + # figure out target data target = reference if resolve: target = repo.rev_parse(str(reference)) - + if not force and isfile(abs_ref_path): target_data = str(target) if isinstance(target, SymbolicReference): @@ -467,61 +467,61 @@ class SymbolicReference(object): if existing_data != target_data: raise OSError("Reference at %r does already exist, pointing to %r, requested was %r" % (full_ref_path, existing_data, target_data)) # END no force handling - + ref = cls(repo, full_ref_path) ref.set_reference(target, logmsg) return ref - + @classmethod def create(cls, repo, path, reference='HEAD', force=False, logmsg=None): """Create a new symbolic reference, hence a reference pointing to another reference. - + :param repo: Repository to create the reference in - + :param path: full path at which the new symbolic reference is supposed to be created at, i.e. "NEW_HEAD" or "symrefs/my_new_symref" - + :param reference: The reference to which the new symbolic reference should point to. If it is a commit'ish, the symbolic ref will be detached. - + :param force: if True, force creation even if a symbolic reference with that name already exists. Raise OSError otherwise - + :param logmsg: If not None, the message to append to the reflog. Otherwise no reflog entry is written. - + :return: Newly created symbolic Reference - + :raise OSError: If a (Symbolic)Reference with the same name but different contents already exists. - + :note: This does not alter the current HEAD, index or Working Tree""" return cls._create(repo, path, cls._resolve_ref_on_create, reference, force, logmsg) - + def rename(self, new_path, force=False): """Rename self to a new path - + :param new_path: Either a simple name or a full path, i.e. new_name or features/new_name. The prefix refs/ is implied for references and will be set as needed. In case this is a symbolic ref, there is no implied prefix - + :param force: If True, the rename will succeed even if a head with the target name already exists. It will be overwritten in that case - + :return: self :raise OSError: In case a file at path but a different contents already exists """ new_path = self.to_full_path(new_path) if self.path == new_path: return self - + new_abs_path = join(self.repo.git_dir, new_path) cur_abs_path = join(self.repo.git_dir, self.path) if isfile(new_abs_path): @@ -534,23 +534,23 @@ class SymbolicReference(object): # END not force handling os.remove(new_abs_path) # END handle existing target file - + dname = dirname(new_abs_path) if not isdir(dname): os.makedirs(dname) # END create directory - + rename(cur_abs_path, new_abs_path) self.path = new_path - + return self - + @classmethod def _iter_items(cls, repo, common_path = None): if common_path is None: common_path = cls._common_path_default rela_paths = set() - + # walk loose refs # Currently we do not follow links for root, dirs, files in os.walk(join_path_native(repo.git_dir, common_path)): @@ -559,20 +559,20 @@ class SymbolicReference(object): if refs_id: dirs[0:] = ['refs'] # END prune non-refs folders - + for f in files: abs_path = to_native_path_linux(join_path(root, f)) rela_paths.add(abs_path.replace(to_native_path_linux(repo.git_dir) + '/', "")) # END for each file in root directory # END for each directory to walk - + # read packed refs for sha, rela_path in cls._iter_packed_refs(repo): if rela_path.startswith(common_path): rela_paths.add(rela_path) # END relative path matches common path # END packed refs reading - + # return paths in sorted order for path in sorted(rela_paths): try: @@ -580,7 +580,7 @@ class SymbolicReference(object): except ValueError: continue # END for each sorted relative refpath - + @classmethod def iter_items(cls, repo, common_path = None): """Find all refs in the repository @@ -596,11 +596,11 @@ class SymbolicReference(object): :return: git.SymbolicReference[], each of them is guaranteed to be a symbolic ref which is not detached and pointing to a valid ref - + List is lexigraphically sorted The returned objects represent actual subclasses, such as Head or TagReference""" return ( r for r in cls._iter_items(repo, common_path) if r.__class__ == SymbolicReference or not r.is_detached ) - + @classmethod def from_path(cls, repo, path): """ @@ -611,7 +611,7 @@ class SymbolicReference(object): depending on the given path""" if not path: raise ValueError("Cannot create Reference from %r" % path) - + for ref_type in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference): try: instance = ref_type(repo, path) diff --git a/git/refs/tag.py b/git/refs/tag.py index d78d7750..110fc612 100644 --- a/git/refs/tag.py +++ b/git/refs/tag.py @@ -3,23 +3,23 @@ from reference import Reference __all__ = ["TagReference", "Tag"] - + class TagReference(Reference): """Class representing a lightweight tag reference which either points to a commit ,a tag object or any other object. In the latter case additional information, like the signature or the tag-creator, is available. - + This tag object will always point to a commit object, but may carray additional information in a tag object:: - + tagref = TagReference.list_items(repo)[0] print tagref.commit.message if tagref.tag is not None: print tagref.tag.message""" - + __slots__ = tuple() _common_path_default = "refs/tags" - + @property def commit(self): """:return: Commit object the tag ref points to""" @@ -41,51 +41,51 @@ class TagReference(Reference): if obj.type == "tag": return obj return None - + # make object read-only # It should be reasonably hard to adjust an existing tag object = property(Reference._get_object) - + @classmethod def create(cls, repo, path, ref='HEAD', message=None, force=False, **kwargs): """Create a new tag reference. - + :param path: The name of the tag, i.e. 1.0 or releases/1.0. The prefix refs/tags is implied - + :param ref: A reference to the object you want to tag. It can be a commit, tree or blob. - + :param message: If not None, the message will be used in your tag object. This will also create an additional tag object that allows to obtain that information, i.e.:: - + tagref.tag.message - + :param force: If True, to force creation of a tag even though that tag already exists. - + :param kwargs: Additional keyword arguments to be passed to git-tag - + :return: A new TagReference""" args = ( path, ref ) if message: - kwargs['m'] = message + kwargs['m'] = message if force: kwargs['f'] = True - + repo.git.tag(*args, **kwargs) return TagReference(repo, "%s/%s" % (cls._common_path_default, path)) - + @classmethod def delete(cls, repo, *tags): """Delete the given existing tag or tags""" repo.git.tag("-d", *tags) - - - + + + # provide an alias Tag = TagReference |