upstream/mercurial-mirror Files · tests/test-issue1175.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

Valentin Gatien-Baron - - Load All Authors

File last commit:

r45219:16c36115 default


                r50337:81623652

default

Download file

             test-issue1175.t
        
                    96 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1175.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/1175

        $ hg init

        $ touch a

        $ hg ci -Am0

        adding a

        $ hg mv a a1

        $ hg ci -m1

        $ hg co 0

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

        $ hg mv a a2

        $ hg up

        note: possible conflict - a was renamed multiple times to:

         a1

         a2

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

        $ hg ci -m2

        $ touch a

        $ hg ci -Am3

        adding a

        $ hg mv a b

        $ hg ci -Am4 a

        $ hg ci --debug --traceback -Am5 b

        committing files:

        b

        warning: can't find ancestor for 'b' copied from 'a'!

        committing manifest

        committing changelog

        updating the branch cache

        committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        checked 6 changesets with 4 changes to 4 files

        $ hg export --git tip

        # HG changeset patch

        # User test

        # Date 0 0

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

        # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1

        # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f

        5

        diff --git a/b b/b

        new file mode 100644

      https://bz.mercurial-scm.org/show_bug.cgi?id=4476

        $ hg init foo

        $ cd foo

        $ touch a && hg ci -Aqm a

        $ hg mv a b

        $ echo b1 >> b

        $ hg ci -Aqm b1

        $ hg up 0

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

        $ hg mv a b

        $ echo b2 >> b

        $ hg ci -Aqm b2

        $ hg graft 1

        grafting 1:5974126fad84 "b1"

        merging b

        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

        abort: unresolved conflicts, can't continue

        (use 'hg resolve' and 'hg graft --continue')

        [1]

        $ echo a > b

        $ echo b3 >> b

        $ hg resolve --mark b

        (no more unresolved files)

        continue: hg graft --continue

        $ hg graft --continue

        grafting 1:5974126fad84 "b1"

        $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'

        changeset:   3:376d30ccffc0

        summary:     b1

        changeset:   2:416baaa2e5e4

        summary:     b2

        changeset:   0:3903775176ed

        summary:     a

	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

				https://bz.mercurial-scm.org/1175

				$ hg init
				$ touch a
				$ hg ci -Am0
				adding a

				$ hg mv a a1
				$ hg ci -m1

				$ hg co 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg mv a a2
				$ hg up
				note: possible conflict - a was renamed multiple times to:
				a1
				a2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg ci -m2

				$ touch a
				$ hg ci -Am3
				adding a

				$ hg mv a b
				$ hg ci -Am4 a

				$ hg ci --debug --traceback -Am5 b
				committing files:
				b
				warning: can't find ancestor for 'b' copied from 'a'!
				committing manifest
				committing changelog
				updating the branch cache
				committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				checked 6 changesets with 4 changes to 4 files

				$ hg export --git tip
				# HG changeset patch
				# User test
				# Date 0 0
				# Thu Jan 01 00:00:00 1970 +0000
				# Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
				# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
				5

				diff --git a/b b/b
				new file mode 100644

				https://bz.mercurial-scm.org/show_bug.cgi?id=4476

				$ hg init foo
				$ cd foo
				$ touch a && hg ci -Aqm a
				$ hg mv a b
				$ echo b1 >> b
				$ hg ci -Aqm b1
				$ hg up 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg mv a b
				$ echo b2 >> b
				$ hg ci -Aqm b2
				$ hg graft 1
				grafting 1:5974126fad84 "b1"
				merging b
				warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
				abort: unresolved conflicts, can't continue
				(use 'hg resolve' and 'hg graft --continue')
				[1]
				$ echo a > b
				$ echo b3 >> b
				$ hg resolve --mark b
				(no more unresolved files)
				continue: hg graft --continue
				$ hg graft --continue
				grafting 1:5974126fad84 "b1"
				$ hg log -f b -T 'changeset: {rev}:{node\|short}\nsummary: {desc}\n\n'
				changeset: 3:376d30ccffc0
				summary: b1

				changeset: 2:416baaa2e5e4
				summary: b2

				changeset: 0:3903775176ed
				summary: a