upstream/mercurial-mirror Files · mercurial/thirdparty/xdiff/xutils.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

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r38817:bb54db4a

@96 default

Download file

             xutils.h
        
                    39 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xutils.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       *  LibXDiff by Davide Libenzi ( File Differential Library )

       *  Copyright (C) 2003  Davide Libenzi

       *

       *  This library is free software; you can redistribute it and/or

       *  modify it under the terms of the GNU Lesser General Public

       *  License as published by the Free Software Foundation; either

       *  version 2.1 of the License, or (at your option) any later version.

       *

       *  This library is distributed in the hope that it will be useful,

       *  but WITHOUT ANY WARRANTY; without even the implied warranty of

       *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

       *  Lesser General Public License for more details.

       *

       *  You should have received a copy of the GNU Lesser General Public

       *  License along with this library; if not, see

       *  <http://www.gnu.org/licenses/>.

       *

       *  Davide Libenzi <davidel@xmailserver.org>

       *

       */

      #if !defined(XUTILS_H)

      #define XUTILS_H

      int64_t xdl_bogosqrt(int64_t n);

      int xdl_cha_init(chastore_t *cha, int64_t isize, int64_t icount);

      void xdl_cha_free(chastore_t *cha);

      void *xdl_cha_alloc(chastore_t *cha);

      int64_t xdl_guess_lines(mmfile_t *mf, int64_t sample);

      int xdl_recmatch(const char *l1, int64_t s1, const char *l2, int64_t s2);

      uint64_t xdl_hash_record(char const **data, char const *top);

      unsigned int xdl_hashbits(int64_t size);

      #endif /* #if !defined(XUTILS_H) */

	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

				/*
				* LibXDiff by Davide Libenzi ( File Differential Library )
				* Copyright (C) 2003 Davide Libenzi
				*
				* This library is free software; you can redistribute it and/or
				* modify it under the terms of the GNU Lesser General Public
				* License as published by the Free Software Foundation; either
				* version 2.1 of the License, or (at your option) any later version.
				*
				* This library is distributed in the hope that it will be useful,
				* but WITHOUT ANY WARRANTY; without even the implied warranty of
				* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
				* Lesser General Public License for more details.
				*
				* You should have received a copy of the GNU Lesser General Public
				* License along with this library; if not, see
				* <http://www.gnu.org/licenses/>.
				*
				* Davide Libenzi <davidel@xmailserver.org>
				*
				*/

				#if !defined(XUTILS_H)
				#define XUTILS_H



				int64_t xdl_bogosqrt(int64_t n);
				int xdl_cha_init(chastore_t *cha, int64_t isize, int64_t icount);
				void xdl_cha_free(chastore_t *cha);
				void xdl_cha_alloc(chastore_t cha);
				int64_t xdl_guess_lines(mmfile_t *mf, int64_t sample);
				int xdl_recmatch(const char l1, int64_t s1, const char l2, int64_t s2);
				uint64_t xdl_hash_record(char const *data, char const top);
				unsigned int xdl_hashbits(int64_t size);



				#endif /* #if !defined(XUTILS_H) */