Mercurial > hg
view contrib/base-revsets.txt @ 28240:1ac8ce137377
changegroup: fix treemanifests on merges
The current code for generating treemanifest revisions takes the list
of files in the changeset and finds the directories from them. This
does not work for merges, since a merge may pick file A from one side
and file B from another and neither of them would appear in the
changeset's "files" list, but the manifest would still change.
Fix this by instead walking the root manifest log for all needed
revisions, storing all needed file and subdirectory revisions, then
recursively visiting the subdirectories. This also turns out to be
faster: cloning a version of hg core converted to treemanifests went
from ~28s to ~19s (timing somewhat unfair: before this patch, timed
until crash; after this patch, timed until manifests complete).
The new algorithm is used only on treemanifest repos. Although it
works equally well on flat manifests, we leave the iteration over
files in the changeset for flat manifests for now.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Feb 2016 23:09:09 -0800 |
parents | 67a2192dcb64 |
children | 70a4289896b0 |
line wrap: on
line source
# Base Revsets to be used with revsetbenchmarks.py script # # The goal of this file is to gather a limited amount of revsets that allow a # good coverage of the internal revsets mechanisms. Revsets included should not # be selected for their individual implementation, but for what they reveal of # the internal implementation of smartsets classes (and their interactions). # # Use and update this file when you change internal implementation of these # smartsets classes. Please include a comment explaining what each of your # addition is testing. Also check if your changes to the smartset class makes # some of the tests inadequate and replace them with a new one testing the same # behavior. # # If you want to benchmark revsets predicate itself, check 'all-revsets.txt'. # # The current content of this file is currently likely not reaching this goal # entirely, feel free, to audit its content and comment on each revset to # highlight what internal mechanisms they test. all() draft() ::tip draft() and ::tip ::tip and draft() 0::tip roots(0::tip) author(lmoscovicz) author(mpm) author(lmoscovicz) or author(mpm) author(mpm) or author(lmoscovicz) tip:0 0:: # those two `roots(...)` inputs are close to what phase movement use. roots((tip~100::) - (tip~100::tip)) roots((0::) - (0::tip)) 42:68 and roots(42:tip) ::p1(p1(tip)):: public() :10000 and public() draft() :10000 and draft() roots((0:tip)::) (not public() - obsolete()) (_intlist('20000\x0020001')) and merge() parents(20000) (20000::) - (20000) # The one below is used by rebase (children(ancestor(tip~5, tip)) and ::(tip~5))::