upstream/mercurial-mirror Files · tests/filterpyflakes.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

Augie Fackler - - Load All Authors

File last commit:

r33367:6029939f default


                r38817:bb54db4a

@96 default

Download file

             filterpyflakes.py
        
                    37 lines
            
             | 890 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / filterpyflakes.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      # Filter output by pyflakes to control which warnings we check

      from __future__ import absolute_import, print_function

      import re

      import sys

      lines = []

      for line in sys.stdin:

          # We blacklist tests that are too noisy for us

          pats = [

              r"undefined name 'WindowsError'",

              r"redefinition of unused '[^']+' from line",

              # for cffi, allow re-exports from pure.*

              r"cffi/[^:]*:.*\bimport \*' used",

              r"cffi/[^:]*:.*\*' imported but unused",

          ]

          keep = True

          for pat in pats:

              if re.search(pat, line):

                  keep = False

                  break # pattern matches

          if keep:

              fn = line.split(':', 1)[0]

              f = open(fn)

              data = f.read()

              f.close()

              if 'no-' 'check-code' in data:

                  continue

              lines.append(line)

      for line in lines:

          sys.stdout.write(line)

      print()

	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

				#!/usr/bin/env python

				# Filter output by pyflakes to control which warnings we check

				from __future__ import absolute_import, print_function

				import re
				import sys

				lines = []
				for line in sys.stdin:
				# We blacklist tests that are too noisy for us
				pats = [
				r"undefined name 'WindowsError'",
				r"redefinition of unused '[^']+' from line",
				# for cffi, allow re-exports from pure.*
				r"cffi/[^:]:.\bimport \*' used",
				r"cffi/[^:]:.\*' imported but unused",
				]

				keep = True
				for pat in pats:
				if re.search(pat, line):
				keep = False
				break # pattern matches
				if keep:
				fn = line.split(':', 1)[0]
				f = open(fn)
				data = f.read()
				f.close()
				if 'no-' 'check-code' in data:
				continue
				lines.append(line)

				for line in lines:
				sys.stdout.write(line)
				print()