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

merge: fix race that could cause wrong size in dirstate...

merge: fix race that could cause wrong size in dirstate The problem is that hg merge/update/etc work the following way: 1. figure out what files to update 2. apply the update to disk 3. apply the update to in-memory dirstate 4. write dirstate where step3 looks at the filesystem and assumes it sees the result of step2. If a file is changed between step2 and step3, step3 will record incorrect information in the dirstate. I avoid this by passing the size step3 needs directly from step2, for the common path (not implemented for change/delete conflicts for instance). I didn't fix the same race for the exec bit for now, because it's less likely to be problematic and I had trouble due to the fact that the dirstate stores the permissions differently from the manifest (st_mode vs '' 'l' 'x'), in combination with tests that pretend that symlinks are not supported. However, I moved the lstat from step3 to step2, which should tighten the race window markedly, both for the exec bit and for the mtime. Differential Revision: https://phab.mercurial-scm.org/D6475

Augie Fackler - - Load All Authors

File last commit:

r34801:76135583 default


                r42656:87a34c76

default

Download file

             mpatch.h
        
                    26 lines
            
             | 717 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;

      };

        Augie Fackler
    
mpatch: reformat function prototypes with clang-format...

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

        Maciej Fijalkowski
    
mpatch: split mpatch into two files

              r29693
            
      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,

        Augie Fackler
    
mpatch: reformat function prototypes with clang-format...

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

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

Augie Fackler mpatch: reformat function prototypes with clang-format...	r34801	int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist *res);
Maciej Fijalkowski mpatch: split mpatch into two files	r29693	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,
Augie Fackler mpatch: reformat function prototypes with clang-format...	r34801	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);
Maciej Fijalkowski mpatch: split mpatch into two files	r29693
		#endif