upstream/mercurial-mirror Files · rust/hg-cpython/rustfmt.toml

merge: disallow merge abort in case of an unfinished operation (issue6160)...

merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

Georges Racinet - - Load All Authors

File last commit:

r41001:5532823e default


                r42780:b8d54f46

default

Download file

             rustfmt.toml
        
                    3 lines
            
             | 66 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / hg-cpython / rustfmt.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      max_width = 79

      wrap_comments = true

      error_on_line_overflow = true

	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

				max_width = 79
				wrap_comments = true
				error_on_line_overflow = true