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

branch: allow changing branch name to existing name if possible...

branch: allow changing branch name to existing name if possible With the functionality added in previous patch we can change branches of a revision but not everytime even if it's possible to do so. For example cosider the following case: o 3 added a (foo) o 2 added b (foo) o 1 added c (bar) o 0 added d (bar) Here if I want to change the branch of rev 2,3 to bar, it was not possible and it will say, "a branch with same name exists". This patch allows us to change branch of 2,3 to bar. The underlying logic for changing branch finds the changesets from the revs passed which have no parents in revs. We only support revsets which have only one such root, so to support this we check whether the parent of the root has the same name as that of the new name and if so, we can use the new name to change branches. Differential Revision: https://phab.mercurial-scm.org/D1913

Yuya Nishihara - - Load All Authors

File last commit:

r34653:174d115d default


                r35764:e5b6ba78

default

Download file

             bdiff.h
        
                    23 lines
            
             | 467 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bdiff.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef _HG_BDIFF_H_

      #define _HG_BDIFF_H_

      #include "compat.h"

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

      #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_BDIFF_H_
				#define _HG_BDIFF_H_

				#include "compat.h"

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

				#endif