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

obsolete: allow multiple predecessors in createmarkers...

obsolete: allow multiple predecessors in createmarkers The logic for this change is similar to the change to `cleanupnodes` that we did earlier. Now that the rebase code is trying to record a fold, we need to actually record it in the markers. The first step is to have the markers creation API able to receive such fold data. To keep things sane, we restrict fold to on successors.

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r39958:6335c0de

default

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