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

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Pulkit Goyal - - Load All Authors

File last commit:

r29485:6a98f940 default


                r32057:e5ffc91a

stable

Download file

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

      from __future__ import absolute_import, print_function

      import sys

      globalvars = {}

      lines = sys.stdin.readlines()

      while lines:

          l = lines.pop(0)

          if l.startswith('SALT'):

              print(l[:-1])

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

              snippet = l[4:]

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

                  l = lines.pop(0)

                  snippet += l[4:]

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

              try:

                  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

				from __future__ import absolute_import, print_function

				import sys

				globalvars = {}
				lines = sys.stdin.readlines()
				while lines:
				l = lines.pop(0)
				if l.startswith('SALT'):
				print(l[:-1])
				elif l.startswith('>>> '):
				snippet = l[4:]
				while lines and lines[0].startswith('... '):
				l = lines.pop(0)
				snippet += l[4:]
				c = compile(snippet, '<heredoc>', 'single')
				try:
				exec(c, globalvars)
				except Exception as inst:
				print(repr(inst))