upstream/mercurial-mirror Files · tests/test-pull-r.t

bisect: avoid adding irrelevant revisions to bisect state...

bisect: avoid adding irrelevant revisions to bisect state When adding new revisions to the bisect state, it only makes sense to add information about revisions that are under consideration (i.e., those that are topologically between the known good and bad revisions). However, if the user passes in a revset (e.g., '!merge()' to exclude merge commits), hg will resolve the revset first and add all matching revisions to the bisect state (which in this case would likely be the majority of revisions in the repo). To avoid this, revisions should only be added to the bisect state if they are between the good and bad revisions (and therefore relevant to the bisection). -- Here are the results of some performance tests using the `mozilla-central` repo (since it is one of the largest freely-available hg repositories in the wild). These tests compare the performance of a locally-built `hg` before and after application of this series. Note that `--noupdate` is passed to avoid including update time (which should not vary across cases). Setup (run between each test): $ hg bisect --reset $ hg bisect --noupdate --bad $ hg bisect --noupdate --good Test using a revset that returns a very large number of revisions: $ time hg bisect --noupdate --skip '!merge()' > /dev/null Before: real 0m9.398s user 0m9.233s sys 0m0.120s After: real 0m1.513s user 0m1.425s sys 0m0.052s Test using a revset that is expensive to compute: $ time hg bisect --noupdate --skip 'desc("Bug")' > /dev/null Before: real 0m49.853s user 0m49.580s sys 0m0.243s After: real 0m4.120s user 0m4.036s sys 0m0.048s

Martin von Zweigbergk - - Load All Authors

File last commit:

r49191:8c4881c0 default


                r50337:81623652

default

Download file

             test-pull-r.t
        
                    194 lines
            
             | 4.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-r.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pulkit Goyal
    
pull: add `--confirm` flag to confirm before writing changes...

              r45033
            
        $ cat <<EOF >> $HGRCPATH

        > [ui]

        > interactive = true

        > EOF

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo >> foo

        $ hg ci -m 'change foo'

        $ hg up -qC 0

        $ echo bar > bar

        $ hg ci -qAm 'add bar'

        $ hg log

        changeset:   2:effea6de0384

        tag:         tip

        parent:      0:bbd179dfa0a7

        user:        test

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

        summary:     add bar

        changeset:   1:ed1b79f46b9a

        user:        test

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

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

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

        summary:     add foo

        $ cd ..

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

              r14036
            
      don't show "(+1 heads)" message when pulling closed head

        $ hg clone -q repo repo2

        $ hg clone -q repo2 repo3

        $ cd repo2

        $ hg up -q 0

        $ echo hello >> foo

        $ hg ci -mx1

        created new head

        $ hg ci -mx2 --close-branch

        $ cd ../repo3

        $ hg heads -q --closed

        2:effea6de0384

        1:ed1b79f46b9a

        Pulkit Goyal
    
pull: add `--confirm` flag to confirm before writing changes...

              r45033
            
        $ hg pull --confirm << EOF

        > n

        > EOF

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pulling from $TESTTMP/repo2

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

              r14036
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        Pulkit Goyal
    
pull: add `--confirm` flag to confirm before writing changes...

              r45033
            
        adding 2 changesets with 1 changes to 1 files

        new changesets 8c900227dd5d:00cfe9073916

        accept incoming changes (yn)? n

        transaction abort!

        rollback completed

        abort: user aborted

        [255]

        $ hg pull --config pull.confirm=true << EOF

        > n

        > EOF

        pulling from $TESTTMP/repo2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        adding 2 changesets with 1 changes to 1 files

        new changesets 8c900227dd5d:00cfe9073916

        accept incoming changes (yn)? n

        transaction abort!

        rollback completed

        abort: user aborted

        [255]

        $ hg pull --confirm << EOF

        > y

        > EOF

        pulling from $TESTTMP/repo2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        adding 2 changesets with 1 changes to 1 files

        new changesets 8c900227dd5d:00cfe9073916

        accept incoming changes (yn)? y

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

              r14036
            
        added 2 changesets with 1 changes to 1 files

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets 8c900227dd5d:00cfe9073916

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

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

        $ hg heads -q --closed

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        4:00cfe9073916

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

              r14036
            
        2:effea6de0384

        1:ed1b79f46b9a

        Pulkit Goyal
    
pull: add `--confirm` flag to confirm before writing changes...

              r45033
            
      pull--confirm config option should be ignored if HGPLAIN is set

        $ HGPLAIN=1 hg pull --config pull.confirm=True

        pulling from $TESTTMP/repo2

        searching for changes

        no changes found

        Adrian Buehlmann
    
changegroup: do not count closed new heads (issue2697)...

              r14036
            
        $ cd ..

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init copy

        $ cd copy

      Pull a missing revision:

        $ hg pull -qr missing ../repo

        Martin von Zweigbergk
    
errors: remove trailing "!" from some error messages for consistency...

              r46518
            
        abort: unknown revision 'missing'

        Martin von Zweigbergk
    
errors: use detailed exit code for RepoLookupError...

              r49191
            
        [10]

        Adrian Buehlmann
    
combine tests

              r12279
            
      Pull multiple revisions with update:

        $ hg pull -qu -r 0 -r 1 ../repo

        $ hg -q parents

        0:bbd179dfa0a7

        $ hg rollback

        Gilles Moris
    
rollback: clarifies the message about the reverted state (issue2628)...

              r13446
            
        repository tip rolled back to revision -1 (undo pull)

        working directory now based on revision -1

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg pull -qr 0 ../repo

        $ hg log

        changeset:   0:bbd179dfa0a7

        tag:         tip

        user:        test

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

        summary:     add foo

        $ hg pull -qr 1 ../repo

        $ hg log

        changeset:   1:ed1b79f46b9a

        tag:         tip

        user:        test

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

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

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

        summary:     add foo

      This used to abort: received changelog group is empty:

        $ hg pull -qr 1 ../repo

        Pierre-Yves David
    
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...

              r25425
            
      Test race condition with -r and -U (issue4707)

      We pull '-U -r <name>' and the name change right after/during the changegroup emission.

      We use http because http is better is our racy-est option.

        $ echo babar > ../repo/jungle

        $ cat <<EOF > ../repo/.hg/hgrc

        > [hooks]

        > outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race

        > EOF

        Jun Wu
    
tests: reorder hg serve commands...

              r28549
            
        $ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid

        Pierre-Yves David
    
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...

              r25425
            
        $ cat ../repo.pid >> $DAEMON_PIDS

        $ hg pull --rev default --update http://localhost:$HGPORT2/

        pulling from http://localhost:$HGPORT2/

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets effea6de0384

        Pierre-Yves David
    
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...

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

        $ hg log -G

        @  changeset:   2:effea6de0384

        |  tag:         tip

        |  parent:      0:bbd179dfa0a7

        |  user:        test

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

        |  summary:     add bar

        |

        | o  changeset:   1:ed1b79f46b9a

        |/   user:        test

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

        |    summary:     change foo

        |

        o  changeset:   0:bbd179dfa0a7

           user:        test

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

           summary:     add foo

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

        Joerg Sonnenberger
    
test-pull-r: explicitly kill server processes...

              r35630
            
        $ killdaemons.py

	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

Pulkit Goyal pull: add `--confirm` flag to confirm before writing changes...	r45033	$ cat <<EOF >> $HGRCPATH
		> [ui]
		> interactive = true
		> EOF


Adrian Buehlmann combine tests	r12279	$ hg init repo
		$ cd repo
		$ echo foo > foo
		$ hg ci -qAm 'add foo'
		$ echo >> foo
		$ hg ci -m 'change foo'
		$ hg up -qC 0
		$ echo bar > bar
		$ hg ci -qAm 'add bar'

		$ hg log
		changeset: 2:effea6de0384
		tag: tip
		parent: 0:bbd179dfa0a7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: add bar

		changeset: 1:ed1b79f46b9a
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: change foo

		changeset: 0:bbd179dfa0a7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: add foo

		$ cd ..
Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036
		don't show "(+1 heads)" message when pulling closed head

		$ hg clone -q repo repo2
		$ hg clone -q repo2 repo3
		$ cd repo2
		$ hg up -q 0
		$ echo hello >> foo
		$ hg ci -mx1
		created new head
		$ hg ci -mx2 --close-branch
		$ cd ../repo3
		$ hg heads -q --closed
		2:effea6de0384
		1:ed1b79f46b9a
Pulkit Goyal pull: add `--confirm` flag to confirm before writing changes...	r45033	$ hg pull --confirm << EOF
		> n
		> EOF
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/repo2
Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036	searching for changes
		adding changesets
		adding manifests
		adding file changes
Pulkit Goyal pull: add `--confirm` flag to confirm before writing changes...	r45033	adding 2 changesets with 1 changes to 1 files
		new changesets 8c900227dd5d:00cfe9073916
		accept incoming changes (yn)? n
		transaction abort!
		rollback completed
		abort: user aborted
		[255]
		$ hg pull --config pull.confirm=true << EOF
		> n
		> EOF
		pulling from $TESTTMP/repo2
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		adding 2 changesets with 1 changes to 1 files
		new changesets 8c900227dd5d:00cfe9073916
		accept incoming changes (yn)? n
		transaction abort!
		rollback completed
		abort: user aborted
		[255]
		$ hg pull --confirm << EOF
		> y
		> EOF
		pulling from $TESTTMP/repo2
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		adding 2 changesets with 1 changes to 1 files
		new changesets 8c900227dd5d:00cfe9073916
		accept incoming changes (yn)? y
Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036	added 2 changesets with 1 changes to 1 files
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets 8c900227dd5d:00cfe9073916
Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036	(run 'hg update' to get a working copy)
		$ hg heads -q --closed
Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	4:00cfe9073916
Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036	2:effea6de0384
		1:ed1b79f46b9a

Pulkit Goyal pull: add `--confirm` flag to confirm before writing changes...	r45033	pull--confirm config option should be ignored if HGPLAIN is set
		$ HGPLAIN=1 hg pull --config pull.confirm=True
		pulling from $TESTTMP/repo2
		searching for changes
		no changes found

Adrian Buehlmann changegroup: do not count closed new heads (issue2697)...	r14036	$ cd ..

Adrian Buehlmann combine tests	r12279	$ hg init copy
		$ cd copy

		Pull a missing revision:

		$ hg pull -qr missing ../repo
Martin von Zweigbergk errors: remove trailing "!" from some error messages for consistency...	r46518	abort: unknown revision 'missing'
Martin von Zweigbergk errors: use detailed exit code for RepoLookupError...	r49191	[10]
Adrian Buehlmann combine tests	r12279
		Pull multiple revisions with update:

		$ hg pull -qu -r 0 -r 1 ../repo
		$ hg -q parents
		0:bbd179dfa0a7
		$ hg rollback
Gilles Moris rollback: clarifies the message about the reverted state (issue2628)...	r13446	repository tip rolled back to revision -1 (undo pull)
		working directory now based on revision -1
Adrian Buehlmann combine tests	r12279
		$ hg pull -qr 0 ../repo
		$ hg log
		changeset: 0:bbd179dfa0a7
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: add foo

		$ hg pull -qr 1 ../repo
		$ hg log
		changeset: 1:ed1b79f46b9a
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: change foo

		changeset: 0:bbd179dfa0a7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: add foo


		This used to abort: received changelog group is empty:

		$ hg pull -qr 1 ../repo

Pierre-Yves David pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...	r25425	Test race condition with -r and -U (issue4707)

		We pull '-U -r <name>' and the name change right after/during the changegroup emission.
		We use http because http is better is our racy-est option.


		$ echo babar > ../repo/jungle
		$ cat <<EOF > ../repo/.hg/hgrc
		> [hooks]
		> outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race
		> EOF
Jun Wu tests: reorder hg serve commands...	r28549	$ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid
Pierre-Yves David pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...	r25425	$ cat ../repo.pid >> $DAEMON_PIDS
		$ hg pull --rev default --update http://localhost:$HGPORT2/
		pulling from http://localhost:$HGPORT2/
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets effea6de0384
Pierre-Yves David pull: avoid race condition with 'hg pull --rev name --update' (issue4706)...	r25425	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg log -G
		@ changeset: 2:effea6de0384
		\| tag: tip
		\| parent: 0:bbd179dfa0a7
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: add bar
		\|
		\| o changeset: 1:ed1b79f46b9a
		\|/ user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: change foo
		\|
		o changeset: 0:bbd179dfa0a7
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: add foo


Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..
Joerg Sonnenberger test-pull-r: explicitly kill server processes...	r35630	$ killdaemons.py