611e979113
Now Repository.head behaves like libgit2's git_repository_head, it
returns the resolved reference. These two lines are equivalent:
ref = repo.head
ref = repo.lookup_reference('HEAD').resolve()
Before it returned a commit.
49 lines
1.2 KiB
ReStructuredText
49 lines
1.2 KiB
ReStructuredText
**********************************************************************
|
|
Diff
|
|
**********************************************************************
|
|
|
|
A diff shows the changes between trees, an index or the working dir::
|
|
|
|
>>> head = repo.revparse_single('HEAD')
|
|
|
|
# Diff two trees
|
|
>>> t0 = head.tree
|
|
>>> t1 = head.parents[0].tree
|
|
>>> diff = t1.diff(t0)
|
|
|
|
# Diff a tree with the index
|
|
>>> diff = head.tree.diff(repo.index)
|
|
|
|
# Diff a tree with the current working dir
|
|
>>> diff = head.tree.diff()
|
|
|
|
|
|
The Diff type
|
|
====================
|
|
|
|
.. autoattribute:: pygit2.Diff.patch
|
|
.. automethod:: pygit2.Diff.merge
|
|
.. automethod:: pygit2.Diff.find_similar
|
|
|
|
|
|
The Patch type
|
|
====================
|
|
|
|
.. autoattribute:: pygit2.Patch.old_file_path
|
|
.. autoattribute:: pygit2.Patch.new_file_path
|
|
.. autoattribute:: pygit2.Patch.old_oid
|
|
.. autoattribute:: pygit2.Patch.new_oid
|
|
.. autoattribute:: pygit2.Patch.status
|
|
.. autoattribute:: pygit2.Patch.similarity
|
|
.. autoattribute:: pygit2.Patch.hunks
|
|
|
|
|
|
The Hunk type
|
|
====================
|
|
|
|
.. autoattribute:: pygit2.Hunk.old_start
|
|
.. autoattribute:: pygit2.Hunk.old_lines
|
|
.. autoattribute:: pygit2.Hunk.new_start
|
|
.. autoattribute:: pygit2.Hunk.new_lines
|
|
.. autoattribute:: pygit2.Hunk.lines
|