Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue1877.t
author Brodie Rao <brodie@sf.io>
Mon, 16 Sep 2013 01:08:29 -0700
changeset 20192 38fad5e76ee8
parent 16913 f2719b387380
child 21404 ca275f7ec576
permissions -rw-r--r--
branches: simplify with repo.branchmap().iterbranches() Running hg branches on the PyPy repo (with 996) over a busy NFS server, before this change: $ time hg --profile branches > /dev/null CallCount Recursive Total(s) Inline(s) module:lineno(function) 1069 0 1.2955 1.2955 <open> 1063 0 0.5576 0.5576 <method 'close' of 'file' objects> 4122 0 0.1993 0.0449 mercurial.repoview:161(changelog) 8240 0 0.0771 0.0299 mercurial.changelog:133(tip) 4122 0 0.0422 0.0204 mercurial.localrepo:26(__get__) 8240 0 0.0252 0.0131 <len> 4122 0 0.0060 0.0037 mercurial.repoview:112(filterrevs) 8240 0 0.0028 0.0028 <hash> 3029 0 0.2139 0.0390 mercurial.context:202(__init__) 3029 0 0.1402 0.0339 mercurial.repoview:161(changelog) 3029 0 0.0240 0.0087 mercurial.changelog:183(rev) 9087 0 0.0067 0.0067 <isinstance> 1096 0 0.0025 0.0025 <binascii.unhexlify> 4125 0 0.0015 0.0015 <len> 4229 0 0.0344 0.0344 mercurial.revlog:296(rev) 1061 0 0.0343 0.0343 <method 'seek' of 'file' objects> 1063 0 0.0339 0.0339 <method 'read' of 'file' objects> 40476 16488 0.0479 0.0311 <len> 16488 0 0.0216 0.0168 mercurial.revlog:262(__len__) 8240 0 0.0771 0.0299 mercurial.changelog:133(tip) 8240 0 0.0281 0.0203 mercurial.changelog:190(node) 8240 0 0.0191 0.0095 <len> 1342 0 0.0278 0.0278 <zlib.decompress> 1074 0 2.2143 0.0266 mercurial.changelog:270(read) 1074 0 2.1328 0.0230 mercurial.revlog:907(revision) 1073 0 0.0208 0.0108 mercurial.changelog:28(decodeextra) 2148 0 0.0072 0.0072 <method 'split' of 'str' objects> 2148 0 0.0211 0.0038 mercurial.encoding:61(tolocal) 1074 0 0.0028 0.0028 <method 'index' of 'str' objects> 1061 0 1.9811 0.0237 mercurial.revlog:817(_loadchunk) real 0m2.742s user 0m0.811s sys 0m0.188s After this change: $ time hg --profile branches > /dev/null CallCount Recursive Total(s) Inline(s) module:lineno(function) 2092 0 0.1444 0.0292 mercurial.context:202(__init__) 2092 0 0.0908 0.0216 mercurial.repoview:161(changelog) 2092 0 0.0164 0.0057 mercurial.changelog:183(rev) 6276 0 0.0045 0.0045 <isinstance> 1096 0 0.0024 0.0024 <binascii.unhexlify> 3188 0 0.0013 0.0013 <len> 2218 0 0.0230 0.0230 mercurial.revlog:296(rev) 2111 0 0.1028 0.0218 mercurial.repoview:161(changelog) 4218 0 0.0387 0.0146 mercurial.changelog:133(tip) 2111 0 0.0238 0.0104 mercurial.localrepo:26(__get__) 4218 0 0.0122 0.0062 <len> 2111 0 0.0038 0.0021 mercurial.repoview:112(filterrevs) 4218 0 0.0014 0.0014 <hash> 20240 8444 0.0233 0.0149 <len> 8444 0 0.0110 0.0084 mercurial.revlog:262(__len__) 4218 0 0.0387 0.0146 mercurial.changelog:133(tip) 4218 0 0.0144 0.0103 mercurial.changelog:190(node) 4218 0 0.0097 0.0048 <len> 2398 1 0.0271 0.0115 mercurial.localrepo:26(__get__) 2398 1 0.0146 0.0046 mercurial.scmutil:939(__get__) 2124 0 0.0009 0.0009 mercurial.localrepo:330(unfiltered) 274 0 0.0002 0.0002 mercurial.repoview:192(unfiltered) 4 0 0.1409 0.0112 mercurial.branchmap:19(read) 1096 0 0.1113 0.0028 mercurial.localrepo:407(__contains__) 1098 0 0.0020 0.0020 <method 'split' of 'str' objects> 1097 0 0.0019 0.0019 <binascii.unhexlify> 1096 0 0.0093 0.0018 mercurial.encoding:61(tolocal) 1096 0 0.0010 0.0010 <method 'append' of 'list' objects> 4349 0 0.0150 0.0105 mercurial.changelog:190(node) 4349 0 0.0045 0.0045 mercurial.revlog:317(node) real 0m0.362s user 0m0.329s sys 0m0.024s
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13806
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset 
     1
 
http://mercurial.selenic.com/bts/issue1877
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset 
     2
 












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     3


  $ hg init a













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     4


  $ cd a













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     5


  $ echo a > a













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     6


  $ hg add a













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     7


  $ hg ci -m 'a'













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     8


  $ echo b > a













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     9


  $ hg ci -m'b'













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    10


  $ hg up 0













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    11


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













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    12


  $ hg book main













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    13


  $ hg book













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    14


   * main                      0:cb9a9f314b8b













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    15


  $ echo c > c













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    16


  $ hg add c













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    17


  $ hg ci -m'c'













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    18


  created new head













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    19


  $ hg book













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    20


   * main                      2:d36c0562f908













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    21


  $ hg heads













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    22


  changeset:   2:d36c0562f908













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    23


  bookmark:    main













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    24


  tag:         tip













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    25


  parent:      0:cb9a9f314b8b













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    26


  user:        test













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    27


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













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    28


  summary:     c













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    29


  













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    30


  changeset:   1:1e6c11564562













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    31


  user:        test













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    32


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













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    33


  summary:     b













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    34


  













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    35


  $ hg up 1e6c11564562













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    36


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













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    37


  $ hg merge main













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    38


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













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    39


  (branch merge, don't forget to commit)













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    40


  $ hg book













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    41


     main                      2:d36c0562f908













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    42


  $ hg ci -m'merge'













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    43


  $ hg book













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    44


     main                      2:d36c0562f908













8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    45









16913






f2719b387380
tests: add missing trailing 'cd ..'



Mads Kiilerich <mads@kiilerich.com>


parents: 
13806

diff
changeset




    46


  $ cd ..















Mercurial