New upstream release.

HACKING

@@ -1,11 +1,30 @@
+Coding style
+------------
 Where possible, please follow PEP8 with regard to coding style.
 
-Furthermore, triple-quotes should always be """, single quotes are ' unless using "
-would result in less escaping within the string.
+Furthermore, triple-quotes should always be """, single quotes are ' unless
+using " would result in less escaping within the string.
 
 All functionality should be available in pure Python. Optional C
 implementations may be written for performance reasons, but should never
 replace the Python implementation. The C implementations should follow the
 kernel/git coding style.
 
+Public methods, functions and classes should all have doc strings. Please use
+epydoc style docstrings to document parameters and return values.
+You can generate the documentation by running "make doc".
+
 Where possible please include updates to NEWS along with your improvements.
+
+Running the tests
+-----------------
+To run the testsuite, you should be able to simply run "make check". This
+will run the tests using unittest on Python 2.7 and higher, and using
+unittest2 (which you will need to have installed) on older versions of Python.
+
+ $ make check
+
+Alternatively, if you have testtools installed you can run the testsuite by
+overriding the test runner:
+
+ $ make check TESTRUNNER=testtools.run

NEWS

@@ -1,3 +1,38 @@
+0.7.1	2011-04-12
+
+ BUG FIXES
+
+  * Fix double decref in _diff_tree.c. (Ted Horst, #715528)
+
+  * Fix the build on Windows. (Pascal Quantin)
+
+  * Fix get_transport_and_path compatibility with pre-2.6.5 versions of Python.
+    (Max Bowsher, #707438)
+
+  * BaseObjectStore.determine_wants_all no longer breaks on zero SHAs.
+    (Jelmer Vernooij)
+
+  * write_tree_diff() now supports submodules.
+    (Jelmer Vernooij)
+
+  * Fix compilation for XCode 4 and older versions of distutils.sysconfig.
+    (Daniele Sluijters)
+
+ IMPROVEMENTS
+
+  * Sphinxified documentation. (Lukasz Balcerzak)
+
+  * Add Pack.keep.(Marc Brinkmann)
+
+ API CHANGES
+
+  * The order of the parameters to Tree.add(name, mode, sha) has changed, and
+    is now consistent with the rest of Dulwich. Existing code will still
+    work but print a DeprecationWarning. (Jelmer Vernooij, #663550)
+
+  * Tree.entries() is now deprecated in favour of Tree.items() and
+    Tree.iteritems(). (Jelmer Vernooij)
+
 0.7.0	2011-01-21
 
  FEATURES
@@ -389,7 +424,7 @@ note: This list is most likely incomplete for 0.6.0.
 
  FEATURES
 
-  * A new function `commit_tree' has been added that can commit a tree 
+  * A new function 'commit_tree' has been added that can commit a tree 
     based on an index.
 
  BUG FIXES

README

@@ -1,26 +1,12 @@
-This is the dulwich project. 
+This is the Dulwich project.
 
-It aims to give an interface to git repos that doesn't call out to git
-directly but instead uses pure Python.
-
-Open up a repo by passing it the path to the .git dir. You can then ask for
-HEAD with repo.head() or a ref with repo.ref(name). Both return the SHA id
-they currently point to. You can then grab this object with
-repo.get_object(sha).
-
-For the actual objects the ShaFile.from_file(filename) will return the object
-stored in the file whatever it is. To ensure you get the correct type then
-call {Blob,Tree,Commit}.from_file(filename). I will add repo methods to do
-this for you with file lookup soon.
-
-There is also support for creating blobs. Blob.from_string(string) will create
-a blob object from the string. You can then call blob.sha() to get the sha
-object for this blob, and hexdigest() on that will get its ID. 
+It aims to give an interface to git repos (both local and remote) that doesn't
+call out to git directly but instead uses pure Python.
 
 The project is named after the part of London that Mr. and Mrs. Git live in 
 in the particular Monty Python sketch. It is based on the Python-Git module 
 that James Westby <jw+debian@jameswestby.net> released in 2007 and now 
-maintained by Jelmer Vernooij and John Carr.
+maintained by Jelmer Vernooij et al.
 
 Please file bugs in the Dulwich project on Launchpad: 
 

debian/changelog

@@ -1,9 +1,10 @@
-dulwich (0.7.0-3) UNRELEASED; urgency=low
+dulwich (0.7.1-1) unstable; urgency=low
 
   * Add missing Breaks: field to python-dulwich.
   * Switch to debhelper 7, drop cdbs.
+  * New upstream release.
 
- -- Jelmer Vernooij <jelmer@debian.org>  Mon, 07 Mar 2011 04:26:27 +0100
+ -- Jelmer Vernooij <jelmer@debian.org>  Tue, 12 Apr 2011 22:18:19 +0200
 
 dulwich (0.7.0-2) unstable; urgency=low
 

docs/Makefile

@@ -0,0 +1,96 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  pdf       to make PDF document"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/dulwich.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/dulwich.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+pdf:
+	$(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf
+	@echo
+	@echo "Build finished. The PDF files are in $(BUILDDIR)/pdf."
+

docs/conf.py

@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+#
+# dulwich documentation build configuration file, created by
+# sphinx-quickstart on Thu Feb 18 23:18:28 2010.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__))))
+dulwich = __import__('dulwich')
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc']
+try:
+    import rst2pdf
+    if rst2pdf.version >= '0.16':
+        extensions.append('rst2pdf.pdfbuilder')
+except ImportError:
+    print "[NOTE] In order to build PDF you need rst2pdf with version >=0.16"
+
+
+autoclass_content = "both"
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['templates']
+
+# The suffix of source filenames.
+source_suffix = '.txt'
+
+# The encoding of source files.
+#source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'dulwich'
+copyright = u'2011, Jelmer Vernooij'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '.'.join(map(str, dulwich.__version__[:2]))
+# The full version, including alpha/beta/rc tags.
+release = '.'.join(map(str, dulwich.__version__))
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = ['build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+#html_theme = 'default'
+html_theme = 'nature'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = ['theme']
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'dulwichdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'dulwich.tex', u'dulwich Documentation',
+   u'Jelmer Vernooij', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True
+
+pdf_documents = [
+    ('index', u'dulwich', u'Documentation for dulwich',
+        u'Jelmer Vernooij'),
+]
+pdf_stylesheets = ['sphinx','kerning','a4']
+pdf_break_level = 2
+pdf_inline_footnotes = True
+

docs/index.txt

@@ -0,0 +1,36 @@
+.. _index:
+
+======================================
+dulwich - Python implementation of Git
+======================================
+
+Overview
+========
+
+.. include:: ../README
+
+Documentation
+=============
+
+
+.. toctree::
+    :maxdepth: 2
+
+    performance
+    protocol
+
+    tutorial/index
+
+
+Changelog
+=========
+
+.. include:: ../NEWS
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/make.bat

@@ -0,0 +1,121 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+set SPHINXBUILD=sphinx-build
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html      to make standalone HTML files
+    echo.  pdf       to make PDF document
+	echo.  dirhtml   to make HTML files named index.html in directories
+	echo.  pickle    to make pickle files
+	echo.  json      to make JSON files
+	echo.  htmlhelp  to make HTML files and a HTML help project
+	echo.  qthelp    to make HTML files and a qthelp project
+	echo.  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  changes   to make an overview over all changed/added/deprecated items
+	echo.  linkcheck to check all external links for integrity
+	echo.  doctest   to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\dulwich.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\dulwich.ghc
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "pdf" (
+	%SPHINXBUILD% -b pdf %ALLSPHINXOPTS% %BUILDDIR%/pdf
+	echo.
+	echo.Build finished. The PDF files are in %BUILDDIR%/pdf.
+    goto end
+)
+
+:end

docs/performance.txt

@@ -1,7 +1,11 @@
+.. _performance:
+
+==============================
 Possible areas for improvement
 ==============================
 
 Places for improvement, ordered by difficulty / effectiveness:
 
- * read_zlib() should have a C equivalent (~ 4% overhead atm)
- * unpack_object() should have a C equivalent
+* read_zlib() should have a C equivalent (~ 4% overhead atm)
+* unpack_object() should have a C equivalent
+

docs/protocol.txt

@@ -1,34 +1,65 @@
-= Git Server Protocol =
+.. _protocol:
 
-== Transport ==
-The Git protocol operates over pipes or TCP/IP. When a client connects over TCP/IP, it sends a header that tells the server which program to run and what parameters to use. When invoked over SSH, git will run a program with the parameters as command line arguments.
+===================
+Git Server Protocol
+===================
 
-== Protocols ==
+Transport
+=========
 
-=== Basics ====
+The Git protocol operates over pipes or TCP/IP. When a client connects over
+TCP/IP, it sends a header that tells the server which program to run and what
+parameters to use. When invoked over SSH, git will run a program with the
+parameters as command line arguments.
 
-Git communicates with a server by piping data between a local program and a remote program.
+Protocols
+=========
 
-A common way of sending a unit of information is a pkt_line. This is a 4 byte size as human encoded hex (i.e. totally underusing the 4 bytes...) that tells you the size of the payload, followed by the payload. The size includes the 4 byes used by the size itself.
+Basics
+------
 
-{{{
-0009ABCD\n
-}}}
+Git communicates with a server by piping data between a local program and a
+remote program.
 
-Git can also multiplex data using the sideband. As well as 4 bytes size, there would be a 1 byte channel number. This is in binary, so 1 will be \x01.
+A common way of sending a unit of information is a pkt_line. This is a 4 byte
+size as human encoded hex (i.e. totally underusing the 4 bytes...) that tells
+you the size of the payload, followed by the payload. The size includes the 4
+byes used by the size itself.
 
-Typically Git will piggyback a list of capabilities on the first pkt_line it sends. It will also look for capabilities in the first pkt_like it receives. Git will degrade as much as possible when encountering a server or client with differing capabilities.
+    0009ABCD\n
 
-==== git-upload-pack ===
+Git can also multiplex data using the sideband. As well as 4 bytes size, there
+would be a 1 byte channel number. This is in binary, so ``1`` will be ``\x01``.
 
-git-upload pack is used by git-ls-remote, git-clone, git-fetch and git-pull. And i'm sure others. Typically a client will connect a local git-fetch-pack to a remote git-upload-pack.
+Typically Git will piggyback a list of capabilities on the first pkt_line it
+sends. It will also look for capabilities in the first pkt_like it receives.
+Git will degrade as much as possible when encountering a server or client with
+differing capabilities.
 
-Capabilities for this protocol include multi_ack, thin-pack, ofs-delta, sideband and sideband-64k A thin pack can reference objects not in the current pack.
+git-upload-pack
+---------------
 
-The server tells the client what refs it has. The client states which of those SHA1's it would like. It then starts to report which SHA1's it has. The server ACKs these allowing the client to work out when to stop sending SHA1's. This saves a lot of transfer because the client can make decisions like "well if it has this SHA, then it has all its parents so i dont need to care about those". When the client stops sending shas, the server can work out an optimal pack and then send it to the client.
+git-upload pack is used by git-ls-remote, git-clone, git-fetch and git-pull.
+And i'm sure others. Typically a client will connect a local git-fetch-pack to
+a remote git-upload-pack.
 
-==== git-receive-pack ===
+Capabilities for this protocol include multi_ack, thin-pack, ofs-delta,
+sideband and sideband-64k A thin pack can reference objects not in the current
+pack.
 
-git-receive-pack is used by git push. Typically a client connects a local git-send-pack to a remote git-receive-pack.
+The server tells the client what refs it has. The client states which of those
+SHA1's it would like. It then starts to report which SHA1's it has. The server
+ACKs these allowing the client to work out when to stop sending SHA1's. This
+saves a lot of transfer because the client can make decisions like "well if it
+has this SHA, then it has all its parents so i dont need to care about those".
+When the client stops sending shas, the server can work out an optimal pack and
+then send it to the client.
+
+git-receive-pack
+----------------
+
+git-receive-pack is used by git push. Typically a client connects a local
+git-send-pack to a remote git-receive-pack.
 
 Capabilities include report-status and delete-ref.
+

docs/tutorial/3-conclusion.txt → docs/tutorial/conclusion.txt

@@ -1,3 +1,5 @@
+.. _tutorial-conclusion:
+
 Conclusion
 ==========
 

docs/tutorial/index.txt

@@ -1,10 +1,14 @@
-================
-Dulwich Tutorial
-================
+.. _tutorial:
 
-.. contents::
+========
+Tutorial
+========
+
+.. toctree::
+   :maxdepth: 2
+
+   introduction
+   repo
+   object-store
+   conclusion
 
-.. include:: 0-introduction.txt
-.. include:: 1-repo.txt
-.. include:: 2-object-store.txt
-.. include:: 3-conclusion.txt

docs/tutorial/0-introduction.txt → docs/tutorial/introduction.txt

@@ -1,3 +1,5 @@
+.. _tutorial-introduction:
+
 Introduction
 ============
 

docs/tutorial/2-object-store.txt → docs/tutorial/object-store.txt

@@ -1,3 +1,5 @@
+.. _tutorial-object-store:
+
 The object store
 ================
 
@@ -25,7 +27,7 @@ give this content a name::
 
   >>> from dulwich.objects import Tree
   >>> tree = Tree()
-  >>> tree.add(0100644, "spam", blob.id)
+  >>> tree.add("spam", 0100644, blob.id)
 
 Note that "0100644" is the octal form for a regular file with common
 permissions. You can hardcode them or you can use the ``stat`` module.

docs/tutorial/1-repo.txt → docs/tutorial/repo.txt

@@ -1,3 +1,5 @@
+.. _tutorial-repo:
+
 The Repository
 ==============
 

dulwich/__init__.py

@@ -23,4 +23,4 @@
 
 from dulwich import (client, protocol, repo, server)
 
-__version__ = (0, 7, 0)
+__version__ = (0, 7, 1)

dulwich/_diff_tree.c

@@ -20,6 +20,10 @@
 #include <Python.h>
 #include <sys/stat.h>
 
+#ifdef _MSC_VER
+typedef unsigned short mode_t;
+#endif
+
 #if (PY_VERSION_HEX < 0x02050000)
 typedef int Py_ssize_t;
 #endif
@@ -434,7 +438,6 @@ init_diff_tree(void)
 		goto error;
 	}
 
-	Py_DECREF(objects_mod);
 	Py_DECREF(diff_tree_mod);
 	return;
 

dulwich/client.py

@@ -23,7 +23,6 @@ __docformat__ = 'restructuredText'
 
 import select
 import socket
-import subprocess
 import urlparse
 
 from dulwich.errors import (
@@ -41,6 +40,12 @@ from dulwich.pack import (
     )
 
 
+# Python 2.6.6 included these in urlparse.uses_netloc upstream. Do
+# monkeypatching to enable similar behaviour in earlier Pythons:
+for scheme in ('git', 'git+ssh'):
+    if scheme not in urlparse.uses_netloc:
+        urlparse.uses_netloc.append(scheme)
+
 def _fileno_can_read(fileno):
     """Check if a file descriptor is readable."""
     return len(select.select([fileno], [], [], 0)[0]) > 0
@@ -308,6 +313,7 @@ class SubprocessGitClient(GitClient):
         GitClient.__init__(self, *args, **kwargs)
 
     def _connect(self, service, path):
+        import subprocess
         argv = ['git', service, path]
         p = SubprocessWrapper(
             subprocess.Popen(argv, bufsize=0, stdin=subprocess.PIPE,
@@ -315,9 +321,11 @@ class SubprocessGitClient(GitClient):
         return Protocol(p.read, p.write,
                         report_activity=self._report_activity), p.can_read
 
+
 class SSHVendor(object):
 
     def connect_ssh(self, host, command, username=None, port=None):
+        import subprocess
         #FIXME: This has no way to deal with passwords..
         args = ['ssh', '-x']
         if port is not None:

dulwich/index.py

@@ -330,7 +330,7 @@ def commit_tree(object_store, blobs):
                 sha = build_tree(pathjoin(path, basename))
             else:
                 (mode, sha) = entry
-            tree.add(mode, basename, sha)
+            tree.add(basename, mode, sha)
         object_store.add_object(tree)
         return tree.id
     return build_tree("")

dulwich/object_store.py

@@ -40,6 +40,7 @@ from dulwich.objects import (
     ShaFile,
     Tag,
     Tree,
+    ZERO_SHA,
     hex_to_sha,
     sha_to_hex,
     hex_to_filename,
@@ -66,7 +67,8 @@ class BaseObjectStore(object):
 
     def determine_wants_all(self, refs):
         return [sha for (ref, sha) in refs.iteritems()
-                if not sha in self and not ref.endswith("^{}")]
+                if not sha in self and not ref.endswith("^{}") and
+                   not sha == ZERO_SHA]
 
     def iter_shas(self, shas):
         """Iterate over the objects for the specified shas.
@@ -696,7 +698,7 @@ class MissingObjectFinder(object):
 
     def parse_tree(self, tree):
         self.add_todo([(sha, name, not stat.S_ISDIR(mode))
-                       for mode, name, sha in tree.entries()
+                       for name, mode, sha in tree.iteritems()
                        if not S_ISGITLINK(mode)])
 
     def parse_commit(self, commit):

dulwich/objects.py

@@ -27,6 +27,7 @@ from cStringIO import (
 import os
 import posixpath
 import stat
+import warnings
 import zlib
 
 from dulwich.errors import (
@@ -43,6 +44,7 @@ from dulwich._compat import (
     TreeEntryTuple,
     )
 
+ZERO_SHA = "0" * 40
 
 # Header fields for commits
 _TREE_HEADER = "tree"
@@ -818,14 +820,18 @@ class Tree(ShaFile):
         self._ensure_parsed()
         return iter(self._entries)
 
-    def add(self, mode, name, hexsha):
+    def add(self, name, mode, hexsha):
         """Add an entry to the tree.
 
-        :param mode: The mode of the entry as an integral type. Not all possible
-            modes are supported by git; see check() for details.
+        :param mode: The mode of the entry as an integral type. Not all 
+            possible modes are supported by git; see check() for details.
         :param name: The name of the entry, as a string.
         :param hexsha: The hex SHA of the entry as a string.
         """
+        if type(name) is int and type(mode) is str:
+            (name, mode) = (mode, name)
+            warnings.warn("Please use Tree.add(name, mode, hexsha)",
+                category=DeprecationWarning, stacklevel=2)
         self._ensure_parsed()
         self._entries[name] = mode, hexsha
         self._needs_serialization = True
@@ -837,6 +843,9 @@ class Tree(ShaFile):
             returned by the items and iteritems methods. This function will be
             deprecated in the future.
         """
+        warnings.warn("Tree.entries() is deprecated. Use Tree.items() or"
+            " Tree.iteritems() instead.", category=DeprecationWarning,
+            stacklevel=2)
         self._ensure_parsed()
         # The order of this is different from iteritems() for historical
         # reasons

dulwich/pack.py

@@ -47,7 +47,12 @@ from itertools import (
     imap,
     izip,
     )
-import mmap
+try:
+    import mmap
+except ImportError:
+    has_mmap = False
+else:
+    has_mmap = True
 import os
 import struct
 try:
@@ -163,13 +168,14 @@ def _load_file_contents(f, size=None):
         fd = f.fileno()
         if size is None:
             size = os.fstat(fd).st_size
-        try:
-            contents = mmap.mmap(fd, size, access=mmap.ACCESS_READ)
-        except mmap.error:
-            # Perhaps a socket?
-            pass
-        else:
-            return contents, size
+        if has_mmap:
+            try:
+                contents = mmap.mmap(fd, size, access=mmap.ACCESS_READ)
+            except mmap.error:
+                # Perhaps a socket?
+                pass
+            else:
+                return contents, size
     contents = f.read()
     size = len(contents)
     return contents, size
@@ -1388,7 +1394,7 @@ class Pack(object):
 
     @classmethod
     def from_lazy_objects(self, data_fn, idx_fn):
-        """Create a new pack object from callables to load pack data and 
+        """Create a new pack object from callables to load pack data and
         index objects."""
         ret = Pack("")
         ret._data_load = data_fn
@@ -1492,6 +1498,23 @@ class Pack(object):
             yield ShaFile.from_raw_chunks(
               *self.data.resolve_object(offset, type, obj))
 
+    def keep(self, msg=None):
+        """Add a .keep file for the pack, preventing git from garbage collecting it.
+
+        :param msg: A message written inside the .keep file; can be used later to
+                    determine whether or not a .keep file is obsolete.
+        :return: The path of the .keep file, as a string.
+        """
+        keepfile_name = '%s.keep' % self._basename
+        keepfile = GitFile(keepfile_name, 'wb')
+        try:
+            if msg:
+                keepfile.write(msg)
+                keepfile.write('\n')
+        finally:
+            keepfile.close()
+        return keepfile_name
+
 
 try:
     from dulwich._pack import apply_delta, bisect_find_sha

dulwich/patch.py

@@ -24,12 +24,11 @@ on.
 
 from difflib import SequenceMatcher
 import rfc822
-import subprocess
 import time
 
 from dulwich.objects import (
-    Blob,
     Commit,
+    S_ISGITLINK,
     )
 
 def write_commit_patch(f, commit, contents, progress, version=None):
@@ -47,9 +46,10 @@ def write_commit_patch(f, commit, contents, progress, version=None):
     f.write("\n")
     f.write("---\n")
     try:
+        import subprocess
         p = subprocess.Popen(["diffstat"], stdout=subprocess.PIPE,
                              stdin=subprocess.PIPE)
-    except OSError, e:
+    except (ImportError, OSError), e:
         pass # diffstat not available?
     else:
         (diffstat, _) = p.communicate(contents)
@@ -103,6 +103,55 @@ def unified_diff(a, b, fromfile='', tofile='', n=3):
                     yield '+' + line
 
 
+def write_object_diff(f, store, (old_path, old_mode, old_id),
+                                (new_path, new_mode, new_id)):
+    """Write the diff for an object.
+
+    :param f: File-like object to write to
+    :param store: Store to retrieve objects from, if necessary
+    :param (old_path, old_mode, old_hexsha): Old file
+    :param (new_path, new_mode, new_hexsha): New file
+
+    :note: the tuple elements should be None for nonexistant files
+    """
+    def shortid(hexsha):
+        if hexsha is None:
+            return "0" * 7
+        else:
+            return hexsha[:7]
+    def lines(mode, hexsha):
+        if hexsha is None:
+            return []
+        elif S_ISGITLINK(mode):
+            return ["Submodule commit " + hexsha + "\n"]
+        else:
+            return store[hexsha].data.splitlines(True)
+    if old_path is None:
+        old_path = "/dev/null"
+    else:
+        old_path = "a/%s" % old_path
+    if new_path is None:
+        new_path = "/dev/null"
+    else:
+        new_path = "b/%s" % new_path
+    f.write("diff --git %s %s\n" % (old_path, new_path))
+    if old_mode != new_mode:
+        if new_mode is not None:
+            if old_mode is not None:
+                f.write("old mode %o\n" % old_mode)
+            f.write("new mode %o\n" % new_mode)
+        else:
+            f.write("deleted mode %o\n" % old_mode)
+    f.write("index %s..%s" % (shortid(old_id), shortid(new_id)))
+    if new_mode is not None:
+        f.write(" %o" % new_mode)
+    f.write("\n")
+    old_contents = lines(old_mode, old_id)
+    new_contents = lines(new_mode, new_id)
+    f.writelines(unified_diff(old_contents, new_contents,
+        old_path, new_path))
+
+
 def write_blob_diff(f, (old_path, old_mode, old_blob),
                        (new_path, new_mode, new_blob)):
     """Write diff file header.
@@ -110,6 +159,8 @@ def write_blob_diff(f, (old_path, old_mode, old_blob),
     :param f: File-like object to write to
     :param (old_path, old_mode, old_blob): Previous file (None if nonexisting)
     :param (new_path, new_mode, new_blob): New file (None if nonexisting)
+
+    :note: The use of write_object_diff is recommended over this function.
     """
     def blob_id(blob):
         if blob is None:
@@ -156,16 +207,8 @@ def write_tree_diff(f, store, old_tree, new_tree):
     """
     changes = store.tree_changes(old_tree, new_tree)
     for (oldpath, newpath), (oldmode, newmode), (oldsha, newsha) in changes:
-        if oldsha is None:
-            old_blob = Blob.from_string("")
-        else:
-            old_blob = store[oldsha]
-        if newsha is None:
-            new_blob = Blob.from_string("")
-        else:
-            new_blob = store[newsha]
-        write_blob_diff(f, (oldpath, oldmode, old_blob),
-                           (newpath, newmode, new_blob))
+        write_object_diff(f, store, (oldpath, oldmode, oldsha),
+                                    (newpath, newmode, newsha))
 
 
 def git_am_patch_split(f):

dulwich/repo.py

@@ -955,7 +955,7 @@ class BaseRepo(object):
         """Returns a list of the commits reachable from head.
 
         Returns a list of commit objects. the first of which will be the commit
-        of head, then following theat will be the parents.
+        of head, then following that will be the parents.
 
         Raises NotCommitError if any no commits are referenced, including if the
         head parameter isn't the sha of a commit.

dulwich/tests/__init__.py

@@ -83,6 +83,7 @@ def self_test_suite():
     names = [
         'blackbox',
         'client',
+        'diff_tree',
         'fastexport',
         'file',
         'index',
@@ -103,10 +104,10 @@ def self_test_suite():
 
 def tutorial_test_suite():
     tutorial = [
-        '0-introduction',
-        '1-repo',
-        '2-object-store',
-        '3-conclusion',
+        'introduction',
+        'repo',
+        'object-store',
+        'conclusion',
         ]
     tutorial_files = ["../../docs/tutorial/%s.txt" % name for name in tutorial]
     def setup(test):

dulwich/tests/compat/__init__.py

@@ -28,6 +28,7 @@ def test_suite():
         'repository',
         'server',
         'utils',
+        'web',
         ]
     module_names = ['dulwich.tests.compat.test_' + name for name in names]
     result = unittest.TestSuite()

dulwich/tests/compat/test_web.py

@@ -43,7 +43,7 @@ from dulwich.tests.compat.server_utils import (
     ShutdownServerMixIn,
     NoSideBand64kReceivePackHandler,
     )
-from dulwich.utils import (
+from dulwich.tests.compat.utils import (
     CompatTestCase,
     )
 

dulwich/tests/test_client.py

@@ -125,7 +125,9 @@ class GitClientTests(TestCase):
         self.assertEquals('foo.bar/baz', path)
 
     def test_get_transport_and_path_error(self):
-        self.assertRaises(ValueError, get_transport_and_path, 'foo://bar/baz')
+        # Need to use a known urlparse.uses_netloc URL scheme to get the
+        # expected parsing of the URL on Python versions less than 2.6.5
+        self.assertRaises(ValueError, get_transport_and_path, 'prospero://bar/baz')
 
 
 class SSHGitClientTests(TestCase):

dulwich/tests/test_fastexport.py

@@ -61,7 +61,7 @@ class GitFastExporterTests(TestCase):
         b = Blob()
         b.data = "FOO"
         t = Tree()
-        t.add(stat.S_IFREG | 0644, "foo", b.id)
+        t.add("foo", stat.S_IFREG | 0644, b.id)
         c = Commit()
         c.committer = c.author = "Jelmer <jelmer@host>"
         c.author_time = c.commit_time = 1271345553

dulwich/tests/test_object_store.py

@@ -57,6 +57,14 @@ testobject = make_object(Blob, data="yummy data")
 
 class ObjectStoreTests(object):
 
+    def test_determine_wants_all(self):
+        self.assertEquals(["1" * 40],
+            self.store.determine_wants_all({"refs/heads/foo": "1" * 40}))
+
+    def test_determine_wants_all_zero(self):
+        self.assertEquals([],
+            self.store.determine_wants_all({"refs/heads/foo": "0" * 40}))
+
     def test_iter(self):
         self.assertEquals([], list(self.store))
 

dulwich/tests/test_objects.py

@@ -26,6 +26,7 @@ from cStringIO import StringIO
 import datetime
 import os
 import stat
+import warnings
 
 from dulwich.errors import (
     ObjectFormatException,
@@ -150,8 +151,8 @@ class BlobReadTests(TestCase):
 
     def test_read_tree_from_file(self):
         t = self.get_tree(tree_sha)
-        self.assertEqual(t.entries()[0], (33188, 'a', a_sha))
-        self.assertEqual(t.entries()[1], (33188, 'b', b_sha))
+        self.assertEqual(t.items()[0], ('a', 33188, a_sha))
+        self.assertEqual(t.items()[1], ('b', 33188, b_sha))
 
     def test_read_tag_from_file(self):
         t = self.get_tag(tag_sha)
@@ -404,6 +405,26 @@ _SORTED_TREE_ITEMS = [
 
 class TreeTests(ShaFileCheckTests):
 
+    def test_add(self):
+        myhexsha = "d80c186a03f423a81b39df39dc87fd269736ca86"
+        x = Tree()
+        x.add("myname", 0100755, myhexsha)
+        self.assertEquals(x["myname"], (0100755, myhexsha))
+        self.assertEquals('100755 myname\0' + hex_to_sha(myhexsha),
+                x.as_raw_string())
+
+    def test_add_old_order(self):
+        myhexsha = "d80c186a03f423a81b39df39dc87fd269736ca86"
+        x = Tree()
+        warnings.simplefilter("ignore", DeprecationWarning)
+        try:
+            x.add(0100755, "myname", myhexsha)
+        finally:
+            warnings.resetwarnings()
+        self.assertEquals(x["myname"], (0100755, myhexsha))
+        self.assertEquals('100755 myname\0' + hex_to_sha(myhexsha),
+                x.as_raw_string())
+
     def test_simple(self):
         myhexsha = "d80c186a03f423a81b39df39dc87fd269736ca86"
         x = Tree()

dulwich/tests/test_pack.py

@@ -304,6 +304,45 @@ class TestPack(PackTests):
                           commit.author)
         self.assertEquals([], commit.parents)
 
+    def _copy_pack(self, origpack):
+        basename = os.path.join(self.tempdir, 'somepack')
+        write_pack(basename, [(x, '') for x in origpack.iterobjects()],
+                   len(origpack))
+        return Pack(basename)
+
+    def test_keep_no_message(self):
+        p = self.get_pack(pack1_sha)
+        p = self._copy_pack(p)
+
+        keepfile_name = p.keep()
+        # file should exist
+        self.assertTrue(os.path.exists(keepfile_name))
+
+        f = open(keepfile_name, 'r')
+        try:
+            buf = f.read()
+            self.assertEqual('', buf)
+        finally:
+            f.close()
+
+    def test_keep_message(self):
+        p = self.get_pack(pack1_sha)
+        p = self._copy_pack(p)
+
+        msg = 'some message'
+        keepfile_name = p.keep(msg)
+
+        # file should exist
+        self.assertTrue(os.path.exists(keepfile_name))
+
+        # and contain the right message, with a linefeed
+        f = open(keepfile_name, 'r')
+        try:
+            buf = f.read()
+            self.assertEqual(msg + '\n', buf)
+        finally:
+            f.close()
+
     def test_name(self):
         p = self.get_pack(pack1_sha)
         self.assertEquals(pack1_sha, p.name())

dulwich/tests/test_patch.py

@@ -23,6 +23,7 @@ from cStringIO import StringIO
 from dulwich.objects import (
     Blob,
     Commit,
+    S_IFGITLINK,
     Tree,
     )
 from dulwich.object_store import (
@@ -32,6 +33,7 @@ from dulwich.patch import (
     git_am_patch_split,
     write_blob_diff,
     write_commit_patch,
+    write_object_diff,
     write_tree_diff,
     )
 from dulwich.tests import (
@@ -256,20 +258,20 @@ class DiffTests(TestCase):
         changed2 = Blob.from_string("unchanged\nadded\n")
         unchanged = Blob.from_string("unchanged\n")
         tree1 = Tree()
-        tree1.add(0644, "removed.txt", removed.id)
-        tree1.add(0644, "changed.txt", changed1.id)
-        tree1.add(0644, "unchanged.txt", changed1.id)
+        tree1.add("removed.txt", 0644, removed.id)
+        tree1.add("changed.txt", 0644, changed1.id)
+        tree1.add("unchanged.txt", 0644, changed1.id)
         tree2 = Tree()
-        tree2.add(0644, "added.txt", added.id)
-        tree2.add(0644, "changed.txt", changed2.id)
-        tree2.add(0644, "unchanged.txt", changed1.id)
+        tree2.add("added.txt", 0644, added.id)
+        tree2.add("changed.txt", 0644, changed2.id)
+        tree2.add("unchanged.txt", 0644, changed1.id)
         store.add_objects([(o, None) for o in [
             tree1, tree2, added, removed, changed1, changed2, unchanged]])
         write_tree_diff(f, store, tree1.id, tree2.id)
         self.assertEquals([
             'diff --git /dev/null b/added.txt',
             'new mode 644',
-            'index e69de29..76d4bb8 644',
+            'index 0000000..76d4bb8 644',
             '--- /dev/null',
             '+++ b/added.txt',
             '@@ -1,0 +1,1 @@',
@@ -284,9 +286,105 @@ class DiffTests(TestCase):
             '+added',
             'diff --git a/removed.txt /dev/null',
             'deleted mode 644',
-            'index 2c3f0b3..e69de29',
+            'index 2c3f0b3..0000000',
             '--- a/removed.txt',
             '+++ /dev/null',
             '@@ -1,1 +1,0 @@',
             '-removed',
             ], f.getvalue().splitlines())
+
+    def test_tree_diff_submodule(self):
+        f = StringIO()
+        store = MemoryObjectStore()
+        tree1 = Tree()
+        tree1.add("asubmodule", S_IFGITLINK,
+            "06d0bdd9e2e20377b3180e4986b14c8549b393e4")
+        tree2 = Tree()
+        tree2.add("asubmodule", S_IFGITLINK,
+            "cc975646af69f279396d4d5e1379ac6af80ee637")
+        store.add_objects([(o, None) for o in [tree1, tree2]])
+        write_tree_diff(f, store, tree1.id, tree2.id)
+        self.assertEquals([
+            'diff --git a/asubmodule b/asubmodule',
+            'index 06d0bdd..cc97564 160000',
+            '--- a/asubmodule',
+            '+++ b/asubmodule',
+            '@@ -1,1 +1,1 @@',
+            '-Submodule commit 06d0bdd9e2e20377b3180e4986b14c8549b393e4',
+            '+Submodule commit cc975646af69f279396d4d5e1379ac6af80ee637',
+            ], f.getvalue().splitlines())
+
+    def test_object_diff_blob(self):
+        f = StringIO()
+        b1 = Blob.from_string("old\nsame\n")
+        b2 = Blob.from_string("new\nsame\n")
+        store = MemoryObjectStore()
+        store.add_objects([(b1, None), (b2, None)])
+        write_object_diff(f, store, ("foo.txt", 0644, b1.id),
+                                    ("bar.txt", 0644, b2.id))
+        self.assertEquals([
+            "diff --git a/foo.txt b/bar.txt",
+            "index 3b0f961..a116b51 644",
+            "--- a/foo.txt",
+            "+++ b/bar.txt",
+            "@@ -1,2 +1,2 @@",
+            "-old",
+            "+new",
+            " same"
+            ], f.getvalue().splitlines())
+
+    def test_object_diff_add_blob(self):
+        f = StringIO()
+        store = MemoryObjectStore()
+        b2 = Blob.from_string("new\nsame\n")
+        store.add_object(b2)
+        write_object_diff(f, store, (None, None, None),
+                                    ("bar.txt", 0644, b2.id))
+        self.assertEquals([
+            'diff --git /dev/null b/bar.txt',
+             'new mode 644',
+             'index 0000000..a116b51 644',
+             '--- /dev/null',
+             '+++ b/bar.txt',
+             '@@ -1,0 +1,2 @@',
+             '+new',
+             '+same'
+            ], f.getvalue().splitlines())
+
+    def test_object_diff_remove_blob(self):
+        f = StringIO()
+        b1 = Blob.from_string("new\nsame\n")
+        store = MemoryObjectStore()
+        store.add_object(b1)
+        write_object_diff(f, store, ("bar.txt", 0644, b1.id),
+                                    (None, None, None))
+        self.assertEquals([
+            'diff --git a/bar.txt /dev/null',
+            'deleted mode 644',
+            'index a116b51..0000000',
+            '--- a/bar.txt',
+            '+++ /dev/null',
+            '@@ -1,2 +1,0 @@',
+            '-new',
+            '-same'
+            ], f.getvalue().splitlines())
+
+    def test_object_diff_kind_change(self):
+        f = StringIO()
+        b1 = Blob.from_string("new\nsame\n")
+        store = MemoryObjectStore()
+        store.add_object(b1)
+        write_object_diff(f, store, ("bar.txt", 0644, b1.id),
+            ("bar.txt", 0160000, "06d0bdd9e2e20377b3180e4986b14c8549b393e4"))
+        self.assertEquals([
+            'diff --git a/bar.txt b/bar.txt',
+            'old mode 644',
+            'new mode 160000',
+            'index a116b51..06d0bdd 160000',
+            '--- a/bar.txt',
+            '+++ b/bar.txt',
+            '@@ -1,2 +1,1 @@',
+            '-new',
+            '-same',
+            '+Submodule commit 06d0bdd9e2e20377b3180e4986b14c8549b393e4',
+            ], f.getvalue().splitlines())

dulwich/tests/test_repository.py

@@ -239,7 +239,7 @@ class RepositoryTests(TestCase):
         r = self._repo = open_repo('a.git')
         commit = r[r.head()]
         tree = r[commit.tree]
-        blob_sha = tree.entries()[0][2]
+        blob_sha = tree.items()[0][2]
         warnings.simplefilter("ignore", DeprecationWarning)
         try:
             blob = r.get_blob(blob_sha)

setup.py

@@ -8,10 +8,11 @@ except ImportError:
     from distutils.core import setup, Extension
 from distutils.core import Distribution
 
-dulwich_version_string = '0.7.0'
+dulwich_version_string = '0.7.1'
 
 include_dirs = []
 # Windows MSVC support
+import os
 import sys
 if sys.platform == 'win32':
     include_dirs.append('dulwich')
@@ -32,9 +33,30 @@ class DulwichDistribution(Distribution):
 
     pure = False
 
-        
+def runcmd(cmd, env):
+    import subprocess
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE, env=env)
+    out, err = p.communicate()
+    err = [e for e in err.splitlines()
+           if not e.startswith('Not trusting file') \
+              and not e.startswith('warning: Not importing')]
+    if err:
+        return ''
+    return out
+
+
+if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
+    # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
+    # distutils.sysconfig
+    version = runcmd(['/usr/bin/xcodebuild', '-version'], {}).splitlines()[0]
+    # Also parse only first digit, because 3.2.1 can't be parsed nicely
+    if (version.startswith('Xcode') and
+        int(version.split()[1].split('.')[0]) >= 4):
+        os.environ['ARCHFLAGS'] = '-arch i386 -arch x86_64'
+
 setup(name='dulwich',
-      description='Pure-Python Git Library',
+      description='Python Git Library',
       keywords='git',
       version=dulwich_version_string,
       url='http://samba.org/~jelmer/dulwich',
@@ -43,9 +65,12 @@ setup(name='dulwich',
       author='Jelmer Vernooij',
       author_email='jelmer@samba.org',
       long_description="""
-      Simple Pure-Python implementation of the Git file formats and
+      Simple Python implementation of the Git file formats and
       protocols. Dulwich is the place where Mr. and Mrs. Git live
       in one of the Monty Python sketches.
+
+      All functionality is available in pure Python, but (optional)
+      C extensions are also available for better performance.
       """,
       packages=['dulwich', 'dulwich.tests'],
       scripts=['bin/dulwich', 'bin/dul-daemon', 'bin/dul-web'],