upstream/mercurial-mirror Files · tests/test-rebase-issue-noparam-single-rev.t

revlog: subclass the new `repository.iverifyproblem` Protocol class...

revlog: subclass the new `repository.iverifyproblem` Protocol class This is the same transformation as did for dirstate, but the CamelCase naming was already cleaned up here. We shouldn't have to explicitly subclass, but I'm doing so to test the interplay of regular attributes and the `attrs` class. Also, PyCharm has a nifty feature that puts a jump point in the gutter to navigate back and forth between the base class and subclasses (and override functions and base class functions) when there's an explicit subclassing. Additionally, PyCharm will immediately flag signature mismatches without a 40m pytype run.

Phil Cohen - - Load All Authors

File last commit:

r35386:469b06b4 default


                r53365:4ef6dbc2

default

Download file

             test-rebase-issue-noparam-single-rev.t
        
                    130 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-issue-noparam-single-rev.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

        > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ echo r2 > r2

        $ hg ci -Am r2

        adding r2

        $ hg tglog

        @  4: 225af64d03e6 'r2'

        |

        o  3: 8d0a8c99b309 'r1'

        |

        | o  2: 87c180a611f2 'l1'

        |/

        o  1: 56daeba07f4b 'c2'

        |

        o  0: e8faad3d03ff 'c1'

      Rebase with no arguments - single revision in source branch:

        $ hg up -q -C 2

        $ hg rebase

        rebasing 2:87c180a611f2 "l1"

        saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg

        $ hg tglog

        @  4: b1152cc99655 'l1'

        |

        o  3: 225af64d03e6 'r2'

        |

        o  2: 8d0a8c99b309 'r1'

        |

        o  1: 56daeba07f4b 'c2'

        |

        o  0: e8faad3d03ff 'c1'

        $ cd ..

        $ hg init b

        $ cd b

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ echo l2 > l2

        $ hg ci -Am l2

        adding l2

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ hg tglog

        @  4: 8d0a8c99b309 'r1'

        |

        | o  3: 1ac923b736ef 'l2'

        | |

        | o  2: 87c180a611f2 'l1'

        |/

        o  1: 56daeba07f4b 'c2'

        |

        o  0: e8faad3d03ff 'c1'

      Rebase with no arguments - single revision in target branch:

        $ hg up -q -C 3

        $ hg rebase

        rebasing 2:87c180a611f2 "l1"

        rebasing 3:1ac923b736ef "l2"

        saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg

        $ hg tglog

        @  4: 023181307ed0 'l2'

        |

        o  3: 913ab52b43b4 'l1'

        |

        o  2: 8d0a8c99b309 'r1'

        |

        o  1: 56daeba07f4b 'c2'

        |

        o  0: e8faad3d03ff 'c1'

        $ 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]
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}: {node\|short} '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo c1 > c1
				$ hg ci -Am c1
				adding c1

				$ echo c2 > c2
				$ hg ci -Am c2
				adding c2

				$ echo l1 > l1
				$ hg ci -Am l1
				adding l1

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

				$ echo r2 > r2
				$ hg ci -Am r2
				adding r2

				$ hg tglog
				@ 4: 225af64d03e6 'r2'
				\|
				o 3: 8d0a8c99b309 'r1'
				\|
				\| o 2: 87c180a611f2 'l1'
				\|/
				o 1: 56daeba07f4b 'c2'
				\|
				o 0: e8faad3d03ff 'c1'

				Rebase with no arguments - single revision in source branch:

				$ hg up -q -C 2

				$ hg rebase
				rebasing 2:87c180a611f2 "l1"
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg

				$ hg tglog
				@ 4: b1152cc99655 'l1'
				\|
				o 3: 225af64d03e6 'r2'
				\|
				o 2: 8d0a8c99b309 'r1'
				\|
				o 1: 56daeba07f4b 'c2'
				\|
				o 0: e8faad3d03ff 'c1'

				$ cd ..


				$ hg init b
				$ cd b

				$ echo c1 > c1
				$ hg ci -Am c1
				adding c1

				$ echo c2 > c2
				$ hg ci -Am c2
				adding c2

				$ echo l1 > l1
				$ hg ci -Am l1
				adding l1

				$ echo l2 > l2
				$ hg ci -Am l2
				adding l2

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

				$ hg tglog
				@ 4: 8d0a8c99b309 'r1'
				\|
				\| o 3: 1ac923b736ef 'l2'
				\| \|
				\| o 2: 87c180a611f2 'l1'
				\|/
				o 1: 56daeba07f4b 'c2'
				\|
				o 0: e8faad3d03ff 'c1'

				Rebase with no arguments - single revision in target branch:

				$ hg up -q -C 3

				$ hg rebase
				rebasing 2:87c180a611f2 "l1"
				rebasing 3:1ac923b736ef "l2"
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg

				$ hg tglog
				@ 4: 023181307ed0 'l2'
				\|
				o 3: 913ab52b43b4 'l1'
				\|
				o 2: 8d0a8c99b309 'r1'
				\|
				o 1: 56daeba07f4b 'c2'
				\|
				o 0: e8faad3d03ff 'c1'


				$ cd ..