Skip to content
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.

Sign up for GitHub

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

Git commit graph visualization on history sidebar #1156

Merged
merged 31 commits into from
Aug 19, 2022
Merged

Git commit graph visualization on history sidebar #1156

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ca968ae
Reformatted git.py file
iflinda Jul 22, 2022
4a0a69e
Merge remote-tracking branch 'origin' into issue-1109
iflinda Jul 22, 2022
85af1cb
Merged with main
iflinda Jul 22, 2022
be28587
Crude implementation of commit graph in history panel
BoscoCHW Jul 26, 2022
38ab162
Fix bug in git log function
BoscoCHW Jul 26, 2022
21b6c31
Get heights of each commit node and feed them to GitCommitGraph
BoscoCHW Jul 27, 2022
ceb226a
delete unnecessary codes in GitCommitGraph
BoscoCHW Jul 27, 2022
7520a2c
Fix issue with switching repo
BoscoCHW Jul 27, 2022
e24c212
Implement git commit graph that is responsive to widget expansion
BoscoCHW Jul 28, 2022
bb249af
Implement git commit graph responsive to commit history expansion
BoscoCHW Jul 29, 2022
c815ce6
Implement node height look up with useState
BoscoCHW Aug 2, 2022
dbdc536
Fix commit graph responsiveness after repository change
BoscoCHW Aug 3, 2022
b82c8ff
Delete commented code and document code
BoscoCHW Aug 4, 2022
65da0d1
Clean up code
BoscoCHW Aug 4, 2022
37d7b18
Fixed test_single_log.py for a single assert
iflinda Aug 8, 2022
43aa0d4
Added an extra assertion for test_single_file_log.py
iflinda Aug 8, 2022
74bf6f8
Remove unnecessary backend codes
BoscoCHW Aug 9, 2022
3f50a0f
Remove setting command for hiding git commit graph
BoscoCHW Aug 9, 2022
0e1f3f7
remove package-lock.json
BoscoCHW Aug 15, 2022
1a58ce2
Document codes in generateGraphData and GitCommitGraph
BoscoCHW Aug 15, 2022
4c645a9
Fix jest test on HistorySideBar and PastCommitNode
BoscoCHW Aug 15, 2022
ecd748c
Testing changes to pytset test_single_file_log
iflinda Aug 16, 2022
2e8f74d
Merge branch 'issue-1109' of https://github.com/BoscoCHW/jupyterlab-g…
iflinda Aug 16, 2022
a02c56e
Modified test case for test_single_file.
iflinda Aug 16, 2022
31b056c
Define getBranch with function declaration
BoscoCHW Aug 16, 2022
b22d3f5
Change the variable commands to _SVGPath
BoscoCHW Aug 16, 2022
ba8a4c8
Merge branch 'issue-1109' of https://github.com/BoscoCHW/jupyterlab-g…
iflinda Aug 16, 2022
dacb2f9
Changed condition for returning empty array inside log and updated te…
iflinda Aug 16, 2022
459f5de
Removed graph_log function
iflinda Aug 16, 2022
225377d
Apply suggestions from code review
fcollonval Aug 19, 2022
1ed7a31
Prettify
fcollonval Aug 19, 2022
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
15 changes: 7 additions & 8 deletions jupyterlab_git/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ async def log(self, path, history_count=10, follow_path=None):
cmd = [
"git",
"log",
"--pretty=format:%H%n%an%n%ar%n%s",
"--pretty=format:%H%n%an%n%ar%n%s%n%P",
("-%d" % history_count),
]
if is_single_file:
Expand Down Expand Up @@ -523,29 +523,28 @@ async def log(self, path, history_count=10, follow_path=None):
)
line_array = parsed_lines

PREVIOUS_COMMIT_OFFSET = 5 if is_single_file else 4
PREVIOUS_COMMIT_OFFSET = 6 if is_single_file else 5
for i in range(0, len(line_array), PREVIOUS_COMMIT_OFFSET):
commit = {
"commit": line_array[i],
"author": line_array[i + 1],
"date": line_array[i + 2],
"commit_msg": line_array[i + 3],
"pre_commit": "",
"pre_commits": line_array[i + 4].split(" ")
if i + 4 < len(line_array)
else [],
}

if is_single_file:
commit["is_binary"] = line_array[i + 4].startswith("-\t-\t")
commit["is_binary"] = line_array[i + 5].startswith("-\t-\t")

# [insertions, deletions, previous_file_path?, current_file_path]
file_info = line_array[i + 4].split()
file_info = line_array[i + 5].split()

if len(file_info) == 4:
commit["previous_file_path"] = file_info[2]
commit["file_path"] = file_info[-1]

if i + PREVIOUS_COMMIT_OFFSET < len(line_array):
commit["pre_commit"] = line_array[i + PREVIOUS_COMMIT_OFFSET]

result.append(commit)

return {"code": code, "commits": result}
Expand Down
54 changes: 15 additions & 39 deletions jupyterlab_git/tests/test_single_file_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,14 @@ async def test_single_file_log():
"Lazy Senior Developer",
"2 hours ago",
"Something",
"0 1 folder/test.txt\x00\x00e6d4eed300811e886cadffb16eeed19588eb5eec",
"Lazy Senior Developer",
"18 hours ago",
"move test.txt to folder/test.txt",
"0 0 \x00test.txt\x00folder/test.txt\x00\x00263f762e0aad329c3c01bbd9a28f66403e6cfa5f",
"Lazy Senior Developer",
"18 hours ago",
"append more to test.txt",
"1 0 test.txt\x00\x00d19001d71bb928ec9ed6ae3fe1bfc474e1b771d0",
"Lazy Senior Developer",
"18 hours ago",
"add test.txt to root",
"1 0 test.txt\x00",
"e6d4eed300811e886cadffb16eeed19588eb5eec\x00\x00e6d4eed300811e886cadffb16eeed19588eb5eec"
"\x00folder/test.txt\x00",
"d19001d71bb928ec9ed6ae3fe1bfc474e1b771d0",
"Lazy Junior Developer",
"5 hours ago",
"Something More",
"263f762e0aad329c3c01bbd9a28f66403e6cfa5f\x00\x00263f762e0aad329c3c01bbd9a28f66403e6cfa5f"
"\x00folder/test.txt\x00",
]

mock_execute.return_value = maybe_future((0, "\n".join(process_output), ""))
Expand All @@ -42,37 +37,18 @@ async def test_single_file_log():
"author": "Lazy Senior Developer",
"date": "2 hours ago",
"commit_msg": "Something",
"pre_commit": "e6d4eed300811e886cadffb16eeed19588eb5eec",
"is_binary": False,
"file_path": "folder/test.txt",
},
{
"commit": "e6d4eed300811e886cadffb16eeed19588eb5eec",
"author": "Lazy Senior Developer",
"date": "18 hours ago",
"commit_msg": "move test.txt to folder/test.txt",
"pre_commit": "263f762e0aad329c3c01bbd9a28f66403e6cfa5f",
"pre_commits": ["e6d4eed300811e886cadffb16eeed19588eb5eec"],
"is_binary": False,
"file_path": "folder/test.txt",
"previous_file_path": "test.txt",
},
{
"commit": "263f762e0aad329c3c01bbd9a28f66403e6cfa5f",
"author": "Lazy Senior Developer",
"date": "18 hours ago",
"commit_msg": "append more to test.txt",
"pre_commit": "d19001d71bb928ec9ed6ae3fe1bfc474e1b771d0",
"is_binary": False,
"file_path": "test.txt",
},
{
"commit": "d19001d71bb928ec9ed6ae3fe1bfc474e1b771d0",
"author": "Lazy Senior Developer",
"date": "18 hours ago",
"commit_msg": "add test.txt to root",
"pre_commit": "",
"author": "Lazy Junior Developer",
"date": "5 hours ago",
"commit_msg": "Something More",
"pre_commits": ["263f762e0aad329c3c01bbd9a28f66403e6cfa5f"],
"is_binary": False,
"file_path": "test.txt",
"file_path": "folder/test.txt",
},
],
}
Expand All @@ -89,7 +65,7 @@ async def test_single_file_log():
[
"git",
"log",
"--pretty=format:%H%n%an%n%ar%n%s",
"--pretty=format:%H%n%an%n%ar%n%s%n%P",
"-25",
"-z",
"--numstat",
Expand Down
Loading