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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Augie Fackler - - Load All Authors

File last commit:

r38322:1fb2510c @40 default


                r38817:bb54db4a

@96 default

Download file

             bitmanipulation.h
        
                    51 lines
            
             | 989 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bitmanipulation.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef _HG_BITMANIPULATION_H_

      #define _HG_BITMANIPULATION_H_

      #include <string.h>

      #include "compat.h"

      static inline uint32_t getbe32(const char *c)

      {

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

      	return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) |

      	        (((uint32_t)d[2]) << 8) | (d[3]));

      }

      static inline int16_t getbeint16(const char *c)

      {

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

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

      }

      static inline uint16_t getbeuint16(const char *c)

      {

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

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

      }

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

      {

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

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

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

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

      }

      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++) {

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

      	}

      	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

				#ifndef _HG_BITMANIPULATION_H_
				#define _HG_BITMANIPULATION_H_

				#include <string.h>

				#include "compat.h"

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

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

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

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

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

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

				static inline void putbe32(uint32_t x, char *c)
				{
				c[0] = (x >> 24) & 0xff;
				c[1] = (x >> 16) & 0xff;
				c[2] = (x >> 8) & 0xff;
				c[3] = (x)&0xff;
				}

				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++) {
				t = (t << 8) + d[i];
				}
				memcpy(&ret, &t, sizeof(t));
				return ret;
				}

				#endif