upstream/mercurial-mirror Files · mercurial/mpatch.h

bdiff: adjust criteria for getting optimal longest match in the A side middle...

bdiff: adjust criteria for getting optimal longest match in the A side middle We prefer matches closer to the middle to balance recursion, as introduced in f1ca249696ed. For ranges with uneven length, matches starting exactly in the middle should have preference. That will be optimal for matches of length 1. We will thus accept equality in the half check. For ranges with even length, half was ceil'ed when calculated but we got the preference for low matches from the 'less than half' check. To get the same result as before when we also accept equality, floor it. Without that, test-annotate.t would show some different (still correct but less optimal) results. This will change the heuristics. Tests shows a slightly different output - and sometimes slightly smaller bundles. The bundle size for 4.0 (hg bundle --base null -r 4.0 x.hg) happens to go from 22804885 to 22803824 bytes - an 0.005% reduction.

Yuya Nishihara - - Load All Authors

File last commit:

r29749:155f0cc3 default


                r30429:38ed5488

default

Download file

             mpatch.h
        
                    26 lines
            
             | 689 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / mpatch.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Maciej Fijalkowski
    
mpatch: split mpatch into two files

              r29693
            
      #ifndef _HG_MPATCH_H_

      #define _HG_MPATCH_H_

        Maciej Fijalkowski
    
mpatch: remove dependency on Python.h in mpatch.c...

              r29694
            
      #define MPATCH_ERR_NO_MEM -3

      #define MPATCH_ERR_CANNOT_BE_DECODED -2

      #define MPATCH_ERR_INVALID_PATCH -1

        Maciej Fijalkowski
    
mpatch: split mpatch into two files

              r29693
            
      struct mpatch_frag {

      	int start, end, len;

      	const char *data;

      };

      struct mpatch_flist {

      	struct mpatch_frag *base, *head, *tail;

      };

      int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res);

      ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);

      void mpatch_lfree(struct mpatch_flist *a);

      int mpatch_apply(char *buf, const char *orig, ssize_t len,

      	struct mpatch_flist *l);

        Maciej Fijalkowski
    
mpatch: remove dependency on Python.h in mpatch.c...

              r29694
            
      struct mpatch_flist *mpatch_fold(void *bins,

      	struct mpatch_flist* (*get_next_item)(void*, ssize_t),

      	ssize_t start, ssize_t end);

        Maciej Fijalkowski
    
mpatch: split mpatch into two files

              r29693
            
      #endif

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Maciej Fijalkowski mpatch: split mpatch into two files	r29693	#ifndef _HG_MPATCH_H_
		#define _HG_MPATCH_H_

Maciej Fijalkowski mpatch: remove dependency on Python.h in mpatch.c...	r29694	#define MPATCH_ERR_NO_MEM -3
		#define MPATCH_ERR_CANNOT_BE_DECODED -2
		#define MPATCH_ERR_INVALID_PATCH -1

Maciej Fijalkowski mpatch: split mpatch into two files	r29693	struct mpatch_frag {
		int start, end, len;
		const char *data;
		};

		struct mpatch_flist {
		struct mpatch_frag base, head, *tail;
		};

		int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist* res);
		ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);
		void mpatch_lfree(struct mpatch_flist *a);
		int mpatch_apply(char buf, const char orig, ssize_t len,
		struct mpatch_flist *l);
Maciej Fijalkowski mpatch: remove dependency on Python.h in mpatch.c...	r29694	struct mpatch_flist mpatch_fold(void bins,
		struct mpatch_flist* (get_next_item)(void, ssize_t),
		ssize_t start, ssize_t end);
Maciej Fijalkowski mpatch: split mpatch into two files	r29693
		#endif