Changeset - bf39a5c8d666
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich (mads) - 5 years ago 2021-02-22 13:08:06
mads@kiilerich.com
diffs: don't add a pointless empty first chunk
2 files changed with 15 insertions and 9 deletions:
kallithea/lib/diffs.py
13
7
kallithea/tests/models/test_diff_parsers.py
2
2
0 comments (0 inline, 0 general)
kallithea/lib/diffs.py
➞
Show inline comments
 
@@ -336,103 +336,109 @@ class DiffProcessor(object):
 
                    op = 'renamed'
 
                    stats['binary'] = True
 
                    stats['ops'][RENAMED_FILENODE] = ('file renamed from %s to %s'
 
                                    % (head['rename_from'], head['rename_to']))
 
                # COPY
 
                if head.get('copy_from') and head.get('copy_to'):
 
                    op = 'modified'
 
                    stats['binary'] = True
 
                    stats['ops'][COPIED_FILENODE] = ('file copied from %s to %s'
 
                                        % (head['copy_from'], head['copy_to']))
 
                # FALL BACK: detect missed old style add or remove
 
                if op is None:
 
                    if not head['a_file'] and head['b_file']:
 
                        op = 'added'
 
                        stats['binary'] = True
 
                        stats['ops'][NEW_FILENODE] = 'new file'
 

			




	
	
	
		
 
                    elif head['a_file'] and not head['b_file']:

			




	
	
	
		
 
                        op = 'removed'

			




	
	
	
		
 
                        stats['binary'] = True

			




	
	
	
		
 
                        stats['ops'][DEL_FILENODE] = 'deleted file'

			




	
	
	
		
 

			




	
	
	
		
 
                # it's not ADD not DELETE

			




	
	
	
		
 
                if op is None:

			




	
	
	
		
 
                    op = 'modified'

			




	
	
	
		
 
                    stats['binary'] = True

			




	
	
	
		
 
                    stats['ops'][MOD_FILENODE] = 'modified file'

			




	
	
	
		
 

			




	
	
	
		
 
            # a real non-binary diff

			




	
	
	
		
 
            if head['a_file'] or head['b_file']:

			




	
	
	
		
 
                chunks, added, deleted = _parse_lines(diff_lines)

			




	
	
	
		
 
                stats['binary'] = False

			




	
	
	
		
 
                stats['added'] = added

			




	
	
	
		
 
                stats['deleted'] = deleted

			




	
	
	
		
 
                # explicit mark that it's a modified file

			




	
	
	
		
 
                if op == 'modified':

			




	
	
	
		
 
                    stats['ops'][MOD_FILENODE] = 'modified file'

			




	
	
	
		
 
            else:  # Git binary patch (or empty diff)

			




	
	
	
		
 
                # Git binary patch

			




	
	
	
		
 
                if head['bin_patch']:

			




	
	
	
		
 
                    stats['ops'][BIN_FILENODE] = 'binary diff not shown'

			




	
	
	
		
 
                chunks = []

			




	
	
	
		
 

			




	
	
	
		
 
            if op == 'removed' and chunks:

			




	
	
	
		
 
                # a way of seeing deleted content could perhaps be nice - but

			




	
	
	
		
 
                # not with the current UI

			




	
	
	
		
 
                chunks = []

			




	
	
	
		
 

			




	
	
	
		
 
            chunks.insert(0, [{

			




	
	
	
		
 
                'old_lineno': '',

			




	
	
	
		
 
                'new_lineno': '',

			




	
	
	
		
 
                'action':     'context',

			




	
	
	
		
 
                'line':       msg,

			




	
	
	
		
 
                } for _op, msg in stats['ops'].items()

			




	
	
	
		
 
                  if _op not in [MOD_FILENODE]])

			




	
	
	
		
 
            # show helpful additional texts for mode change and renaming, but not for plain 'modified file'

			




	
	
	
		
 
            msgs = [

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    'old_lineno': '',

			




	
	
	
		
 
                    'new_lineno': '',

			




	
	
	
		
 
                    'action': 'context',

			




	
	
	
		
 
                    'line': msg,

			




	
	
	
		
 
                }

			




	
	
	
		
 
                for op_, msg in stats['ops'].items()

			




	
	
	
		
 
                if op_ != MOD_FILENODE

			




	
	
	
		
 
            ]

			




	
	
	
		
 
            if msgs:

			




	
	
	
		
 
                chunks.insert(0, msgs)

			




	
	
	
		
 

			




	
	
	
		
 
            _files.append({

			




	
	
	
		
 
                'old_filename':     head['a_path'],

			




	
	
	
		
 
                'filename':         head['b_path'],

			




	
	
	
		
 
                'old_revision':     head['a_blob_id'],

			




	
	
	
		
 
                'new_revision':     head['b_blob_id'],

			




	
	
	
		
 
                'chunks':           chunks,

			




	
	
	
		
 
                'operation':        op,

			




	
	
	
		
 
                'stats':            stats,

			




	
	
	
		
 
            })

			




	
	
	
		
 

			




	
	
	
		
 
        if not html:

			




	
	
	
		
 
            return _files

			




	
	
	
		
 

			




	
	
	
		
 
        for diff_data in _files:

			




	
	
	
		
 
            for chunk in diff_data['chunks']:

			




	
	
	
		
 
                for change in chunk:

			




	
	
	
		
 
                    change['line'] = _escaper(change['line'])

			




	
	
	
		
 
                # highlight inline changes when one del is followed by one add

			




	
	
	
		
 
                lineiter = iter(chunk)

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    peekline = next(lineiter)

			




	
	
	
		
 
                    while True:

			




	
	
	
		
 
                        # find a first del line

			




	
	
	
		
 
                        while peekline['action'] != 'del':

			




	
	
	
		
 
                            peekline = next(lineiter)

			




	
	
	
		
 
                        delline = peekline

			




	
	
	
		
 
                        peekline = next(lineiter)

			




	
	
	
		
 
                        # if not followed by add, eat all following del lines

			




	
	
	
		
 
                        if peekline['action'] != 'add':

			




	
	
	
		
 
                            while peekline['action'] == 'del':

			




	
	
	
		
 
                                peekline = next(lineiter)

			




	
	
	
		
 
                            continue

			




	
	
	
		
 
                        # found an add - make sure it is the only one

			




	
	
	
		
 
                        addline = peekline

			




	
	
	
		
 
                        try:

			




	
	
	
		
 
                            peekline = next(lineiter)

			




	
	
	
		
 
                        except StopIteration:

			




	
	
	
		
 
                            # add was last line - ok

			




	
	
	
		
 
                            _highlight_inline_diff(delline, addline)

			




	
	
	
		
 
                            raise

			




	
	
	
		
 
                        if peekline['action'] != 'add':

			




	
	
	
		
 
                            # there was only one add line - ok

			




	
	
	
		
 
                            _highlight_inline_diff(delline, addline)

			




	
	
	
		
 
                except StopIteration:

			




	
	
	
		
 
                    pass

			




	
	
	
		
 

			




	
	
	
		
 
        return _files

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_diff_parsers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -299,75 +299,75 @@ DIFF_FIXTURES = {

			




	
	
	
		
 
         'binary': True,

			




	
	
	
		
 
         'deleted': 0,

			




	
	
	
		
 
          'ops': {1: 'new file 100644'}}),

			




	
	
	
		
 
        ('foo bar',

			




	
	
	
		
 
         'added',

			




	
	
	
		
 
         {'added': 1,

			




	
	
	
		
 
          'binary': False,

			




	
	
	
		
 
          'deleted': 0,

			




	
	
	
		
 
          'ops': {1: 'new file 100644'}}),

			




	
	
	
		
 
        ('test',

			




	
	
	
		
 
         'added',

			




	
	
	
		
 
         {'added': 1,

			




	
	
	
		
 
          'binary': False,

			




	
	
	
		
 
          'deleted': 0,

			




	
	
	
		
 
          'ops': {1: 'new file 100644'}}),

			




	
	
	
		
 
        ('esc\033foo',  # Note: will be parsed and handled correctly, but without good UI

			




	
	
	
		
 
         'added',

			




	
	
	
		
 
         {'added': 0,

			




	
	
	
		
 
          'binary': True,

			




	
	
	
		
 
          'deleted': 0,

			




	
	
	
		
 
          'ops': {1: 'new file 100644'}}),

			




	
	
	
		
 
        ('tab\tfoo',  # Note: will be parsed and handled correctly, but without good UI

			




	
	
	
		
 
         'added',

			




	
	
	
		
 
         {'added': 0,

			




	
	
	
		
 
          'binary': True,

			




	
	
	
		
 
          'deleted': 0,

			




	
	
	
		
 
          'ops': {1: 'new file 100644'}}),

			




	
	
	
		
 
    ],

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class TestDiffLib(base.TestController):

			




	
	
	
		
 

			




	
	
	
		
 
    @base.parametrize('diff_fixture', DIFF_FIXTURES)

			




	
	
	
		
 
    def test_diff(self, diff_fixture):

			




	
	
	
		
 
        raw_diff = fixture.load_resource(diff_fixture, strip=False)

			




	
	
	
		
 
        vcs = 'hg'

			




	
	
	
		
 
        if diff_fixture.startswith('git_'):

			




	
	
	
		
 
            vcs = 'git'

			




	
	
	
		
 
        diff_processor = DiffProcessor(raw_diff, vcs=vcs)

			




	
	
	
		
 
        data = [(x['filename'], x['operation'], x['stats']) for x in diff_processor.parsed]

			




	
	
	
		
 
        expected_data = DIFF_FIXTURES[diff_fixture]

			




	
	
	
		
 
        assert expected_data == data

			




	
	
	
		
 

			




	
	
	
		
 
    def test_diff_markup(self):

			




	
	
	
		
 
        raw_diff = fixture.load_resource('markuptest.diff', strip=False)

			




	
	
	
		
 
        diff_processor = DiffProcessor(raw_diff)

			




	
	
	
		
 
        chunks = diff_processor.parsed[0]['chunks']

			




	
	
	
		
 
        assert not chunks[0]

			




	
	
	
		
 
        assert len(chunks) == 1, chunks

			




	
	
	
		
 
        #from pprint import pprint; pprint(chunks[1])

			




	
	
	
		
 
        l = ['\n']

			




	
	
	
		
 
        for d in chunks[1]:

			




	
	
	
		
 
        for d in chunks[0]:

			




	
	
	
		
 
            l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)

			




	
	
	
		
 
        s = ''.join(l)

			




	
	
	
		
 
        assert s == r'''

			




	
	
	
		
 
context         '@@ -51,8 +51,15 @@'

			




	
	
	
		
 
unmod    51  51 '<u>\t</u>begin();'

			




	
	
	
		
 
unmod    52  52 '<u>\t</u><i></i>'

			




	
	
	
		
 
add      53     '<u>\t</u>int foo;<u class="cr"></u>'

			




	
	
	
		
 
add      54     '<u>\t</u>int bar; <u class="cr"></u>'

			




	
	
	
		
 
add      55     '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>'

			




	
	
	
		
 
add      56     '<u>\t</u>int space; <i></i>'

			




	
	
	
		
 
add      57     '<u>\t</u>int tab;<u>\t</u><i></i>'

			




	
	
	
		
 
add      58     '<u>\t</u><i></i>'

			




	
	
	
		
 
unmod    59  53 ' <i></i>'

			




	
	
	
		
 
del          54 '<u>\t</u>#define MAX_STEPS (48)'

			




	
	
	
		
 
add      60     '<u>\t</u><u class="cr"></u>'

			




	
	
	
		
 
add      61     '<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>'

			




	
	
	
		
 
unmod    62  55 ''

			




	
	
	
		
 
del          56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)'

			




	
	
	
		
 
add      63     '<u>\t</u>#define MIN_STEPS (<ins>42</ins>)'

			




	
	
	
		
 
unmod    64  57 ''

			




	
	
	
		
 
del          58 '<u>\t</u>#define <del>MORE_STEPS</del><u>\t</u><del>+</del>(<del>48</del>)<del><u>\t</u></del><del><i></i></del>'

			




	
	
	
		
 
add      65     '<u>\t</u>#define <ins>LESS_STEPS</ins><u>\t</u>(<ins>42</ins>)<ins> <i></i></ins>'

			




	
	
	
		
 
'''

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-30886
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support