Skip to content

Add map with branches and dimensions to diagram (fixes #155) #156

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

Open
abitrolly wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add map with branches and dimensions to diagram (fixes #155) #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ddd51c
Add map with branches and dimensions to diagram (fixes #155)
abitrolly Jul 13, 2020
638f4b8
Fix x axis on minimap when there are < 4 commits
abitrolly Mar 31, 2021
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
34 changes: 25 additions & 9 deletions gitimerge.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python3

# -*- coding: utf-8 -*-

# Copyright 2012-2013 Michael Haggerty <mhagger@alum.mit.edu>
Expand Down Expand Up @@ -3930,20 +3932,34 @@ def cmd_diagram(parser, options):
merge_frontier.write_html(html, merge_state.name)
html.close()
sys.stdout.write(
'Key:\n'
'Key: Map:\n'
)

# axis for minimap
lastx = merge_state.len1-1
lasty = merge_state.len2-1
if lastx < 4:
xaxis = 'o-' + '-'.join(str(i) for i in range(lastx+1))
else:
xaxis = 'o-0-1-2..' + str(lastx)
xaxis += ' %s' % str(merge_state.tip1)

sys.stdout.write(
' * = merge done manually %(xaxis)s\n'
' . = merge done automatically 1\n'
' # = conflict that is currently blocking progress :\n'
' @ = merge was blocked but has been resolved %(len2)5d\n'
' ? = no merge recorded %(tip2)s\n'
'' % {
'xaxis': xaxis,
'tip2': merge_state.tip2,
'len2': lasty}
)
if options.frontier:
sys.stdout.write(
' |,-,+ = rectangles forming current merge frontier\n'
)
sys.stdout.write(
' * = merge done manually\n'
' . = merge done automatically\n'
' # = conflict that is currently blocking progress\n'
' @ = merge was blocked but has been resolved\n'
' ? = no merge recorded\n'
'\n'
)
sys.stdout.write('\n')


def reparent_recursively(git, start_commit, parents, end_commit):
Expand Down