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

clone: do not turn hidden changeset public on publishing clone (issue3935)...

clone: do not turn hidden changeset public on publishing clone (issue3935) Before this changeset local clone of a repo with hidden changeset would include then in the clone (why not) and turn them public (plain wrong). This happened because the copy clone publish by dropping the phaseroot file entirely making everything in the repo public (and therefore immune to obsolescence marker). This changeset takes the simplest fix, we deny the copy clone in the case of hidden changeset falling back to pull clone that will exclude them from the clone and therefore not turning them public. A smarter version of copy clone could be done, but I prefer to go for the simplest solution first.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r20332:a959f716

stable

Download file

             test-diff-change.t
        
                    93 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-change.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-change

              r12136
            
      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

        Matt Mackall
    
revpair: handle odd ranges (issue3474)

              r16790
            
      Test dumb revspecs (issue3474)

        $ hg diff -r 2:2

        $ hg diff -r "2 and 1"

        abort: empty revision range

        [255]

        Adrian Buehlmann
    
tests: unify test-diff-change

              r12136
            
      Testing diff --change when merge:

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

        Mads Kiilerich
    
tests: fix incorrect markup of continued lines of sh commands

              r16487
            
        >    echo $i >> file.txt

        > done

        Adrian Buehlmann
    
tests: unify test-diff-change

              r12136
            
        $ 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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Adrian Buehlmann tests: unify test-diff-change	r12136	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

Matt Mackall revpair: handle odd ranges (issue3474)	r16790	Test dumb revspecs (issue3474)

		$ hg diff -r 2:2
		$ hg diff -r "2 and 1"
		abort: empty revision range
		[255]
Adrian Buehlmann tests: unify test-diff-change	r12136
		Testing diff --change when merge:

		$ for i in 1 2 3 4 5 6 7 8 9 10; do
Mads Kiilerich tests: fix incorrect markup of continued lines of sh commands	r16487	> echo $i >> file.txt
		> done
Adrian Buehlmann tests: unify test-diff-change	r12136	$ 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

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..