gitpython and git diff

If you want to access the contents of the diff, try this:

repo = git.Repo(repo_root.as_posix())
commit_dev = repo.commit("dev")
commit_origin_dev = repo.commit("origin/dev")
diff_index = commit_origin_dev.diff(commit_dev)
for diff_item in diff_index.iter_change_type('M'):
 print("A blob:\n{}".format(diff_item.a_blob.data_stream.read().decode('utf-8')))
 print("B blob:\n{}".format(diff_item.b_blob.data_stream.read().decode('utf-8'))) 

This will print the contents of each file.

You can use GitPython with the git command "diff", just need to use the "tree" object of each commit or the branch for that you want to see the diffs, for example:

repo = Repo('/git/repository')
t = repo.head.commit.tree
repo.git.diff(t)

This will print "all" the diffs for all files included in this commit, so if you want each one you must iterate over them.

With the actual branch it's:

repo.git.diff('HEAD~1')

Hope this help, regards.

If you're looking to recreate something close to what a standard git diff would show, try:

# cloned_repo = git.Repo.clone_from(
# url=ssh_url,
# to_path=repo_dir,
# env={"GIT_SSH_COMMAND": "ssh -i " + SSH_KEY},
# ) 
for diff_item in cloned_repo.index.diff(None, create_patch=True):
 repo_diff += (
 f"--- a/{diff_item.a_blob.name}\n+++ b/{diff_item.b_blob.name}\n"
 f"{diff_item.diff.decode('utf-8')}\n\n"
 )

Git does not store the diffs, as you have noticed. Given two blobs (before and after a change), you can use Python's difflib module to compare the data.

repo.git.diff("main", "head~5")

result:

@@ -97,6 +97,25 @@ + </configuration> + + </plugin> + <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.5</version> - <configuration> - <effort>Low</effort> - <threshold>Medium</threshold> 

If you want to do git diff on a file between two commits this is the way to do it:

import git
 
repo = git.Repo()
path_to_a_file = "diff_this_file_across_commits.txt"
 
commits_touching_path = list(repo.iter_commits(paths=path_to_a_file))
 
print repo.git.diff(commits_touching_path[0], commits_touching_path[1], path_to_a_file)

This will show you the differences between two latest commits that were done to the file you specify.

My task was compared to two files in different places. Here is a working option.

unidiff dependence that needs to be set as an additional module.

pip install unidiff

import difflib
from unidiff import PatchedFile, PatchSet
def create_diff(file1, file2):
 with open(file1, 'r',encoding='utf-8') as f1:
 lines1 = f1.readlines()
 with open(file2, 'r',encoding='utf-8') as f2:
 lines2 = f2.readlines()
 diff = difflib.unified_diff(lines1, lines2, fromfile=file1, tofile=file2)
 diff_string = ''.join(diff) 
 # patch = PatchedFile.from_string(diff_string)
 patch = PatchSet.from_string(diff_string)
 return str(patch)
if __name__ == "__main__":
 file1 = r"path/to/file1.txt"
 file2 = r"path/to/file2.txt"
 print(create_diff(file1, file2))
 

result

--- c:\REPO\path\to\file1.txt
+++ c:\REPO\path\to\file2.tx
@@ -6021,28 +6021,6 @@
 k3.setucs(k3.k_delete, cursnm)
 if exp_p.result_hh:
 k3.visible(exp_p.parent)
-
- #-------------------------------------------------------------------------------
- # cursnm = get_random_name(pref="u")

Here is how you do it

import git
repo = git.Repo("path/of/repo/")
# the below gives us all commits
repo.commits()
# take the first and last commit
a_commit = repo.commits()[0]
b_commit = repo.commits()[1]
# now get the diff
repo.diff(a_commit,b_commit)

PyDriller +1

pip install pydriller

But with the new API:

Breaking API: ```
from pydriller import Repository
for commit in Repository('https://github.com/ishepard/pydriller').traverse_commits():
 print(commit.hash)
 print(commit.msg)
 print(commit.author.name)
 for file in commit.modified_files:
 print(file.filename, ' has changed')

• python
• git
• git-diff
• gitpython