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

obsolescence: add test for the "branch replacement" logic during push, case D6...

obsolescence: add test for the "branch replacement" logic during push, case D6 Mercurial checks for the introduction of new heads on push. Evolution comes into play to detect if existing branches on the server are being replaced by some of the new one we push. The current code for this logic is very basic (eg: issue4354) and was poorly tested. We have a better implementation coming in the evolve extension fixing these issues and with more serious tests coverage. In the process of upstreaming this improved logic, we start with adding the test case that are already passing with the current implementation. Once they are all in, we'll upstream the better implementation and the extra test cases. See inline documentation for details about the test case added in this changeset.

Jun Wu - - Load All Authors

File last commit:

r30346:9cc438bf default


                r31989:85a22bc0

default

Download file

             bdiff.py
        
                    31 lines
            
             | 716 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / bdiff.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import cffi

      import os

      ffi = cffi.FFI()

      ffi.set_source("_bdiff_cffi",

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

              'bdiff.c')).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()
				ffi.set_source("_bdiff_cffi",
				open(os.path.join(os.path.join(os.path.dirname(__file__), '..'),
				'bdiff.c')).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()