upstream/mercurial-mirror Files · contrib/benchmarks/perf.py

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Philippe Pepiot - - Load All Authors

File last commit:

r30406:cff0f592 default


                r31225:749b057b

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")