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

rebase: move bookmarks with --keep (issue5682)...

rebase: move bookmarks with --keep (issue5682) This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r34364:2f427b57

4.3.3 stable

Download file

             bdiffbuild.py
        
                    31 lines
            
             | 726 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()

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

          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("mercurial.cffi._bdiff",
				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()