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

merge: sort filemap only if requested by the caller...

merge: sort filemap only if requested by the caller The name `sorted` refers to a built-in function, which is always true, so the else branch of this if statement was dead code. Because, with this fix, the function can iterate over the dict items while yielding values, the dict should not change size while the generator is running. Because of that, it is required to re-introduce code that makes a caller copy the filemap before modification, which was removed in (that changeset also introduced the filemap() method including the bug that’s being fixed by this changeset).

David Demelier - - Load All Authors

File last commit:

r49095:d8690805 default


                r52711:23116aef

stable

Download file

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

      #ifndef HG_MPATCH_H

      #define HG_MPATCH_H

      #define MPATCH_ERR_NO_MEM -3

      #define MPATCH_ERR_CANNOT_BE_DECODED -2

      #define MPATCH_ERR_INVALID_PATCH -1

      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);

      struct mpatch_flist *

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

                  ssize_t start, ssize_t end);

      #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

				#ifndef HG_MPATCH_H
				#define HG_MPATCH_H

				#define MPATCH_ERR_NO_MEM -3
				#define MPATCH_ERR_CANNOT_BE_DECODED -2
				#define MPATCH_ERR_INVALID_PATCH -1

				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);
				struct mpatch_flist *
				mpatch_fold(void bins, struct mpatch_flist (get_next_item)(void , ssize_t),
				ssize_t start, ssize_t end);

				#endif