Skip to content

Commit 7bfca5e

Browse files
committed
Many small doc changes pulled in from the 0.1.7RC branch.
1 parent e3e2c8c commit 7bfca5e

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

CHANGES

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=======
22
CHANGES
33
=======
4-
4+
55
0.1.7
66
=======
77
This is a bugfix release and the last of its kind in 0.1.X, as 0.2.X will receive
@@ -16,7 +16,7 @@ General
1616
-------
1717
* The test suite now supports Mock 0.5 and above. The transition between Mock 0.4
1818
0.5 changed the API which required adjustments.
19-
* Many small enhancements done to the method documentation
19+
* Many small enhancements done to the method documentation
2020

2121

2222
0.1.6
@@ -152,14 +152,14 @@ Git
152152

153153
* Added support for ``stderr``, ``stdin``, and ``with_status``.
154154

155-
* ``git_dir`` is now optional in the constructor for ``git.Git``. Git now
155+
* ``git_dir`` is now optional in the constructor for ``git.Git``. Git now
156156
falls back to ``os.getcwd()`` when git_dir is not specified.
157157

158-
* add a ``with_exceptions`` keyword argument to git commands.
158+
* add a ``with_exceptions`` keyword argument to git commands.
159159
``GitCommandError`` is raised when the exit status is non-zero.
160160

161-
* add support for a ``GIT_PYTHON_TRACE`` environment variable.
162-
``GIT_PYTHON_TRACE`` allows us to debug GitPython's usage of git through
161+
* add support for a ``GIT_PYTHON_TRACE`` environment variable.
162+
``GIT_PYTHON_TRACE`` allows us to debug GitPython's usage of git through
163163
the use of an environment variable.
164164

165165
Tree
@@ -175,8 +175,8 @@ Repo
175175

176176
Tree
177177
----
178-
* Corrected problem with ``Tree.__div__`` not working with zero length files.
179-
Removed ``__len__`` override and replaced with size instead. Also made size
178+
* Corrected problem with ``Tree.__div__`` not working with zero length files.
179+
Removed ``__len__`` override and replaced with size instead. Also made size
180180
cach properly. This is a breaking change.
181181

182182
0.1.1

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.6
1+
0.1.7

doc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33

44
# You can set these variables from the command line.
5-
SPHINXOPTS =
5+
SPHINXOPTS = -w errors.txt
66
SPHINXBUILD = sphinx-build
77
PAPER =
88

doc/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
# built documents.
5151
#
5252
# The short X.Y version.
53-
version = '0.1.6'
53+
version = '0.1.7'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '0.1.6'
55+
release = '0.1.7'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.
@@ -116,7 +116,7 @@
116116
# Add any paths that contain custom static files (such as style sheets) here,
117117
# relative to this directory. They are copied after the builtin static files,
118118
# so a file named "default.css" will overwrite the builtin "default.css".
119-
html_static_path = ['static']
119+
#html_static_path = ['static']
120120

121121
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
122122
# using the given strftime format.

doc/intro.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Requirements
2020

2121
.. _Git: http://git-scm.com/
2222
.. _Python Nose: http://code.google.com/p/python-nose/
23-
.. _Mock by Michael Foord: http://www.voidspace.org.uk/python/mock.html
23+
.. _Mock by Michael Foord: http://www.voidspace.org.uk/python/mock/
2424

2525
Installing GitPython
2626
====================
@@ -40,7 +40,7 @@ here:
4040

4141
* `setuptools`_
4242
* `install setuptools <http://peak.telecommunity.com/DevCenter/EasyInstall#installation-instructions>`_
43-
* `pypi <http://pypi.python.org/pypi/SQLAlchemy>`_
43+
* `pypi <http://pypi.python.org/pypi/GitPython>`_
4444

4545
.. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
4646

@@ -69,7 +69,7 @@ Source Code
6969

7070
GitPython's git repo is available on Gitorious, which can be browsed at:
7171

72-
http://gitorious.org/projects/git-python/
72+
http://gitorious.org/git-python
7373

7474
and cloned from:
7575

lib/git/commit.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def count(cls, repo, ref, path=''):
115115
is the ref from which to begin (SHA1 or name)
116116
117117
``path``
118-
is an optinal path
118+
is an optional path
119119
120120
Returns
121121
int
@@ -212,7 +212,7 @@ def diff(cls, repo, a, b=None, paths=None):
212212
git.Diff[]::
213213
214214
between tree and the index if only a is given
215-
between two trees if a and b are given and are commits
215+
between two trees if a and b are given and are commits
216216
"""
217217
paths = paths or []
218218

lib/git/repo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ def commits_since(self, start='master', path='', since='1970-01-01'):
161161
is the branch/commit name (default 'master')
162162
163163
``path``
164-
is an optinal path to limit the returned commits to.
164+
is an optional path to limit the returned commits to.
165165
166166
167167
``since``
168-
is a string represeting a date/time
168+
is a string representing a date/time
169169
170170
Returns
171171
``git.Commit[]``
@@ -494,7 +494,7 @@ def is_dirty(self):
494494
"""
495495
if self.bare:
496496
# Bare repositories with no associated working directory are
497-
# always consired to be clean.
497+
# always considered to be clean.
498498
return False
499499

500500
return len(self.git.diff('HEAD', '--').strip()) > 0

lib/git/tree.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ def __div__(self, file):
6464
6565
Examples::
6666
67-
>>> Repo('/path/to/python-git').tree/'lib'
67+
>>> Repo('/path/to/python-git').tree()/'lib'
6868
<git.Tree "6cc23ee138be09ff8c28b07162720018b244e95e">
69-
>>> Repo('/path/to/python-git').tree/'README.txt'
69+
>>> Repo('/path/to/python-git').tree()/'README'
7070
<git.Blob "8b1e02c0fb554eed2ce2ef737a68bb369d7527df">
7171
7272
Returns

0 commit comments

Comments
 (0)