upstream/mercurial-mirror Files · tests/test-resolve.t

cmdserver: forcibly use L channel to read password input (issue3161)...

cmdserver: forcibly use L channel to read password input (issue3161) Command server is designed to use the channel protocol even if the server process is accessible to tty, whereas vanilla hg should be able to read password from tty in that case. So it isn't enough to swap sys.stdin: # works only if the server process is detached from the console sys.stdin = self.fin getpass.getpass('') sys.stdin = oldin or test isatty: # vanilla hg can't talk to tty if stdin is redirected if self._isatty(self.fin): return getpass.getpass('') else: ... Since ui.nontty flag is undocumented and command-server channels don't provide isatty(), this change won't affect the other uses of ui._isatty(). issue3161 also suggests to provide some context of messages. I think it can be implemented by using the generic templating function.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r21195:9336bc7d

stable

Download file

             test-resolve.t
        
                    46 lines
            
             | 853 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-resolve.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test that a commit clears the merge state.

        $ hg init repo

        $ cd repo

        $ echo foo > file

        $ hg commit -Am 'add file'

        adding file

        $ echo bar >> file

        $ hg commit -Am 'append bar'

      create a second head

        $ hg up -C 0

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo baz >> file

        $ hg commit -Am 'append baz'

        created new head

      failing merge

        $ hg merge --tool=internal:fail

        0 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ echo resolved > file

        $ hg resolve -m file

        $ hg commit -m 'resolved'

      resolve -l, should be empty

        $ hg resolve -l

      test crashed merge with empty mergestate

        $ mkdir .hg/merge

        $ touch .hg/merge/state

      resolve -l, should be empty

        $ hg resolve -l

        $ cd ..

	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

				test that a commit clears the merge state.

				$ hg init repo
				$ cd repo

				$ echo foo > file
				$ hg commit -Am 'add file'
				adding file

				$ echo bar >> file
				$ hg commit -Am 'append bar'


				create a second head

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo baz >> file
				$ hg commit -Am 'append baz'
				created new head

				failing merge

				$ hg merge --tool=internal:fail
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ echo resolved > file
				$ hg resolve -m file
				$ hg commit -m 'resolved'

				resolve -l, should be empty

				$ hg resolve -l

				test crashed merge with empty mergestate

				$ mkdir .hg/merge
				$ touch .hg/merge/state

				resolve -l, should be empty

				$ hg resolve -l

				$ cd ..