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

parsers.c: remove warning: 'size' may be used uninitialized in this function...

parsers.c: remove warning: 'size' may be used uninitialized in this function Some compilers / compiler options (such as gcc 4.7) would emit warnings: mercurial/parsers.c: In function 'pack_dirstate': mercurial/parsers.c:306:18: warning: 'size' may be used uninitialized in this function [-Wmaybe-uninitialized] mercurial/parsers.c:306:12: warning: 'mode' may be used uninitialized in this function [-Wmaybe-uninitialized] It is apparently not smart enough to figure out how the 'err' arithmetics makes sure that it can't happen. 'err' is now replaced with simple checks and goto. That might also help the optimizer when it is inlining getintat().

Matt Mackall - - Load All Authors

File last commit:

r17059:fba17a64 default


                r17165:249cc4ec

default

Download file

             test-rebase-bookmarks.t
        
                    113 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-bookmarks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n"

        > EOF

      Create a repo with several bookmarks

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ hg book 'X'

        $ hg book 'Y'

        $ echo c > c

        $ hg ci -Am C

        adding c

        $ hg book 'Z'

        $ hg up -q 0

        $ echo d > d

        $ hg ci -Am D

        adding d

        created new head

        $ hg book W

        $ hg tglog 

        @  3: 'D' bookmarks: W

        |

        | o  2: 'C' bookmarks: Y Z

        | |

        | o  1: 'B' bookmarks: X

        |/

        o  0: 'A' bookmarks:

      Move only rebased bookmarks

        $ cd ..

        $ hg clone -q a a1

        $ cd a1

        $ hg up -q Z

        $ hg rebase -s Y -d 3

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

        $ hg tglog 

        @  3: 'C' bookmarks: Y Z

        |

        o  2: 'D' bookmarks: W

        |

        | o  1: 'B' bookmarks: X

        |/

        o  0: 'A' bookmarks:

      Keep bookmarks to the correct rebased changeset

        $ cd ..

        $ hg clone -q a a2

        $ cd a2

        $ hg up -q Z

        $ hg rebase -s 1 -d 3

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

        $ hg tglog 

        @  3: 'C' bookmarks: Y Z

        |

        o  2: 'B' bookmarks: X

        |

        o  1: 'D' bookmarks: W

        |

        o  0: 'A' bookmarks:

      Keep active bookmark on the correct changeset

        $ cd ..

        $ hg clone -q a a3

        $ cd a3

        $ hg up -q X

        $ hg rebase -d W

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

        $ hg tglog

        @  3: 'C' bookmarks: Y Z

        |

        o  2: 'B' bookmarks: X

        |

        o  1: 'D' bookmarks: W

        |

        o  0: 'A' bookmarks:

        $ 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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n"
				> EOF

				Create a repo with several bookmarks
				$ hg init a
				$ cd a

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

				$ echo b > b
				$ hg ci -Am B
				adding b
				$ hg book 'X'
				$ hg book 'Y'

				$ echo c > c
				$ hg ci -Am C
				adding c
				$ hg book 'Z'

				$ hg up -q 0

				$ echo d > d
				$ hg ci -Am D
				adding d
				created new head

				$ hg book W

				$ hg tglog
				@ 3: 'D' bookmarks: W
				\|
				\| o 2: 'C' bookmarks: Y Z
				\| \|
				\| o 1: 'B' bookmarks: X
				\|/
				o 0: 'A' bookmarks:


				Move only rebased bookmarks

				$ cd ..
				$ hg clone -q a a1

				$ cd a1
				$ hg up -q Z

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

				$ hg tglog
				@ 3: 'C' bookmarks: Y Z
				\|
				o 2: 'D' bookmarks: W
				\|
				\| o 1: 'B' bookmarks: X
				\|/
				o 0: 'A' bookmarks:

				Keep bookmarks to the correct rebased changeset

				$ cd ..
				$ hg clone -q a a2

				$ cd a2
				$ hg up -q Z

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

				$ hg tglog
				@ 3: 'C' bookmarks: Y Z
				\|
				o 2: 'B' bookmarks: X
				\|
				o 1: 'D' bookmarks: W
				\|
				o 0: 'A' bookmarks:


				Keep active bookmark on the correct changeset

				$ cd ..
				$ hg clone -q a a3

				$ cd a3
				$ hg up -q X

				$ hg rebase -d W
				saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 3: 'C' bookmarks: Y Z
				\|
				o 2: 'B' bookmarks: X
				\|
				o 1: 'D' bookmarks: W
				\|
				o 0: 'A' bookmarks:


				$ cd ..