upstream/mercurial-mirror Files · tests/test-rebase-rename.t

hgweb: add block numbers to diff regions and related links...

hgweb: add block numbers to diff regions and related links The changeset view may show several diff regions, one per file, and this patch numbers each of them so that links produced by the filenodelink fragment can reference each diff region produced by the diffblock fragment through the use of the blockno variable made available to both of them. This permits navigation to diff regions on the changeset page from the file list, and where the :target pseudo-class is supported in browsers, permits selective presentation of diffs, showing one at a time instead of potentially many in what would otherwise be a very long page that is difficult to navigate.

Stefano Tortarolo - - Load All Authors

File last commit:

r13778:46c30432 default


                r16308:2695aaf4

default

Download file

             test-rebase-rename.t
        
                    170 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-rename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [alias]

        > tlog  = log  --template "{rev}: '{desc}' {branches}\n"

        > tglog = tlog --graph

        > EOF

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ hg up -q -C 0

        $ hg mv a a-renamed

        $ hg ci -m 'rename A'

        created new head

        $ hg tglog

        @  2: 'rename A'

        |

        | o  1: 'B'

        |/

        o  0: 'A'

      Rename is tracked:

        $ hg tlog -p --git -r tip

        2: 'rename A' 

        diff --git a/a b/a-renamed

        rename from a

        rename to a-renamed

      Rebase the revision containing the rename:

        $ hg rebase -s 2 -d 1

        saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  2: 'rename A'

        |

        o  1: 'B'

        |

        o  0: 'A'

      Rename is not lost:

        $ hg tlog -p --git -r tip

        2: 'rename A' 

        diff --git a/a b/a-renamed

        rename from a

        rename to a-renamed

        $ cd ..

        $ hg init b

        $ cd b

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ hg up -q -C 0

        $ hg cp a a-copied

        $ hg ci -m 'copy A'

        created new head

        $ hg tglog

        @  2: 'copy A'

        |

        | o  1: 'B'

        |/

        o  0: 'A'

      Copy is tracked:

        $ hg tlog -p --git -r tip

        2: 'copy A' 

        diff --git a/a b/a-copied

        copy from a

        copy to a-copied

      Rebase the revision containing the copy:

        $ hg rebase -s 2 -d 1

        saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  2: 'copy A'

        |

        o  1: 'B'

        |

        o  0: 'A'

      Copy is not lost:

        $ hg tlog -p --git -r tip

        2: 'copy A' 

        diff --git a/a b/a-copied

        copy from a

        copy to a-copied

        $ cd ..

      Test rebase across repeating renames:

        $ hg init repo

        $ cd repo

        $ echo testing > file1.txt

        $ hg add file1.txt

        $ hg ci -m "Adding file1"

        $ hg rename file1.txt file2.txt

        $ hg ci -m "Rename file1 to file2"

        $ echo Unrelated change > unrelated.txt

        $ hg add unrelated.txt

        $ hg ci -m "Unrelated change"

        $ hg rename file2.txt file1.txt

        $ hg ci -m "Rename file2 back to file1"

        $ hg update -r -2

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

        $ echo Another unrelated change >> unrelated.txt

        $ hg ci -m "Another unrelated change"

        created new head

        $ hg tglog

        @  4: 'Another unrelated change'

        |

        | o  3: 'Rename file2 back to file1'

        |/

        o  2: 'Unrelated change'

        |

        o  1: 'Rename file1 to file2'

        |

        o  0: 'Adding file1'

        $ hg rebase -s 4 -d 3

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

        $ hg diff --stat -c .

         unrelated.txt |  1 +

         1 files changed, 1 insertions(+), 0 deletions(-)

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [alias]
				> tlog = log --template "{rev}: '{desc}' {branches}\n"
				> tglog = tlog --graph
				> EOF


				$ hg init a
				$ cd a

				$ echo a > a
				$ hg ci -Am A
				adding a

				$ echo b > b
				$ hg ci -Am B
				adding b

				$ hg up -q -C 0

				$ hg mv a a-renamed

				$ hg ci -m 'rename A'
				created new head

				$ hg tglog
				@ 2: 'rename A'
				\|
				\| o 1: 'B'
				\|/
				o 0: 'A'


				Rename is tracked:

				$ hg tlog -p --git -r tip
				2: 'rename A'
				diff --git a/a b/a-renamed
				rename from a
				rename to a-renamed

				Rebase the revision containing the rename:

				$ hg rebase -s 2 -d 1
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 2: 'rename A'
				\|
				o 1: 'B'
				\|
				o 0: 'A'


				Rename is not lost:

				$ hg tlog -p --git -r tip
				2: 'rename A'
				diff --git a/a b/a-renamed
				rename from a
				rename to a-renamed

				$ cd ..


				$ hg init b
				$ cd b

				$ echo a > a
				$ hg ci -Am A
				adding a

				$ echo b > b
				$ hg ci -Am B
				adding b

				$ hg up -q -C 0

				$ hg cp a a-copied
				$ hg ci -m 'copy A'
				created new head

				$ hg tglog
				@ 2: 'copy A'
				\|
				\| o 1: 'B'
				\|/
				o 0: 'A'

				Copy is tracked:

				$ hg tlog -p --git -r tip
				2: 'copy A'
				diff --git a/a b/a-copied
				copy from a
				copy to a-copied

				Rebase the revision containing the copy:

				$ hg rebase -s 2 -d 1
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 2: 'copy A'
				\|
				o 1: 'B'
				\|
				o 0: 'A'

				Copy is not lost:

				$ hg tlog -p --git -r tip
				2: 'copy A'
				diff --git a/a b/a-copied
				copy from a
				copy to a-copied

				$ cd ..


				Test rebase across repeating renames:

				$ hg init repo

				$ cd repo

				$ echo testing > file1.txt
				$ hg add file1.txt
				$ hg ci -m "Adding file1"

				$ hg rename file1.txt file2.txt
				$ hg ci -m "Rename file1 to file2"

				$ echo Unrelated change > unrelated.txt
				$ hg add unrelated.txt
				$ hg ci -m "Unrelated change"

				$ hg rename file2.txt file1.txt
				$ hg ci -m "Rename file2 back to file1"

				$ hg update -r -2
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo Another unrelated change >> unrelated.txt
				$ hg ci -m "Another unrelated change"
				created new head

				$ hg tglog
				@ 4: 'Another unrelated change'
				\|
				\| o 3: 'Rename file2 back to file1'
				\|/
				o 2: 'Unrelated change'
				\|
				o 1: 'Rename file1 to file2'
				\|
				o 0: 'Adding file1'


				$ hg rebase -s 4 -d 3
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

				$ hg diff --stat -c .
				unrelated.txt \| 1 +
				1 files changed, 1 insertions(+), 0 deletions(-)