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

tests: use pyflakes as a tool, not a python module...

tests: use pyflakes as a tool, not a python module The usage of pyflakes as a Python module was introduced in e397c6d74652, to work around issue between Python 2 and Python 3. This issues are long behind us now and we can get beck to using pyflakes as a tool, giving us more flexibility about how we install it. The `hghave` requirements is modified to check that we have a tool available, instead of a python module.

Martin von Zweigbergk - - Load All Authors

File last commit:

r46356:f90a5c21 default


                r52956:43602c67

default

Download file

             test-rebase-empty-successor.t
        
                    44 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-empty-successor.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat << EOF >> $HGRCPATH

        > [extensions]

        > rebase=

        > [alias]

        > tglog = log -G -T "{rev} '{desc}'\n"

        > EOF

        $ hg init

        $ echo a > a; hg add a; hg ci -m a

        $ echo b > b; hg add b; hg ci -m b1

        $ hg up 0 -q

        $ echo b > b; hg add b; hg ci -m b2 -q

        $ hg tglog

        @  2 'b2'

        |

        | o  1 'b1'

        |/

        o  0 'a'

      With rewrite.empty-successor=skip, b2 is skipped because it would become empty.

        $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run

        starting dry-run rebase; repository will not be changed

        rebasing 2:6e2aad5e0f3c tip "b2"

        note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes

        dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase

      With rewrite.empty-successor=keep, b2 will be recreated although it became empty.

        $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep

        rebasing 2:6e2aad5e0f3c tip "b2"

        note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes

        saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg

        $ hg tglog

        @  2 'b2'

        |

        o  1 'b1'

        |

        o  0 'a'

	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 << EOF >> $HGRCPATH
				> [extensions]
				> rebase=
				> [alias]
				> tglog = log -G -T "{rev} '{desc}'\n"
				> EOF

				$ hg init

				$ echo a > a; hg add a; hg ci -m a
				$ echo b > b; hg add b; hg ci -m b1
				$ hg up 0 -q
				$ echo b > b; hg add b; hg ci -m b2 -q

				$ hg tglog
				@ 2 'b2'
				\|
				\| o 1 'b1'
				\|/
				o 0 'a'


				With rewrite.empty-successor=skip, b2 is skipped because it would become empty.

				$ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
				starting dry-run rebase; repository will not be changed
				rebasing 2:6e2aad5e0f3c tip "b2"
				note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
				dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase

				With rewrite.empty-successor=keep, b2 will be recreated although it became empty.

				$ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep
				rebasing 2:6e2aad5e0f3c tip "b2"
				note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
				saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg

				$ hg tglog
				@ 2 'b2'
				\|
				o 1 'b1'
				\|
				o 0 'a'