upstream/mercurial-mirror Files · mercurial/cffi/bdiffbuild.py

merge: respect parents order when using `graft` on a merge...

merge: respect parents order when using `graft` on a merge The previous code did not record the index of the replaced parent. It was always using the "graft" destination as `p1`. This could switch parents order in some situation (eg: some of the evolve evolving merge case). Recording and using the information fixes the issue in evolve. We are not aware of core commands calling graft in that fashion, so we could not build a simple test case for it using core commands.

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r43185:a4ca0610

stable

Download file

             bdiffbuild.py
        
                    32 lines
            
             | 773 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / bdiffbuild.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import cffi

      import os

      ffi = cffi.FFI()

      with open(os.path.join(os.path.join(os.path.dirname(__file__), '..'),

                             'bdiff.c')) as f:

          ffi.set_source("mercurial.cffi._bdiff",

                         f.read(), include_dirs=['mercurial'])

      ffi.cdef("""

      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,

          struct bdiff_hunk *base);

      void bdiff_freehunks(struct bdiff_hunk *l);

      void free(void*);

      """)

      if __name__ == '__main__':

          ffi.compile()

	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

				from __future__ import absolute_import

				import cffi
				import os

				ffi = cffi.FFI()
				with open(os.path.join(os.path.join(os.path.dirname(__file__), '..'),
				'bdiff.c')) as f:
				ffi.set_source("mercurial.cffi._bdiff",
				f.read(), include_dirs=['mercurial'])
				ffi.cdef("""
				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,
				struct bdiff_hunk *base);
				void bdiff_freehunks(struct bdiff_hunk *l);
				void free(void*);
				""")

				if __name__ == '__main__':
				ffi.compile()