##// END OF EJS Templates
url: move URL parsing functions into util to improve startup time...
url: move URL parsing functions into util to improve startup time The introduction of the new URL parsing code has created a startup time regression. This is mainly due to the use of url.hasscheme() in the ui class. It ends up importing many libraries that the url module requires. This fix helps marginally, but if we can get rid of the urllib import in the URL parser all together, startup time will go back to normal. perfstartup time before the URL refactoring (8796fb6af67e): ! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) current startup time (139fb11210bb): ! wall 0.070685 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) after this change: ! wall 0.064667 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

File last commit:

r13733:4e2690a7 default
r14076:924c8215 default
Show More
test-rebase-named-branches.t
171 lines | 2.1 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-named-branches.t
$ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog=
> rebase=
>
> [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
> 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
$ echo C > C
$ hg ci -Am C
adding C
created new head
$ hg up -q -C 0
$ echo D > D
$ hg ci -Am D
adding D
created new head
$ hg merge -r 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m E
$ hg up -q -C 3
$ echo F > F
$ hg ci -Am F
adding F
created new head
$ cd ..
Rebasing descendant onto ancestor across different named branches
$ hg clone -q -u . a a1
$ cd a1
$ hg branch dev
marked working directory as branch dev
$ echo x > x
$ hg add x
$ hg ci -m 'extra named branch'
$ hg tglog
@ 6: 'extra named branch' dev
|
o 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D'
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 6 -d 5
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 6: 'extra named branch'
|
o 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D'
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
$ cd ..
Rebasing descendant onto ancestor across the same named branches
$ hg clone -q -u . a a2
$ cd a2
$ echo x > x
$ hg add x
$ hg ci -m 'G'
$ hg tglog
@ 6: 'G'
|
o 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D'
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 6 -d 5
abort: source is descendant of destination
[255]
$ cd ..
Rebasing ancestor onto descendant across different named branches
$ hg clone -q -u . a a3
$ cd a3
$ hg branch dev
marked working directory as branch dev
$ echo x > x
$ hg add x
$ hg ci -m 'extra named branch'
$ hg tglog
@ 6: 'extra named branch' dev
|
o 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D'
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 5 -d 6
abort: source is ancestor of destination
[255]
$ cd ..