upstream/mercurial-mirror Files · tests/test-static-http.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Mike Hommey - - Load All Authors

File last commit:

r22960:7c13c940 default


                r23524:a1a7c94d

default

Download file

             test-static-http.t
        
                    162 lines
            
             | 4.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-static-http.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require killdaemons

      #if windows

        $ hg clone http://localhost:$HGPORT/ copy

        abort: * (glob)

        [255]

      #else

        $ hg clone http://localhost:$HGPORT/ copy

        abort: error: Connection refused

        [255]

      #endif

        $ test -d copy

        [1]

      This server doesn't do range requests so it's basically only good for

      one pull

        $ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid

        $ cat dumb.pid >> $DAEMON_PIDS

        $ hg init remote

        $ cd remote

        $ echo foo > bar

        $ echo c2 > '.dotfile with spaces'

        $ hg add

        adding .dotfile with spaces

        adding bar

        $ hg commit -m"test"

        $ hg tip

        changeset:   0:02770d679fb8

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     test

        $ cd ..

        $ hg clone static-http://localhost:$HGPORT/remote local

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 2 changes to 2 files

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd local

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 1 changesets, 2 total revisions

        $ cat bar

        foo

        $ cd ../remote

        $ echo baz > quux

        $ hg commit -A -mtest2

        adding quux

      check for HTTP opener failures when cachefile does not exist

        $ rm .hg/cache/*

        $ cd ../local

        $ echo '[hooks]' >> .hg/hgrc

        $ echo "changegroup = python \"$TESTDIR/printenv.py\" changegroup" >> .hg/hgrc

        $ hg pull

        pulling from static-http://localhost:$HGPORT/remote

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        changegroup hook: HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote

        (run 'hg update' to get a working copy)

      trying to push

        $ hg update

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo more foo >> bar

        $ hg commit -m"test"

        $ hg push

        pushing to static-http://localhost:$HGPORT/remote

        abort: destination does not support push

        [255]

      trying clone -r

        $ cd ..

        $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0

        abort: unknown revision 'doesnotexist'!

        [255]

        $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 2 changes to 2 files

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

      test with "/" URI (issue747) and subrepo

        $ hg init

        $ hg init sub

        $ touch sub/test

        $ hg -R sub commit -A -m "test"

        adding test

        $ hg -R sub tag not-empty

        $ echo sub=sub > .hgsub

        $ echo a > a

        $ hg add a .hgsub

        $ hg -q ci -ma

        $ hg clone static-http://localhost:$HGPORT/ local2

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        updating to branch default

        cloning subrepo sub from static-http://localhost:$HGPORT/sub

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd local2

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        3 files, 1 changesets, 3 total revisions

        $ cat a

        a

        $ hg paths

        default = static-http://localhost:$HGPORT/

      test with empty repo (issue965)

        $ cd ..

        $ hg init remotempty

        $ hg clone static-http://localhost:$HGPORT/remotempty local3

        no changes found

        updating to branch default

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd local3

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

        $ hg paths

        default = static-http://localhost:$HGPORT/remotempty

      test with non-repo

        $ cd ..

        $ mkdir notarepo

        $ hg clone static-http://localhost:$HGPORT/notarepo local3

        abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository!

        [255]

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

	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

				#require killdaemons

				#if windows
				$ hg clone http://localhost:$HGPORT/ copy
				abort: * (glob)
				[255]
				#else
				$ hg clone http://localhost:$HGPORT/ copy
				abort: error: Connection refused
				[255]
				#endif
				$ test -d copy
				[1]

				This server doesn't do range requests so it's basically only good for
				one pull

				$ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
				$ cat dumb.pid >> $DAEMON_PIDS
				$ hg init remote
				$ cd remote
				$ echo foo > bar
				$ echo c2 > '.dotfile with spaces'
				$ hg add
				adding .dotfile with spaces
				adding bar
				$ hg commit -m"test"
				$ hg tip
				changeset: 0:02770d679fb8
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: test

				$ cd ..
				$ hg clone static-http://localhost:$HGPORT/remote local
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 2 changes to 2 files
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd local
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 1 changesets, 2 total revisions
				$ cat bar
				foo
				$ cd ../remote
				$ echo baz > quux
				$ hg commit -A -mtest2
				adding quux

				check for HTTP opener failures when cachefile does not exist

				$ rm .hg/cache/*
				$ cd ../local
				$ echo '[hooks]' >> .hg/hgrc
				$ echo "changegroup = python \"$TESTDIR/printenv.py\" changegroup" >> .hg/hgrc
				$ hg pull
				pulling from static-http://localhost:$HGPORT/remote
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				changegroup hook: HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote
				(run 'hg update' to get a working copy)

				trying to push

				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo more foo >> bar
				$ hg commit -m"test"
				$ hg push
				pushing to static-http://localhost:$HGPORT/remote
				abort: destination does not support push
				[255]

				trying clone -r

				$ cd ..
				$ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0
				abort: unknown revision 'doesnotexist'!
				[255]
				$ hg clone -r 0 static-http://localhost:$HGPORT/remote local0
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 2 changes to 2 files
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				test with "/" URI (issue747) and subrepo

				$ hg init
				$ hg init sub
				$ touch sub/test
				$ hg -R sub commit -A -m "test"
				adding test
				$ hg -R sub tag not-empty
				$ echo sub=sub > .hgsub
				$ echo a > a
				$ hg add a .hgsub
				$ hg -q ci -ma
				$ hg clone static-http://localhost:$HGPORT/ local2
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				updating to branch default
				cloning subrepo sub from static-http://localhost:$HGPORT/sub
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd local2
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				3 files, 1 changesets, 3 total revisions
				$ cat a
				a
				$ hg paths
				default = static-http://localhost:$HGPORT/

				test with empty repo (issue965)

				$ cd ..
				$ hg init remotempty
				$ hg clone static-http://localhost:$HGPORT/remotempty local3
				no changes found
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd local3
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions
				$ hg paths
				default = static-http://localhost:$HGPORT/remotempty

				test with non-repo

				$ cd ..
				$ mkdir notarepo
				$ hg clone static-http://localhost:$HGPORT/notarepo local3
				abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository!
				[255]
				$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS