summaryrefslogtreecommitdiff
path: root/lib/git/remote.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2009-11-04 17:11:19 +0100
committerSebastian Thiel <byronimo@gmail.com>2009-11-04 17:11:19 +0100
commitf1e9df152219e85798d78284beeda88f6baa9ec7 (patch)
tree857596e929556cd946518a4d1c404eb8e6d8cd87 /lib/git/remote.py
parent52bb0046c0bf0e50598c513e43b76d593f2cbbff (diff)
parentfc2201e660014c5d91fec8e3c3a3fa5a66dcf33b (diff)
downloadgitpython-f1e9df152219e85798d78284beeda88f6baa9ec7.tar.gz
Merge branch 'docs' into improvements
* docs: Converted tabs to spaces. added paragraph about the diffing engine and how to switch branches, which once more shows the need for a real checkout for all the people who do not want to implement all the safety facilities themselves Added Index Object paragraph and wrote the Remote Handling paragraph. Updated repo area added paragraph about using the git-python command Worked on the tree object handling and realized an issue with attribute naming on index objects and the way the system handles these initial work on tutorial.rst added all new files to reference.rst and corrected the worst mistakes. There are still a few errors left that I cannot fix as it complains about whitespace in the end ... that is exactly what I hate restructured text for, its just a ... anyway.
Diffstat (limited to 'lib/git/remote.py')
-rw-r--r--lib/git/remote.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/git/remote.py b/lib/git/remote.py
index b4413cce..9141fc3b 100644
--- a/lib/git/remote.py
+++ b/lib/git/remote.py
@@ -3,9 +3,7 @@
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-"""
-Module implementing a remote object allowing easy access to git remotes
-"""
+"""Module implementing a remote object allowing easy access to git remotes"""
from errors import GitCommandError
from git.utils import LazyMixin, Iterable, IterableList
@@ -137,6 +135,7 @@ class PushProgress(object):
``message``
In case of the 'WRITING' operation, it contains the amount of bytes
transferred. It may possibly be used for other purposes as well.
+
You may read the contents of the current line in self._cur_line
"""
pass
@@ -145,15 +144,17 @@ class PushProgress(object):
class PushInfo(object):
"""
Carries information about the result of a push operation of a single head::
- info = remote.push()[0]
- info.flags # bitflags providing more information about the result
- info.local_ref # Reference pointing to the local reference that was pushed
- # It is None if the ref was deleted.
- info.remote_ref_string # path to the remote reference located on the remote side
- info.remote_ref # Remote Reference on the local side corresponding to
+
+ info = remote.push()[0]
+ info.flags # bitflags providing more information about the result
+ info.local_ref # Reference pointing to the local reference that was pushed
+ # It is None if the ref was deleted.
+ info.remote_ref_string # path to the remote reference located on the remote side
+ info.remote_ref # Remote Reference on the local side corresponding to
# the remote_ref_string. It can be a TagReference as well.
- info.old_commit # commit at which the remote_ref was standing before we pushed
+ info.old_commit # commit at which the remote_ref was standing before we pushed
# it to local_ref.commit. Will be None if an error was indicated
+
"""
__slots__ = ('local_ref', 'remote_ref_string', 'flags', 'old_commit', '_remote')