upstream/mercurial-mirror Files · mercurial/mpatch.h

rebase: move working parent and bookmark for obsoleted revs (BC)...

rebase: move working parent and bookmark for obsoleted revs (BC) Previously, obsoleted revs with successors in destination are completely ignored. That caused some inconvenience when working copy is obsoleted. Most commands avoid working copy being obsoleted, but `hg pull` is an exception. This patch makes rebase able to move bookmarks or working parent for those obsoleted revs. It does so by keeping the obsoleted revs in `state` and marking them as "skipped, rebased to desired destination" during run-time. This reverts part of the behavior change of and D24. Differential Revision: https://phab.mercurial-scm.org/D527

Yuya Nishihara - - Load All Authors

File last commit:

r29749:155f0cc3 default


                r34010:9422107a

default

Download file

             mpatch.h
        
                    26 lines
            
             | 689 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / mpatch.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef _HG_MPATCH_H_

      #define _HG_MPATCH_H_

      #define MPATCH_ERR_NO_MEM -3

      #define MPATCH_ERR_CANNOT_BE_DECODED -2

      #define MPATCH_ERR_INVALID_PATCH -1

      struct mpatch_frag {

      	int start, end, len;

      	const char *data;

      };

      struct mpatch_flist {

      	struct mpatch_frag *base, *head, *tail;

      };

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

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

      void mpatch_lfree(struct mpatch_flist *a);

      int mpatch_apply(char *buf, const char *orig, ssize_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);

      #endif

	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

				#ifndef _HG_MPATCH_H_
				#define _HG_MPATCH_H_

				#define MPATCH_ERR_NO_MEM -3
				#define MPATCH_ERR_CANNOT_BE_DECODED -2
				#define MPATCH_ERR_INVALID_PATCH -1

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

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

				int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist* res);
				ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);
				void mpatch_lfree(struct mpatch_flist *a);
				int mpatch_apply(char buf, const char orig, ssize_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);

				#endif