view tests/test-merge8.t @ 14077:c285bdb0572a

util.url: copy urllib.unquote() into util to improve startup times

The ui class uses util.hasscheme() in a couple of places, causing hg
to import urllib even when it doesn't need to. This copies
urllib.unquote() to avoid that import.

perfstartup time before the URL refactoring (8796fb6af67e):

! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

before this change:

! wall 0.064742 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

after this change:

! wall 0.052126 comb 0.000000 user 0.000000 sys 0.000000 (best of 100

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved