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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Gregory Szorc - - Load All Authors

File last commit:

r23409:dc4d2cd3 stable


                r23524:a1a7c94d

default

Download file

             hgweberror.py
        
                    17 lines
            
             | 547 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / hgweberror.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # A dummy extension that installs an hgweb command that throws an Exception.

      from mercurial.hgweb import webcommands

      def raiseerror(web, req, tmpl):

          '''Dummy web command that raises an uncaught Exception.'''

          # Simulate an error after partial response.

          if 'partialresponse' in req.form:

              req.respond(200, 'text/plain')

              req.write('partial content\n')

          raise AttributeError('I am an uncaught error!')

      def extsetup(ui):

          setattr(webcommands, 'raiseerror', raiseerror)

          webcommands.__all__.append('raiseerror')

	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

				# A dummy extension that installs an hgweb command that throws an Exception.

				from mercurial.hgweb import webcommands

				def raiseerror(web, req, tmpl):
				'''Dummy web command that raises an uncaught Exception.'''

				# Simulate an error after partial response.
				if 'partialresponse' in req.form:
				req.respond(200, 'text/plain')
				req.write('partial content\n')

				raise AttributeError('I am an uncaught error!')

				def extsetup(ui):
				setattr(webcommands, 'raiseerror', raiseerror)
				webcommands.__all__.append('raiseerror')