gitar | Gitar

Add function to process file diffs in commits

Author: Maarten Vangeneugden
Date: March 9, 2022, 3:10 p.m.
Hash: 5c86ea235ea472b411e8e45835e088e8f3fe30f5
Parent: b652e5f165894a130dddc4a420b25ce231cd48c0
Modified files: GitActions/CommitInfo.py; templates/gitar/commit.djhtml

GitActions/CommitInfo.py ¶

43 additions and 0 deletions.

View changes Hide changes

# formatted file in a commit. 

# The function returns a list 

# If one line is removed, and one line is added, and both have the same line
# number, then that should be regarded as a changed line, not a removed+added line.
# This holds for each non-broken list of removed+added lines.

def process_file(source_before, source_after, deletions, additions): 
    rows = []
    before_count = 0
    after_count = 0
    while True:
        row = dict()
        # We check the deletion lines first; if a line was "changed", the
        # 'deleted' line needs to be listed first, and after that, the 'added'
        # line
        if before_count in deletions:
            row["type"] = "deletion"
            row["old_num"] = before_count
            row["line"] = deletions[before_count]
            before_count += 1
        elif after_count in additions:
            row["type"] = "addition"
            row["new_num"] = after_count
            row["line"] = additions[after_count]
            after_count += 1
        else:  # No change to this particular line
            row["old_num"] = before_count
            row["new_num"] = after_count
            if len(source_before) < before_count:
                row["line"] = source_before[before_count] 
            elif len(source_after) < after_count:
                row["line"] = source_after[after_count] 
            else:  # No lines left
                break
            # If not end of both files, increment both counters anyway
            before_count += 1
            after_count += 1
        # Adding the new row to the list of rows
        rows.append(row)
    return rows





        

    


templates/gitar/commit.djhtml ¶

16 additions and 20 deletions.

View changes Hide changes

{% load i18n %}
{% load humanize %}
{% load static %}

{% block title %}{{ repository_name }} | Gitar{% endblock title %}

{% block stylesheets %}
    {{ block.super }}
     
{% endblock stylesheets %}

{% block description %}
{{ repository_name }} {{ commit.hash|truncatechars:10 }}: {{ commit.msg }}
{% endblock description %}

{% block header %}

    {{ repository_name }}  
    ≡

{% endblock header %}

{% block main %}


    {% translate "Author" %}:
    {{ commit.author }}




    {{ commit.msg }}
    {% translate "Commited by" %} {{ commit.author }} 


{% for mod_file in commit.modified_files %}
    
        {{ mod_file.filename }}
        
    
    
    {# Determining whether we're dealing with an addition, modification or deletion #}
    {# {% if mod_file.change_type == "Added" %} #}

    
    Voor {{ mod_file.filename }}
    {{ mod_file.source_code_before }}
    Na: 
    {{ mod_file.source_code }}
    

    {% for row in rows %}
    {% for row in rows %}
    {% if row.type == "deletion" %}
    

    {% elif row.type == "addition" %}
            {{ row.old_num }}
        
        
    {% elif row.type == "addition" %}
    

    {% else %}
        
            {{ row.new_num }}
        
    {% else %}
    

    {% endif %}
            {{ row.old_num }}
        
            {{ row.new_num }}
        
    {% endif %}
        {% if row.type == "deletion" %}
        
        
        {% elif row.type == "addition" %}
        
        
        {% else %}
        
        
        {% endif %}

        }}">{{ row.old_num }}
        {% else %} {# Not a change #}
        
        

    
    
    
    {% endfor %}
    


    
    
{% endfor %}

{% endblock main %}

1	1	# formatted file in a commit.
2	2
3	3	# The function returns a list
4	4
5	5	# If one line is removed, and one line is added, and both have the same line
6	6	# number, then that should be regarded as a changed line, not a removed+added line.
7	7	# This holds for each non-broken list of removed+added lines.
8	8
+	9	def process_file(source_before, source_after, deletions, additions):
+	10	rows = []
+	11	before_count = 0
+	12	after_count = 0
+	13	while True:
+	14	row = dict()
+	15	# We check the deletion lines first; if a line was "changed", the
+	16	# 'deleted' line needs to be listed first, and after that, the 'added'
+	17	# line
+	18	if before_count in deletions:
+	19	row["type"] = "deletion"
+	20	row["old_num"] = before_count
+	21	row["line"] = deletions[before_count]
+	22	before_count += 1
+	23	elif after_count in additions:
+	24	row["type"] = "addition"
+	25	row["new_num"] = after_count
+	26	row["line"] = additions[after_count]
+	27	after_count += 1
+	28	else: # No change to this particular line
+	29	row["old_num"] = before_count
+	30	row["new_num"] = after_count
+	31	if len(source_before) < before_count:
+	32	row["line"] = source_before[before_count]
+	33	elif len(source_after) < after_count:
+	34	row["line"] = source_after[after_count]
+	35	else: # No lines left
+	36	break
+	37	# If not end of both files, increment both counters anyway
+	38	before_count += 1
+	39	after_count += 1
+	40	# Adding the new row to the list of rows
+	41	rows.append(row)
+	42	return rows
+	43
+	44
+	45
+	46
+	47
+	48
+	49
+	50
+	51