tests: move a test about update in test-pull-update.t

Differential Revision: https://phab.mercurial-scm.org/D10154

tests/test-pull-update.t

@@ -1,248 +1,270
   $ hg init t
   $ cd t
   $ echo 1 > foo
   $ hg ci -Am m
   adding foo
 
   $ cd ..
   $ hg clone t tt
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd tt
   $ echo 1.1 > foo
   $ hg ci -Am m
 
   $ cd ../t
   $ echo 1.2 > foo
   $ hg ci -Am m
 
 Should respect config to disable dirty update
   $ hg co -qC 0
   $ echo 2 > foo
   $ hg --config commands.update.check=abort pull -u ../tt
   pulling from ../tt
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 107cefe13e42
   1 local changesets published
   abort: uncommitted changes
   [20]
   $ hg --config extensions.strip= strip --no-backup tip
   $ hg co -qC tip
 
 Should not update to the other topological branch:
 
   $ hg pull -u ../tt
   pulling from ../tt
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 107cefe13e42
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "800c91d5bfc1: m"
   1 other heads for branch "default"
 
   $ cd ../tt
 
 Should not update to the other branch:
 
   $ hg pull -u ../t
   pulling from ../t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets 800c91d5bfc1
   1 local changesets published
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "107cefe13e42: m"
   1 other heads for branch "default"
 
   $ HGMERGE=true hg merge
   merging foo
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -mm
 
   $ cd ../t
 
 Should work:
 
   $ hg pull -u ../tt
   pulling from ../tt
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (-1 heads)
   new changesets 483b76ad4309
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Similarity between "hg update" and "hg pull -u" in handling bookmark
 ====================================================================
 
 Test that updating activates the bookmark, which matches with the
 explicit destination of the update.
 
   $ echo 4 >> foo
   $ hg commit -m "#4"
   $ hg bookmark active-after-pull
   $ cd ../tt
 
 (1) activating by --rev BOOKMARK
 
   $ hg bookmark -f active-before-pull
   $ hg bookmarks
    * active-before-pull        3:483b76ad4309
 
   $ hg pull -u -r active-after-pull
   pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark active-after-pull
   added 1 changesets with 1 changes to 1 files
   new changesets f815b3da6163
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark active-after-pull)
 
   $ hg parents -q
   4:f815b3da6163
   $ hg bookmarks
    * active-after-pull         4:f815b3da6163
      active-before-pull        3:483b76ad4309
 
 (discard pulled changes)
 
   $ hg update -q 483b76ad4309
   $ hg rollback -q
 
 (2) activating by URL#BOOKMARK
 
   $ hg bookmark -f active-before-pull
   $ hg bookmarks
    * active-before-pull        3:483b76ad4309
 
   $ hg pull -u $TESTTMP/t#active-after-pull
   pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark active-after-pull
   added 1 changesets with 1 changes to 1 files
   new changesets f815b3da6163
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark active-after-pull)
 
   $ hg parents -q
   4:f815b3da6163
   $ hg bookmarks
    * active-after-pull         4:f815b3da6163
      active-before-pull        3:483b76ad4309
 
 (discard pulled changes)
 
   $ hg update -q 483b76ad4309
   $ hg rollback -q
 
 Test that updating deactivates current active bookmark, if the
 destination of the update is explicitly specified, and it doesn't
 match with the name of any existing bookmarks.
 
   $ cd ../t
   $ hg bookmark -d active-after-pull
   $ hg branch bar -q
   $ hg commit -m "#5 (bar #1)"
   $ cd ../tt
 
 (1) deactivating by --rev REV
 
   $ hg bookmark -f active-before-pull
   $ hg bookmarks
    * active-before-pull        3:483b76ad4309
 
   $ hg pull -u -r b5e4babfaaa7
   pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets f815b3da6163:b5e4babfaaa7
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark active-before-pull)
 
   $ hg parents -q
   5:b5e4babfaaa7
   $ hg bookmarks
      active-before-pull        3:483b76ad4309
 
 (discard pulled changes)
 
   $ hg update -q 483b76ad4309
   $ hg rollback -q
 
 (2) deactivating by --branch BRANCH
 
   $ hg bookmark -f active-before-pull
   $ hg bookmarks
    * active-before-pull        3:483b76ad4309
 
   $ hg pull -u -b bar
   pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets f815b3da6163:b5e4babfaaa7
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark active-before-pull)
 
   $ hg parents -q
   5:b5e4babfaaa7
   $ hg bookmarks
      active-before-pull        3:483b76ad4309
 
 (discard pulled changes)
 
   $ hg update -q 483b76ad4309
   $ hg rollback -q
 
 (3) deactivating by URL#ANOTHER-BRANCH
 
   $ hg bookmark -f active-before-pull
   $ hg bookmarks
    * active-before-pull        3:483b76ad4309
 
   $ hg pull -u $TESTTMP/t#bar
   pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
   new changesets f815b3da6163:b5e4babfaaa7
   1 local changesets published
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark active-before-pull)
 
   $ hg parents -q
   5:b5e4babfaaa7
   $ hg bookmarks
      active-before-pull        3:483b76ad4309
 
   $ cd ..
+
+Issue622: hg init && hg pull -u URL doesn't checkout default branch
+
+  $ hg init test
+  $ cd test
+  $ echo foo>foo
+  $ hg addremove
+  adding foo
+  $ hg commit -m 1
+  $ cd ..
+
+  $ hg init empty
+  $ cd empty
+  $ hg pull -u ../test
+  pulling from ../test
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  new changesets 340e38bdcde4
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-pull.t

@@ -1,152 +1,137
 #require serve
 
 #testcases sshv1 sshv2
 
 #if sshv2
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > sshpeer.advertise-v2 = true
   > sshserver.support-v2 = true
   > EOF
 #endif
 
   $ hg init test
   $ cd test
 
   $ echo foo>foo
   $ hg addremove
   adding foo
   $ hg commit -m 1
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
   $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 340e38bdcde4
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd copy
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
 
   $ hg co
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat foo
   foo
 
   $ hg manifest --debug
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
 
   $ hg pull
   pulling from http://foo@localhost:$HGPORT/
   searching for changes
   no changes found
 
   $ hg rollback --dry-run --verbose
   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
 
 Test pull of non-existing 20 character revision specification, making sure plain ascii identifiers
 not are encoded like a node:
 
   $ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'
   [255]
   $ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'
   [255]
 
 Test pull of working copy revision
   $ hg pull -r 'ffffffffffff'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'ffffffffffff'
   [255]
 
-Issue622: hg init && hg pull -u URL doesn't checkout default branch
-
-  $ cd ..
-  $ hg init empty
-  $ cd empty
-  $ hg pull -u ../test
-  pulling from ../test
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets 340e38bdcde4
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
 Test 'file:' uri handling:
 
   $ hg pull -q file://../test-does-not-exist
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ hg pull -q file://../test
   abort: file:// URLs can only refer to localhost
   [255]
 
 MSYS changes 'file:' into 'file;'
 
 #if no-msys
   $ hg pull -q file:../test  # no-msys
 #endif
 
 It's tricky to make file:// URLs working on every platform with
 regular shell commands.
 
   $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
 
 SEC: check for unsafe ssh url
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > ssh = sh -c "read l; read l; read l"
   > EOF
 
   $ hg pull 'ssh://-oProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://fakehost|touch${IFS}owned/path'
   pulling from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
   abort: no suitable response from remote hg
   [255]
   $ hg --config ui.timestamp-output=true pull 'ssh://fakehost%7Ctouch%20owned/path'
   \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] pulling from ssh://fakehost%7Ctouch%20owned/path (re)
   \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] abort: no suitable response from remote hg (re)
   [255]
 
   $ [ ! -f owned ] || echo 'you got owned'
 
   $ cd ..