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

Simon Heimberg - - Load All Authors

File last commit:

r19322:ff1586a3 default


                r23524:a1a7c94d

default

Download file

             test-ui-color.py
        
                    33 lines
            
             | 890 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-ui-color.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Simon Heimberg
    
cleanup: remove unused imports...

              r19322
            
      import os

        Brodie Rao
    
color: call correct superclass method in write_err...

              r11732
            
      from hgext import color

        Idan Kamara
    
color: check if ui is already a subclass of colorui before wrapping it...

              r14516
            
      from mercurial import dispatch, ui

        Brodie Rao
    
color: call correct superclass method in write_err...

              r11732
            
      # ensure errors aren't buffered

      testui = color.colorui()

      testui.pushbuffer()

        Matt Mackall
    
i18n: wrap false positives for translation detection

              r17956
            
      testui.write(('buffered\n'))

      testui.warn(('warning\n'))

        Brodie Rao
    
color: call correct superclass method in write_err...

              r11732
            
      testui.write_err('error\n')

      print repr(testui.popbuffer())

        Idan Kamara
    
color: check if ui is already a subclass of colorui before wrapping it...

              r14516
            
      # test dispatch.dispatch with the same ui object

      hgrc = open(os.environ["HGRCPATH"], 'w')

      hgrc.write('[extensions]\n')

      hgrc.write('color=\n')

      hgrc.close()

      ui_ = ui.ui()

      ui_.setconfig('ui', 'formatted', 'True')

        Idan Kamara
    
ui: use I/O descriptors internally...

              r14614
            
      # we're not interested in the output, so write that to devnull

      ui_.fout = open(os.devnull, 'w')

        Idan Kamara
    
color: check if ui is already a subclass of colorui before wrapping it...

              r14516
            
      # call some arbitrary command just so we go through

      # color's wrapped _runcommand twice.

      def runcmd():

          dispatch.dispatch(dispatch.request(['version', '-q'], ui_))

      runcmd()

      print "colored? " + str(issubclass(ui_.__class__, color.colorui))

      runcmd()

      print "colored? " + str(issubclass(ui_.__class__, color.colorui))

	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

Simon Heimberg cleanup: remove unused imports...	r19322	import os
Brodie Rao color: call correct superclass method in write_err...	r11732	from hgext import color
Idan Kamara color: check if ui is already a subclass of colorui before wrapping it...	r14516	from mercurial import dispatch, ui
Brodie Rao color: call correct superclass method in write_err...	r11732
		# ensure errors aren't buffered
		testui = color.colorui()
		testui.pushbuffer()
Matt Mackall i18n: wrap false positives for translation detection	r17956	testui.write(('buffered\n'))
		testui.warn(('warning\n'))
Brodie Rao color: call correct superclass method in write_err...	r11732	testui.write_err('error\n')
		print repr(testui.popbuffer())
Idan Kamara color: check if ui is already a subclass of colorui before wrapping it...	r14516
		# test dispatch.dispatch with the same ui object
		hgrc = open(os.environ["HGRCPATH"], 'w')
		hgrc.write('[extensions]\n')
		hgrc.write('color=\n')
		hgrc.close()

		ui_ = ui.ui()
		ui_.setconfig('ui', 'formatted', 'True')

Idan Kamara ui: use I/O descriptors internally...	r14614	# we're not interested in the output, so write that to devnull
		ui_.fout = open(os.devnull, 'w')

Idan Kamara color: check if ui is already a subclass of colorui before wrapping it...	r14516	# call some arbitrary command just so we go through
		# color's wrapped _runcommand twice.
		def runcmd():
		dispatch.dispatch(dispatch.request(['version', '-q'], ui_))

		runcmd()
		print "colored? " + str(issubclass(ui_.__class__, color.colorui))
		runcmd()
		print "colored? " + str(issubclass(ui_.__class__, color.colorui))