##// END OF EJS Templates
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 56c3ad4bde5c70714b784ccf15d099e0df0f5bde $ hg bisect --noupdate --good 57426696adaf08298af3027fa77486fee0633b13 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

File last commit:

r48845:5b89626c default
r50337:81623652 default
Show More
test-addremove-similar.t
174 lines | 3.8 KiB | text/troff | Tads3Lexer
/ tests / test-addremove-similar.t
Martin Geisler
tests: unify test-addremove-similar
r11851 $ hg init rep; cd rep
$ touch empty-file
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" -c 'for x in range(10000): print(x)' > large-file
Martin Geisler
tests: unify test-addremove-similar
r11851
$ hg addremove
adding empty-file
adding large-file
$ hg commit -m A
$ rm large-file empty-file
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" -c 'for x in range(10,10000): print(x)' > another-file
Martin Geisler
tests: unify test-addremove-similar
r11851
$ hg addremove -s50
adding another-file
removing empty-file
removing large-file
recording removal of large-file as rename to another-file (99% similar)
$ hg commit -m B
comparing two empty files caused ZeroDivisionError in the past
$ hg update -C 0
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ rm empty-file
$ touch another-empty-file
$ hg addremove -s50
adding another-empty-file
removing empty-file
$ cd ..
$ hg init rep2; cd rep2
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" -c 'for x in range(10000): print(x)' > large-file
$ "$PYTHON" -c 'for x in range(50): print(x)' > tiny-file
Martin Geisler
tests: unify test-addremove-similar
r11851
$ hg addremove
adding large-file
adding tiny-file
$ hg commit -m A
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" -c 'for x in range(70): print(x)' > small-file
Martin Geisler
tests: unify test-addremove-similar
r11851 $ rm tiny-file
$ rm large-file
$ hg addremove -s50
removing large-file
adding small-file
removing tiny-file
recording removal of tiny-file as rename to small-file (82% similar)
$ hg commit -m B
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 should be sorted by path for stable result
Matt Harbison
tests: quote PYTHON usage...
r39743 $ for i in `"$PYTHON" $TESTDIR/seq.py 0 9`; do
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 > cp small-file $i
> done
$ rm small-file
$ hg addremove
adding 0
adding 1
adding 2
adding 3
adding 4
adding 5
adding 6
adding 7
adding 8
adding 9
removing small-file
recording removal of small-file as rename to 0 (100% similar)
recording removal of small-file as rename to 1 (100% similar)
recording removal of small-file as rename to 2 (100% similar)
recording removal of small-file as rename to 3 (100% similar)
recording removal of small-file as rename to 4 (100% similar)
recording removal of small-file as rename to 5 (100% similar)
recording removal of small-file as rename to 6 (100% similar)
recording removal of small-file as rename to 7 (100% similar)
recording removal of small-file as rename to 8 (100% similar)
recording removal of small-file as rename to 9 (100% similar)
$ hg commit -m '10 same files'
pick one from many identical files
$ cp 0 a
Matt Harbison
tests: quote PYTHON usage...
r39743 $ rm `"$PYTHON" $TESTDIR/seq.py 0 9`
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 $ hg addremove
removing 0
removing 1
removing 2
removing 3
removing 4
removing 5
removing 6
removing 7
removing 8
removing 9
adding a
Yuya Nishihara
similar: take the first match instead of the last...
r31583 recording removal of 0 as rename to a (100% similar)
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 $ hg revert -aq
pick one from many similar files
$ cp 0 a
Matt Harbison
tests: quote PYTHON usage...
r39743 $ for i in `"$PYTHON" $TESTDIR/seq.py 0 9`; do
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 > echo $i >> $i
> done
$ hg commit -m 'make them slightly different'
Matt Harbison
tests: quote PYTHON usage...
r39743 $ rm `"$PYTHON" $TESTDIR/seq.py 0 9`
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 $ hg addremove -s50
removing 0
removing 1
removing 2
removing 3
removing 4
removing 5
removing 6
removing 7
removing 8
removing 9
adding a
Yuya Nishihara
similar: take the first match instead of the last...
r31583 recording removal of 0 as rename to a (99% similar)
Yuya Nishihara
similar: sort files not by object id but by path for stable result...
r31579 $ hg commit -m 'always the same file should be selected'
Martin Geisler
tests: unify test-addremove-similar
r11851 should all fail
$ hg addremove -s foo
abort: similarity must be a number
Martin von Zweigbergk
errors: use InputError for bad --similarity value...
r48845 [10]
Martin Geisler
tests: unify test-addremove-similar
r11851 $ hg addremove -s -1
abort: similarity must be between 0 and 100
Martin von Zweigbergk
errors: use InputError for bad --similarity value...
r48845 [10]
Martin Geisler
tests: unify test-addremove-similar
r11851 $ hg addremove -s 1e6
abort: similarity must be between 0 and 100
Martin von Zweigbergk
errors: use InputError for bad --similarity value...
r48845 [10]
Martin Geisler
tests: unify test-addremove-similar
r11851
$ cd ..
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 Issue1527: repeated addremove causes Abort
Martin Geisler
tests: unify test-addremove-similar
r11851
$ hg init rep3; cd rep3
$ mkdir d
$ echo a > d/a
$ hg add d/a
$ hg commit -m 1
$ mv d/a d/b
$ hg addremove -s80
removing d/a
adding d/b
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 recording removal of d/a as rename to d/b (100% similar)
Martin Geisler
tests: unify test-addremove-similar
r11851 $ hg debugstate
r 0 0 1970-01-01 00:00:00 d/a
a 0 -1 unset d/b
copy: d/a -> d/b
$ mv d/b c
no copies found here (since the target isn't in d
$ hg addremove -s80 d
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 removing d/b
Martin Geisler
tests: unify test-addremove-similar
r11851
copies here
$ hg addremove -s80
adding c
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 recording removal of d/a as rename to c (100% similar)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..