upstream/mercurial-mirror Files · tests/test-diff-change.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-diff-change.t
        
                    93 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-change.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing diff --change

        $ hg init a

        $ cd a

        $ echo "first" > file.txt

        $ hg add file.txt

        $ hg commit -m 'first commit' # 0

        $ echo "second" > file.txt

        $ hg commit -m 'second commit' # 1

        $ echo "third" > file.txt

        $ hg commit -m 'third commit' # 2

        $ hg diff --nodates --change 1

        diff -r 4bb65dda5db4 -r e9b286083166 file.txt

        --- a/file.txt

        +++ b/file.txt

        @@ -1,1 +1,1 @@

        -first

        +second

        $ hg diff --change e9b286083166

        diff -r 4bb65dda5db4 -r e9b286083166 file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -first

        +second

      Test dumb revspecs (issue3474)

        $ hg diff -r 2:2

        $ hg diff -r "2 and 1"

        abort: empty revision range

        [255]

      Testing diff --change when merge:

        $ for i in 1 2 3 4 5 6 7 8 9 10; do

        >    echo $i >> file.txt

        > done

        $ hg commit -m "lots of text" # 3

        $ sed -e 's,^2$,x,' file.txt > file.txt.tmp

        $ mv file.txt.tmp file.txt

        $ hg commit -m "change 2 to x" # 4

        $ hg up -r 3

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

        $ sed -e 's,^8$,y,' file.txt > file.txt.tmp

        $ mv file.txt.tmp file.txt

        $ hg commit -m "change 8 to y"

        created new head

        $ hg up -C -r 4

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

        $ hg merge -r 5

        merging file.txt

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

        (branch merge, don't forget to commit)

        $ hg commit -m "merge 8 to y" # 6

        $ hg diff --change 5

        diff -r ae119d680c82 -r 9085c5c02e52 file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -6,6 +6,6 @@

         5

         6

         7

        -8

        +y

         9

         10

      must be similar to 'hg diff --change 5':

        $ hg diff -c 6

        diff -r 273b50f17c6d -r 979ca961fd2e file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -6,6 +6,6 @@

         5

         6

         7

        -8

        +y

         9

         10

        $ 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

				Testing diff --change

				$ hg init a
				$ cd a

				$ echo "first" > file.txt
				$ hg add file.txt
				$ hg commit -m 'first commit' # 0

				$ echo "second" > file.txt
				$ hg commit -m 'second commit' # 1

				$ echo "third" > file.txt
				$ hg commit -m 'third commit' # 2

				$ hg diff --nodates --change 1
				diff -r 4bb65dda5db4 -r e9b286083166 file.txt
				--- a/file.txt
				+++ b/file.txt
				@@ -1,1 +1,1 @@
				-first
				+second

				$ hg diff --change e9b286083166
				diff -r 4bb65dda5db4 -r e9b286083166 file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-first
				+second

				Test dumb revspecs (issue3474)

				$ hg diff -r 2:2
				$ hg diff -r "2 and 1"
				abort: empty revision range
				[255]

				Testing diff --change when merge:

				$ for i in 1 2 3 4 5 6 7 8 9 10; do
				> echo $i >> file.txt
				> done
				$ hg commit -m "lots of text" # 3

				$ sed -e 's,^2$,x,' file.txt > file.txt.tmp
				$ mv file.txt.tmp file.txt
				$ hg commit -m "change 2 to x" # 4

				$ hg up -r 3
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed -e 's,^8$,y,' file.txt > file.txt.tmp
				$ mv file.txt.tmp file.txt
				$ hg commit -m "change 8 to y"
				created new head

				$ hg up -C -r 4
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg merge -r 5
				merging file.txt
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "merge 8 to y" # 6

				$ hg diff --change 5
				diff -r ae119d680c82 -r 9085c5c02e52 file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -6,6 +6,6 @@
				5
				6
				7
				-8
				+y
				9
				10

				must be similar to 'hg diff --change 5':

				$ hg diff -c 6
				diff -r 273b50f17c6d -r 979ca961fd2e file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -6,6 +6,6 @@
				5
				6
				7
				-8
				+y
				9
				10

				$ cd ..