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

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) Color extension achieves colorization by overriding the class of "ui" object just before command execution. Before this patch, "diff()" of abstractsubrepo and classes derived from it has no "ui" argument, so "diff()" of hgsubrepo uses "self._repo.ui" to invoke "cmdutil.diffordiffstat()". For separation of configuration between repositories, revision changed the initialization source of "self._repo.ui" from "ui"(overridden) to "baseui"(plain) of parent repository. And this caused break of colorization. This patch adds "ui" argument to "diff()" of abstractsubrepo and classes derived from it to pass "ui" object of caller side.

Mads Kiilerich - - Load All Authors

File last commit:

r17345:4f8054d3 default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-rebase-mq-skip.t
        
                    139 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-mq-skip.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      This emulates the effects of an hg pull --rebase in which the remote repo

      already has one local mq patch

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > mq=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

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

        > EOF

        $ hg init a

        $ cd a

        $ hg qinit -c

        $ echo c1 > c1

        $ hg add c1

        $ hg ci -m C1

        $ echo r1 > r1

        $ hg add r1

        $ hg ci -m R1

        $ hg up -q 0

        $ hg qnew p0.patch

        $ echo p0 > p0

        $ hg add p0

        $ hg qref -m P0

        $ hg qnew p1.patch

        $ echo p1 > p1

        $ hg add p1

        $ hg qref -m P1

        $ hg export qtip > p1.patch

        $ hg up -q -C 1

        $ hg import p1.patch

        applying p1.patch

        $ rm p1.patch

        $ hg up -q -C qtip

        $ hg rebase

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

        $ hg tglog

        @  3: 'P0' tags: p0.patch qbase qtip tip

        |

        o  2: 'P1' tags: qparent

        |

        o  1: 'R1' tags:

        |

        o  0: 'C1' tags:

        $ cd ..

        $ hg init b

        $ cd b

        $ hg qinit -c

        $ for i in r0 r1 r2 r3 r4 r5 r6;

        > do

        >     echo $i > $i

        >     hg ci -Am $i

        > done

        adding r0

        adding r1

        adding r2

        adding r3

        adding r4

        adding r5

        adding r6

        $ hg qimport -r 1:tip

        $ hg up -q 0

        $ for i in r1 r3 r7 r8;

        > do

        >     echo $i > $i

        >     hg ci -Am branch2-$i

        > done

        adding r1

        created new head

        adding r3

        adding r7

        adding r8

        $ echo somethingelse > r4

        $ hg ci -Am branch2-r4

        adding r4

        $ echo r6 > r6

        $ hg ci -Am branch2-r6

        adding r6

        $ hg up -q qtip

        $ HGMERGE=internal:fail hg rebase

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

        $ HGMERGE=internal:local hg resolve --all

        $ hg rebase --continue

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

        $ hg tglog

        @  8: 'r5' tags: 5.diff qtip tip

        |

        o  7: 'r2' tags: 2.diff qbase

        |

        o  6: 'branch2-r6' tags: qparent

        |

        o  5: 'branch2-r4' tags:

        |

        o  4: 'branch2-r8' tags:

        |

        o  3: 'branch2-r7' tags:

        |

        o  2: 'branch2-r3' tags:

        |

        o  1: 'branch2-r1' tags:

        |

        o  0: 'r0' tags:

        $ 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

				This emulates the effects of an hg pull --rebase in which the remote repo
				already has one local mq patch

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


				$ hg init a
				$ cd a
				$ hg qinit -c

				$ echo c1 > c1
				$ hg add c1
				$ hg ci -m C1

				$ echo r1 > r1
				$ hg add r1
				$ hg ci -m R1

				$ hg up -q 0

				$ hg qnew p0.patch
				$ echo p0 > p0
				$ hg add p0
				$ hg qref -m P0

				$ hg qnew p1.patch
				$ echo p1 > p1
				$ hg add p1
				$ hg qref -m P1

				$ hg export qtip > p1.patch

				$ hg up -q -C 1

				$ hg import p1.patch
				applying p1.patch

				$ rm p1.patch

				$ hg up -q -C qtip

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

				$ hg tglog
				@ 3: 'P0' tags: p0.patch qbase qtip tip
				\|
				o 2: 'P1' tags: qparent
				\|
				o 1: 'R1' tags:
				\|
				o 0: 'C1' tags:

				$ cd ..


				$ hg init b
				$ cd b
				$ hg qinit -c

				$ for i in r0 r1 r2 r3 r4 r5 r6;
				> do
				> echo $i > $i
				> hg ci -Am $i
				> done
				adding r0
				adding r1
				adding r2
				adding r3
				adding r4
				adding r5
				adding r6

				$ hg qimport -r 1:tip

				$ hg up -q 0

				$ for i in r1 r3 r7 r8;
				> do
				> echo $i > $i
				> hg ci -Am branch2-$i
				> done
				adding r1
				created new head
				adding r3
				adding r7
				adding r8

				$ echo somethingelse > r4
				$ hg ci -Am branch2-r4
				adding r4

				$ echo r6 > r6
				$ hg ci -Am branch2-r6
				adding r6

				$ hg up -q qtip

				$ HGMERGE=internal:fail hg rebase
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				$ HGMERGE=internal:local hg resolve --all

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

				$ hg tglog
				@ 8: 'r5' tags: 5.diff qtip tip
				\|
				o 7: 'r2' tags: 2.diff qbase
				\|
				o 6: 'branch2-r6' tags: qparent
				\|
				o 5: 'branch2-r4' tags:
				\|
				o 4: 'branch2-r8' tags:
				\|
				o 3: 'branch2-r7' tags:
				\|
				o 2: 'branch2-r3' tags:
				\|
				o 1: 'branch2-r1' tags:
				\|
				o 0: 'r0' tags:


				$ cd ..