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

rebase: use rewriteutil.precheck() instead of reimplementing it...

rebase: use rewriteutil.precheck() instead of reimplementing it After this patch, there's still another place in `rebase.py`, in the `--stop` code path, that reimplements `rewriteutil.precheck()`. I couldn't fix that place because it `rewriteutil.precheck()` checks that there is only one dirstate parent, which fails because we have two parents at that point. I think it's incorrect that rebase leaves the user with two parents during conflicts, but changing that is way out of scope for this series. Differential Revision: https://phab.mercurial-scm.org/D7685

Yuya Nishihara - - Load All Authors

File last commit:

r34653:174d115d default


                r44386:71fee456

default

Download file

             bdiff.h
        
                    23 lines
            
             | 467 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bdiff.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
      #ifndef _HG_BDIFF_H_

      #define _HG_BDIFF_H_

        Yuya Nishihara
    
bdiff: include compat.h in header to define ssize_t...

              r34653
            
      #include "compat.h"

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
      struct bdiff_line {

      	int hash, n, e;

      	ssize_t len;

      	const char *l;

      };

      struct bdiff_hunk;

      struct bdiff_hunk {

      	int a1, a2, b1, b2;

      	struct bdiff_hunk *next;

      };

      int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);

      int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,

        Augie Fackler
    
bdiff: format header file with clang-format...

              r34628
            
                     struct bdiff_hunk *base);

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
      void bdiff_freehunks(struct bdiff_hunk *l);

      #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 bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541	#ifndef _HG_BDIFF_H_
		#define _HG_BDIFF_H_

Yuya Nishihara bdiff: include compat.h in header to define ssize_t...	r34653	#include "compat.h"

Maciej Fijalkowski bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541	struct bdiff_line {
		int hash, n, e;
		ssize_t len;
		const char *l;
		};

		struct bdiff_hunk;
		struct bdiff_hunk {
		int a1, a2, b1, b2;
		struct bdiff_hunk *next;
		};

		int bdiff_splitlines(const char a, ssize_t len, struct bdiff_line *lr);
		int bdiff_diff(struct bdiff_line a, int an, struct bdiff_line b, int bn,
Augie Fackler bdiff: format header file with clang-format...	r34628	struct bdiff_hunk *base);
Maciej Fijalkowski bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541	void bdiff_freehunks(struct bdiff_hunk *l);

		#endif