upstream/mercurial-mirror Files · contrib/benchmarks/perf.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

Philippe Pepiot - - Load All Authors

File last commit:

r30406:cff0f592 default


                r38817:bb54db4a

@96 default

Download file

             perf.py
        
                    26 lines
            
             | 649 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / benchmarks / perf.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # perf.py - asv benchmarks using contrib/perf.py extension

      #

      # Copyright 2016 Logilab SA <contact@logilab.fr>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      from . import perfbench

      @perfbench()

      def track_tags(perf):

          return perf("perftags")

      @perfbench()

      def track_status(perf):

          return perf("perfstatus", unknown=False)

      @perfbench(params=[('rev', ['1000', '10000', 'tip'])])

      def track_manifest(perf, rev):

          return perf("perfmanifest", rev)

      @perfbench()

      def track_heads(perf):

          return perf("perfheads")

	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

				# perf.py - asv benchmarks using contrib/perf.py extension
				#
				# Copyright 2016 Logilab SA <contact@logilab.fr>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from . import perfbench

				@perfbench()
				def track_tags(perf):
				return perf("perftags")

				@perfbench()
				def track_status(perf):
				return perf("perfstatus", unknown=False)

				@perfbench(params=[('rev', ['1000', '10000', 'tip'])])
				def track_manifest(perf, rev):
				return perf("perfmanifest", rev)

				@perfbench()
				def track_heads(perf):
				return perf("perfheads")