upstream/mercurial-mirror Files · tests/heredoctest.py

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

Pulkit Goyal - - Load All Authors

File last commit:

r29485:6a98f940 default


                r38817:bb54db4a

@96 default

Download file

             heredoctest.py
        
                    20 lines
            
             | 526 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / heredoctest.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pulkit Goyal
    
py3: make files use absolute_import and print_function...

              r29485
            
      from __future__ import absolute_import, print_function

        Gregory Szorc
    
tests: use absolute_import for heredoctest.py

              r27297
            
        Matt Mackall
    
run-tests: replace inline python handling with more native scheme...

              r15434
            
      import sys

        Idan Kamara
    
tests: remove temp doctest file when finished running it

              r15247
            
        Matt Mackall
    
run-tests: replace inline python handling with more native scheme...

              r15434
            
      globalvars = {}

      lines = sys.stdin.readlines()

      while lines:

          l = lines.pop(0)

          if l.startswith('SALT'):

        Augie Fackler
    
heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py

              r25032
            
              print(l[:-1])

        Matt Mackall
    
run-tests: replace inline python handling with more native scheme...

              r15434
            
          elif l.startswith('>>> '):

              snippet = l[4:]

              while lines and lines[0].startswith('... '):

                  l = lines.pop(0)

        Yuya Nishihara
    
heredoctest: do not append extra newline character to continuation line...

              r22565
            
                  snippet += l[4:]

        Matt Mackall
    
run-tests: replace inline python handling with more native scheme...

              r15434
            
              c = compile(snippet, '<heredoc>', 'single')

              try:

        Augie Fackler
    
heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py

              r25032
            
                  exec(c, globalvars)

              except Exception as inst:

                  print(repr(inst))

	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

Pulkit Goyal py3: make files use absolute_import and print_function...	r29485	from __future__ import absolute_import, print_function
Gregory Szorc tests: use absolute_import for heredoctest.py	r27297
Matt Mackall run-tests: replace inline python handling with more native scheme...	r15434	import sys
Idan Kamara tests: remove temp doctest file when finished running it	r15247
Matt Mackall run-tests: replace inline python handling with more native scheme...	r15434	globalvars = {}
		lines = sys.stdin.readlines()
		while lines:
		l = lines.pop(0)
		if l.startswith('SALT'):
Augie Fackler heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py	r25032	print(l[:-1])
Matt Mackall run-tests: replace inline python handling with more native scheme...	r15434	elif l.startswith('>>> '):
		snippet = l[4:]
		while lines and lines[0].startswith('... '):
		l = lines.pop(0)
Yuya Nishihara heredoctest: do not append extra newline character to continuation line...	r22565	snippet += l[4:]
Matt Mackall run-tests: replace inline python handling with more native scheme...	r15434	c = compile(snippet, '<heredoc>', 'single')
		try:
Augie Fackler heredoctest: 2to3 -w -f numliterals -f except -f print tests/heredoctest.py	r25032	exec(c, globalvars)
		except Exception as inst:
		print(repr(inst))