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

split: new extension to split changesets...

split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082

Augie Fackler - - Load All Authors

File last commit:

r34698:ce77b056 default


                r35471:02ea370c

@7 default

Download file

             bitmanipulation.h
        
                    50 lines
            
             | 944 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bitmanipulation.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      #ifndef _HG_BITMANIPULATION_H_

      #define _HG_BITMANIPULATION_H_

        Martin von Zweigbergk
    
bitmanipulation: add missing include of string.h...

              r32646
            
      #include <string.h>

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      #include "compat.h"

      static inline uint32_t getbe32(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	return ((d[0] << 24) | (d[1] << 16) | (d[2] << 8) | (d[3]));

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      }

      static inline int16_t getbeint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	return ((d[0] << 8) | (d[1]));

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      }

      static inline uint16_t getbeuint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	return ((d[0] << 8) | (d[1]));

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      }

      static inline void putbe32(uint32_t x, char *c)

      {

      	c[0] = (x >> 24) & 0xff;

      	c[1] = (x >> 16) & 0xff;

      	c[2] = (x >> 8) & 0xff;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	c[3] = (x)&0xff;

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      }

      static inline double getbefloat64(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	double ret;

      	int i;

      	uint64_t t = 0;

      	for (i = 0; i < 8; i++) {

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      		t = (t << 8) + d[i];

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      	}

      	memcpy(&ret, &t, sizeof(t));

      	return ret;

      }

      #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

Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#ifndef _HG_BITMANIPULATION_H_
		#define _HG_BITMANIPULATION_H_

Martin von Zweigbergk bitmanipulation: add missing include of string.h...	r32646	#include <string.h>

Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#include "compat.h"

		static inline uint32_t getbe32(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: reformat with clang-format...	r34698	return ((d[0] << 24) \| (d[1] << 16) \| (d[2] << 8) \| (d[3]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline int16_t getbeint16(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: reformat with clang-format...	r34698	return ((d[0] << 8) \| (d[1]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline uint16_t getbeuint16(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: reformat with clang-format...	r34698	return ((d[0] << 8) \| (d[1]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline void putbe32(uint32_t x, char *c)
		{
		c[0] = (x >> 24) & 0xff;
		c[1] = (x >> 16) & 0xff;
		c[2] = (x >> 8) & 0xff;
Augie Fackler bitmanipulation: reformat with clang-format...	r34698	c[3] = (x)&0xff;
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline double getbefloat64(const char *c)
		{
		const unsigned char d = (const unsigned char )c;
		double ret;
		int i;
		uint64_t t = 0;
		for (i = 0; i < 8; i++) {
Augie Fackler bitmanipulation: reformat with clang-format...	r34698	t = (t << 8) + d[i];
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}
		memcpy(&ret, &t, sizeof(t));
		return ret;
		}

		#endif