upstream/mercurial-mirror Files · tests/test-ui-color.py

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Simon Heimberg - - Load All Authors

File last commit:

r19322:ff1586a3 default


                r22285:85bded43

default

Download file

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

      import os

      from hgext import color

      from mercurial import dispatch, ui

      # ensure errors aren't buffered

      testui = color.colorui()

      testui.pushbuffer()

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

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

      testui.write_err('error\n')

      print repr(testui.popbuffer())

      # 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')

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

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

      # 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

				import os
				from hgext import color
				from mercurial import dispatch, ui

				# ensure errors aren't buffered
				testui = color.colorui()
				testui.pushbuffer()
				testui.write(('buffered\n'))
				testui.warn(('warning\n'))
				testui.write_err('error\n')
				print repr(testui.popbuffer())

				# 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')

				# we're not interested in the output, so write that to devnull
				ui_.fout = open(os.devnull, 'w')

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