Mercurial Mercurial > mercurial / 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-sparse-verbose-json.t
author Arun Kulshreshtha <akulshreshtha@janestreet.com>
Tue, 30 Aug 2022 15:29:55 -0400
changeset 49491 c6a1beba27e9
parent 33355 9087f9997f42
permissions -rw-r--r--
bisect: avoid copying ancestor list for non-merge commits During a bisection, hg needs to compute a list of all ancestors for every candidate commit. This is accomplished via a bottom-up traversal of the set of candidates, during which each revision's ancestor list is populated using the ancestor list of its parent(s). Previously, this involved copying the entire list, which could be very long in if the bisection range was large. To help improve this, we can observe that each candidate commit is visited exactly once, at which point its ancestor list is copied into its children's lists and then dropped. In the case of non-merge commits, a commit's ancestor list consists exactly of its parent's list plus itself. This means that we can trivially reuse the parent's existing list for one of its non-merge children, which avoids copying entirely if that commit is the parent's only child. This makes bisections over linear ranges of commits much faster. During some informal testing in the large publicly-available `mozilla-central` repository, this noticeably sped up bisections over large ranges of history: Setup: $ cd mozilla-central $ hg bisect --reset $ hg bisect --good 0 $ hg log -r tip -T '{rev}\n' 628417 Test: $ time hg bisect --bad tip --noupdate Before: real 3m35.927s user 3m35.553s sys 0m0.319s After: real 1m41.142s user 1m40.810s sys 0m0.285s
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
33289
abd7dedbaa36 sparse: vendor Facebook-developed extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset 
     1
 
test sparse with --verbose and -T json
abd7dedbaa36 sparse: vendor Facebook-developed extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset 
     2
 












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     3


  $ hg init myrepo












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     4


  $ cd myrepo












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     5


  $ cat > .hg/hgrc <<EOF












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     6


  > [extensions]












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     7


  > sparse=












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     8


  > strip=












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




     9


  > EOF












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    10














abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    11


  $ echo a > show












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    12


  $ echo x > hide












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    13


  $ hg ci -Aqm 'initial'












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    14














abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    15


  $ echo b > show












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    16


  $ echo y > hide












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    17


  $ echo aa > show2












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    18


  $ echo xx > hide2












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    19


  $ hg ci -Aqm 'two'












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    20














abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    21


Verify basic --include and --reset












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    22














abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    23


  $ hg up -q 0







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    24


  $ hg debugsparse --include 'hide' -Tjson







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    25


  [












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    26


   {












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    27


    "exclude_rules_added": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    28


    "files_added": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    29


    "files_conflicting": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    30


    "files_dropped": 1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    31


    "include_rules_added": 1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    32


    "profiles_added": 0












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    33


   }












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    34


  ]







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    35


  $ hg debugsparse --clear-rules












c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    36


  $ hg debugsparse --include 'hide' --verbose







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    37


  removing show







33355






9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    38


  Profiles changed: 0












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    39


  Include rules changed: 1












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    40


  Exclude rules changed: 0







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    41









33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    42


  $ hg debugsparse --reset -Tjson







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    43


  [












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    44


   {












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    45


    "exclude_rules_added": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    46


    "files_added": 1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    47


    "files_conflicting": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    48


    "files_dropped": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    49


    "include_rules_added": -1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    50


    "profiles_added": 0












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    51


   }












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    52


  ]







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    53


  $ hg debugsparse --include 'hide'












c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    54


  $ hg debugsparse --reset --verbose







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    55


  getting show







33355






9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    56


  Profiles changed: 0












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    57


  Include rules changed: -1












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    58


  Exclude rules changed: 0







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    59














abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    60


Verifying that problematic files still allow us to see the deltas when forcing:












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    61









33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    62


  $ hg debugsparse --include 'show*'







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    63


  $ touch hide







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    64


  $ hg debugsparse --delete 'show*' --force -Tjson







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    65


  pending changes to 'hide'












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    66


  [












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    67


   {












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    68


    "exclude_rules_added": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    69


    "files_added": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    70


    "files_conflicting": 1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    71


    "files_dropped": 0,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    72


    "include_rules_added": -1,












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    73


    "profiles_added": 0












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    74


   }












abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    75


  ]







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    76


  $ hg debugsparse --include 'show*' --force







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    77


  pending changes to 'hide'







33293






c9cbf4de27ba
sparse: rename command to debugsparse



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33289

diff
changeset




    78


  $ hg debugsparse --delete 'show*' --force --verbose







33289






abd7dedbaa36
sparse: vendor Facebook-developed extension



Gregory Szorc <gregory.szorc@gmail.com>


parents: 

diff
changeset




    79


  pending changes to 'hide'







33355






9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    80


  Profiles changed: 0












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    81


  Include rules changed: -1












9087f9997f42
sparse: move printing of sparse config changes function into core



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
33293

diff
changeset




    82


  Exclude rules changed: 0














mercurial