upstream/mercurial-mirror Files · tests/test-diff-change.t

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r25590:183965a0

default

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 ..