Skip to content

WIP Quick doc #1608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
97cdb40
Made the init repo section of quickdoc
LeoDaCoda Jul 8, 2023
6a9154b
Added git clone & git add
LeoDaCoda Jul 9, 2023
3c42bae
Finishing touches for Repo quickstart
LeoDaCoda Jul 9, 2023
10ea113
finished code for quickstart
LeoDaCoda Jul 10, 2023
b0da0a9
finished code for quickstart
LeoDaCoda Jul 10, 2023
fb35ed1
fixed some indentation
LeoDaCoda Jul 10, 2023
d42d82e
Merge remote-tracking branch 'origin/quick_doc' into quick_doc
LeoDaCoda Jul 10, 2023
47c8362
added quickstart to toctree and fixed sphinx warning
LeoDaCoda Jul 10, 2023
b7955ed
added quickstart to toctree to fix sphinx warning
LeoDaCoda Jul 10, 2023
4534f84
Merge remote-tracking branch 'origin/quick_doc' into quick_doc
LeoDaCoda Jul 10, 2023
03d26f0
Removed code from RST
LeoDaCoda Jul 10, 2023
a0045d8
Made variable names more intuitive
LeoDaCoda Jul 10, 2023
9833655
Updated the sample repo URL
LeoDaCoda Jul 10, 2023
3cda530
removed try/except and updated sample url
LeoDaCoda Jul 10, 2023
e4bbc7a
correct way to get the latest commit tree
LeoDaCoda Jul 10, 2023
a1dfd4a
convert from --all flag to all=True
LeoDaCoda Jul 11, 2023
a8b5863
removed unnecessary variables
LeoDaCoda Jul 11, 2023
abe7e6e
replaced output cell to generic commit ID
LeoDaCoda Jul 11, 2023
1369bdc
replaced hash with generic
LeoDaCoda Jul 13, 2023
9cd9431
draft of description
LeoDaCoda Jul 13, 2023
393bae5
clarified comment
LeoDaCoda Jul 13, 2023
aa6d27f
refactored print git tree
LeoDaCoda Jul 13, 2023
6d78ff1
Made trees and blobs the first section
LeoDaCoda Jul 16, 2023
2c9c0c1
Added warning about index add
LeoDaCoda Jul 16, 2023
d276107
Updated generic sha hash
LeoDaCoda Jul 16, 2023
f3968f2
Removed all reference to source code
LeoDaCoda Jul 16, 2023
9ca25d7
WIP major changes to structure to improve readability
LeoDaCoda Jul 16, 2023
7fa57e5
Added new section to print prev file
LeoDaCoda Jul 16, 2023
9d878af
change to formatting - removed = bash cmds
LeoDaCoda Jul 17, 2023
315405d
formatting wip
LeoDaCoda Jul 17, 2023
bccf8bc
added new section for diffs and formatting
LeoDaCoda Jul 18, 2023
cad1e2e
tabbed all code-blocks
LeoDaCoda Jul 18, 2023
7e589f3
fixed tabbing
LeoDaCoda Jul 18, 2023
2a45f94
redundant line
LeoDaCoda Jul 18, 2023
ef4d6d5
redundant code cell
LeoDaCoda Jul 18, 2023
8138b3a
generic hash
LeoDaCoda Jul 18, 2023
84885a3
added more resources section
LeoDaCoda Jul 19, 2023
cf3a899
typo
LeoDaCoda Jul 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GitPython Documentation
:maxdepth: 2

intro
quickstart
tutorial
reference
roadmap
Expand Down
209 changes: 209 additions & 0 deletions doc/source/quickstart.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
.. _quickdoc_toplevel:

.. highlight:: python

.. _quickdoc-label:

==============================
GitPython Quick Start Tutorial
==============================

git.Repo
********

There are a few ways to create a :class:`git.Repo <git.repo.base.Repo>` object

An existing local path
######################

$ git init path/to/dir

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [1-test_init_repo_object]
:end-before: # ![1-test_init_repo_object]

Existing local git Repo
#######################

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [2-test_init_repo_object]
:end-before: # ![2-test_init_repo_object]

Clone from URL
##############

For the rest of this tutorial we will use a clone from https://github.com/LeoDaCoda/GitPython-TestFileSys.git

git clone https://some_repo_url

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [1-test_cloned_repo_object]
:end-before: # ![1-test_cloned_repo_object]

Usage
****************

* $ git add filepath

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [2-test_cloned_repo_object]
:end-before: # ![2-test_cloned_repo_object]

Now lets add the updated file to git

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [3-test_cloned_repo_object]
:end-before: # ![3-test_cloned_repo_object]

Notice the add method requires a list as a parameter

* $ git commit -m message

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [4-test_cloned_repo_object]
:end-before: # ![4-test_cloned_repo_object]

* $ git log file

A list of commits associated with a file

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [5-test_cloned_repo_object]
:end-before: # ![5-test_cloned_repo_object]

Notice this returns a generator object

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [6-test_cloned_repo_object]
:end-before: # ![6-test_cloned_repo_object]

returns list of :class:`Commit <git.objects.commit.Commit>` objects

* $ git status

* Untracked files

Lets create a new file

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [7-test_cloned_repo_object]
:end-before: # ![7-test_cloned_repo_object]

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [8-test_cloned_repo_object]
:end-before: # ![8-test_cloned_repo_object]

* Modified files

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [9-test_cloned_repo_object]
:end-before: # ![9-test_cloned_repo_object]

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [10-test_cloned_repo_object]
:end-before: # ![10-test_cloned_repo_object]

returns a list of :class:`Diff <git.diff.Diff>` objects

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [11-test_cloned_repo_object]
:end-before: # ![11-test_cloned_repo_object]


Trees & Blobs
**************

Latest Commit Tree
##################

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [12-test_cloned_repo_object]
:end-before: # ![12-test_cloned_repo_object]

Any Commit Tree
###############

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [13-test_cloned_repo_object]
:end-before: # ![13-test_cloned_repo_object]

Display level 1 Contents
########################

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [14-test_cloned_repo_object]
:end-before: # ![14-test_cloned_repo_object]

Recurse through the Tree
########################

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [15-test_cloned_repo_object]
:end-before: # ![15-test_cloned_repo_object]

.. code-block:: python

print_files_from_git(tree)

.. code-block:: python

# Output
| Downloads, tree
----| Downloads/file3.txt, blob
| dir1, tree
----| dir1/file1.txt, blob
----| dir1/file2.txt, blob
| file4.txt, blob


Print file version
##################

.. literalinclude:: ../../test/test_quick_doc.py
:language: python
:dedent: 8
:start-after: # [16-test_cloned_repo_object]
:end-before: # ![16-test_cloned_repo_object]

.. code-block:: python

blob = tree[print_file]
print(blob.data_stream.read().decode())

# Output
# file 2 version 1
# Update version 2
174 changes: 174 additions & 0 deletions test/test_quick_doc.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
import pytest


from test.lib import TestBase
from test.lib.helper import with_rw_directory


class QuickDoc(TestBase):
def tearDown(self):
import gc

gc.collect()

@with_rw_directory
def test_init_repo_object(self, rw_dir):
path_to_dir = rw_dir

# [1-test_init_repo_object]
from git import Repo

repo = Repo.init(path_to_dir) # git init path/to/dir
assert repo.__class__ is Repo # Test to confirm repo was initialized
# ![1-test_init_repo_object]

# [2-test_init_repo_object]
import git

try:
repo = Repo(path_to_dir)
except git.NoSuchPathError:
assert False, f"No such path {path_to_dir}"
# ![2-test_init_repo_object]

@with_rw_directory
def test_cloned_repo_object(self, rw_dir):
local_dir = rw_dir

from git import Repo
import git
# code to clone from url
# [1-test_cloned_repo_object]
repo_url = "https://github.com/LeoDaCoda/GitPython-TestFileSys.git"

try:
repo = Repo.clone_from(repo_url, local_dir)
except git.CommandError:
assert False, f"Invalid address {repo_url}"
# ![1-test_cloned_repo_object]

# code to add files
# [2-test_cloned_repo_object]
# We must make a change to a file so that we can add the update to git

update_file = 'dir1/file2.txt' # we'll use ./dir1/file2.txt
with open(f"{local_dir}/{update_file}", 'a') as f:
f.write('\nUpdate version 2')
# ![2-test_cloned_repo_object]

# [3-test_cloned_repo_object]
add_file = [f"{update_file}"] # relative path from git root
repo.index.add(add_file) # notice the add function requires a list of paths
# ![3-test_cloned_repo_object]

# code to commit - not sure how to test this
# [4-test_cloned_repo_object]
repo.index.commit("Update to file2")
# ![4-test_cloned_repo_object]

# [5-test_cloned_repo_object]
file = 'dir1/file2.txt' # relative path from git root
repo.iter_commits('--all', max_count=100, paths=file)

# Outputs: <generator object Commit._iter_from_process_or_stream at 0x7fb66c186cf0>

# ![5-test_cloned_repo_object]

# [6-test_cloned_repo_object]
commits_for_file_generator = repo.iter_commits('--all', max_count=100, paths=file)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see my previous comment.

commits_for_file = [c for c in commits_for_file_generator]
commits_for_file

# Outputs: [<git.Commit "5076b368c97b01d83406ca095a301303da7f6fd4">,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These hashes are very likely to drift. Maybe it's better to use stand-ins like <git.Commit "SHA1-HEX-HASH-1">.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

# <git.Commit "d8dcd544e6fc5c00f6984424fc0cb4568abe518e">]
# ![6-test_cloned_repo_object]

# Untracked files - create new file
# [7-test_cloned_repo_object]
# We'll create a file5.txt

file5 = f'{local_dir}/file5.txt'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd generally prefer not to assign variables unless these are used at least twice.

with open(file5, 'w') as f:
f.write('file5 version 1')
# ![7-test_cloned_repo_object]

# [8-test_cloned_repo_object]
repo.untracked_files
# Output: ['file5.txt']
# ![8-test_cloned_repo_object]

# Modified files
# [9-test_cloned_repo_object]
# Lets modify one of our tracked files
file3 = f'{local_dir}/Downloads/file3.txt'
with open(file3, 'w') as f:
f.write('file3 version 2') # overwrite file 3
# ![9-test_cloned_repo_object]

# [10-test_cloned_repo_object]
repo.index.diff(None)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diffing has a terrible API and definitely needs a lot of explanation. index.diff(None) diffs against what?

# Output: [<git.diff.Diff object at 0x7fb66c076e50>,
# <git.diff.Diff object at 0x7fb66c076ca0>]
# ![10-test_cloned_repo_object]

# [11-test_cloned_repo_object]
diffs = repo.index.diff(None)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see my previous comment.

for d in diffs:
print(d.a_path)

# Downloads/file3.txt
# file4.txt
# ![11-test_cloned_repo_object]

'''Trees and Blobs'''

# Latest commit tree
# [12-test_cloned_repo_object]
tree = repo.tree()
# ![12-test_cloned_repo_object]

# Previous commit tree
# [13-test_cloned_repo_object]
prev_commits = [c for c in repo.iter_commits('--all', max_count=10)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there a way to get the last result of an iterator without creating an intermediate array? If not, and it looks like it, please ignore and leave it.

tree = prev_commits[0].tree
# ![13-test_cloned_repo_object]

# Iterating through tree
# [14-test_cloned_repo_object]
tree = repo.tree()
files_dirs = [fd for fd in tree]
files_dirs

# Output
# [<git.Tree "1d1cbc95a765e42bd46561f197eef01281a97ac0">,
# <git.Tree "4ca53fd68b9a0eafd463c9681f1a26183a40779b">,
# <git.Blob "9d384f1b6903ad992a97f91f720d8709b2b71f84">]

# ![14-test_cloned_repo_object]

# [15-test_cloned_repo_object]
def print_files_from_git(tree, delim='-', i=0):
files_dirs = [fd for fd in tree]
for fd in files_dirs:
print(f'{delim if i != 0 else ""}| {fd.path}, {fd.type}')
if fd.type == "tree":
print_files_from_git(fd, delim * 4, i + 1)

# ![15-test_cloned_repo_object]

# Printing text files
# [16-test_cloned_repo_object]
print_file = 'dir1/file2.txt'
tree[print_file]

# Output <git.Blob "3fab4a2e97ee374d0eccd854f298eee0b06a62fb">
# ![16-test_cloned_repo_object]

# [17-test_cloned_repo_object]

# ![17-test_cloned_repo_object]