upstream/mercurial-mirror Files · mercurial/cffi/mpatchbuild.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

             mpatchbuild.py
        
                    35 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / mpatchbuild.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import cffi

      import os

      ffi = cffi.FFI()

      mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',

                                           'mpatch.c'))

      ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),

                     include_dirs=["mercurial"])

      ffi.cdef("""

      struct mpatch_frag {

             int start, end, len;

             const char *data;

      };

      struct mpatch_flist {

             struct mpatch_frag *base, *head, *tail;

      };

      extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

      int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res);

      ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);

      void mpatch_lfree(struct mpatch_flist *a);

      static int mpatch_apply(char *buf, const char *orig, size_t len,

                              struct mpatch_flist *l);

      struct mpatch_flist *mpatch_fold(void *bins,

                             struct mpatch_flist* (*get_next_item)(void*, ssize_t),

                             ssize_t start, ssize_t end);

      """)

      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()
				mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',
				'mpatch.c'))
				ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),
				include_dirs=["mercurial"])
				ffi.cdef("""

				struct mpatch_frag {
				int start, end, len;
				const char *data;
				};

				struct mpatch_flist {
				struct mpatch_frag base, head, *tail;
				};

				extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

				int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist* res);
				ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);
				void mpatch_lfree(struct mpatch_flist *a);
				static int mpatch_apply(char buf, const char orig, size_t len,
				struct mpatch_flist *l);
				struct mpatch_flist mpatch_fold(void bins,
				struct mpatch_flist* (get_next_item)(void, ssize_t),
				ssize_t start, ssize_t end);
				""")

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