Mercurial > hg
view hgext/releasenotes.py @ 39506:b66ea3fc3a86
sparse-revlog: set max delta chain length to on thousand
The new snapshot system used in the sparse-revlog case gave us some small size
benefit so far. However its most important property is to gracefully handle
harder limit on delta chainlength.
Long delta chain has a very detrimental impact on read (and write) performance
in revlog. Being able to shorter them provide a great boost. However, shorting
delta used to result significantly lower compression ratio. The intermediate
snapshots effectively suppress most of this effect (even all in some case).
# Effect on the test repository
The repository we use for test is not "realistic" but can still show this in
action using an unreasonably low chain limit. Limiting the chain length show a
sizeable increase but stay under control: +6% for limit=15; +15% for limit=10.
Without the snapshot system the increase is significantly bigger: +45% for
limit=15; +80% for limit=10. Even slightly larger than without delta chain
limit, the resulting size is still smaller than before we started doing
snapshots.
Here is a table for comparison. *Since the repository is not branchy, the
initial sparse-revlog version does not bring much benefit compare to the
non-sparse one):
chain length limit | none | limit=15 | limit=10 |
without sparse-revlog | 62 818 987 | 112 664 615 | 131 222 574 |
without snapshot | 74 365 490 | 108 211 410 | 133 857 764 |
with snapshot | 59 230 936 | 63 002 924 | 68 415 329 |
# Effect On Real Life Repositories
The series provides significant benefits on all kind of repositories.
Using `hg debugupgraderepo -o redeltaparent --run`, we recomputed delta chain
for various repositories with different settings:
- delta chain length: unlimited or 1000 limit
- sparse-revlog: enabled or disabled
- this series: applied or not applied
We can observe multiple types of effect:
- On very branchy repositories:
* The delta chain limit as low impact on the repo size.
* Intermediate snapshot greatly reduces manifest size:
- pypy: -80%
- netbeans: -95%
* The delta chain limit is effective, without a size impact:
- netbeans average: 613 -> 282
- private #1 average: 1 068 -> 307
- On more linear repository:
* Intermediate snapshot limit the impact of delta chain limit:
- mozilla:
without the series: +360%
with the series: +25%
* The delta chain limit provides large improvement:
- mozilla's average chain length:
unlimited: 15 338
limited: 469
* Despite the chain length limit, the manifest size is reduced:
- mercurial: -25%
- mozilla: -30%
It is clear that the use of chains of intermediate snapshots provide large
benefits both in storage size and delta chains quality. We should now switch our
effort toward making sure the write performance are acceptable. Then,
`sparse-revlog` will be a suitable format for all new repository.
# Raw Statistic
* no-sparse: general delta repository not using sparse-revlog
* no-snapshot: sparse-revlog repository not using this series
* snapshot: sparse-revlog repository using this series
mercurial
Manifest Size:
limit | none | 1000
------------|-------------|------------
no-sparse | 8 021 373 | 8 199 366
no-snapshot | 8 103 561 | 8 259 719
snapshot | 6 137 116 | 6 126 433
Manifest Chain length data
limit || none || 1000 ||
value || average | max || average | max ||
------------||---------|---------||---------|---------||
no-sparse || 307 | 1456 || 279 | 1000 ||
no-snapshot || 312 | 1456 || 283 | 1000 ||
snapshot || 248 | 1208 || 241 | 1000 ||
Full Store Size
limit | none | 1000
------------|-------------|------------
no-sparse | 51 013 198 | 51 201 574
no-snapshot | 50 930 795 | 51 141 006
snapshot | 48 072 037 | 48 093 572
pypy
Manifest Size:
limit | none | 1000
------------|-------------|------------
no-sparse | 193 987 784 | 193 987 784
no-snapshot | 163 171 745 | 163 312 229
snapshot | 34 605 900 | 34 600 750
Manifest Chain length data
limit || none || 1000 ||
value || average | max || average | max ||
------------||---------|---------||---------|---------||
no-sparse || 101 | 692 || 101 | 692 ||
no-snapshot || 151 | 1307 || 148 | 1000 ||
snapshot || 128 | 1309 || 125 | 1000 ||
Full Store Size
limit | none | 1000
------------|-------------|------------
no-sparse | 495 931 473 | 495 931 473
no-snapshot | 465 441 017 | 465 581 501
snapshot | 355 467 301 | 355 472 451
Mozilla
Manifest Size:
limit | none | 1000
------------|----------------|---------------
no-sparse | 416 757 148 | 1 869 009 668
no-snapshot | 401 592 370 | 1 843 493 795
snapshot | 224 359 521 | 284 615 500
Manifest Chain length data
limit || none || 1000 ||
value || average | max || average | max ||
------------||---------|---------||---------|---------||
no-sparse || 15 333 | 58 980 || 468 | 1 000 ||
no-snapshot || 15 336 | 58 980 || 469 | 1 000 ||
snapshot || 15 338 | 58 983 || 469 | 1 000 ||
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 2 712 477 887 | 4 164 995 451
no-snapshot | 2 698 887 835 | 4 141 054 304
snapshot | 2 518 130 385 | 2 578 587 596
Netbeans
Manifest Size:
limit | none | 1000
------------|----------------|---------------
no-sparse | 4 766 794 101 | 4 870 642 687
no-snapshot | 4 334 806 082 | 4 428 681 309
snapshot | 232 659 666 | 240 330 665
Manifest Chain length data
limit || none || 1000 ||
value || average | max || average | max ||
------------||---------|---------||---------|---------||
no-sparse || 597 | 6802 || 254 | 1 000 ||
no-snapshot || 648 | 6 802 || 305 | 1 000 ||
snapshot || 613 | 6 804 || 282 | 1 000 ||
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 5 807 347 998 | 5 911 196 584
no-snapshot | 5 375 398 602 | 5 469 273 829
snapshot | 1 282 519 928 | 1 290 190 927
Private repo #1
Manifest Size:
limit | none | 1000
------------|-----------------|---------------
no-sparse | 41 389 010 840 | 41 398 162 091
no-snapshot | 9 737 319 435 | 10 223 773 150
snapshot | 744 215 807 | 747 961 822
Manifest Chain length data
limit || none || 1000 ||
value || average | max || average | max ||
------------||---------|---------||---------|---------||
no-sparse || 245 | 8 885 || 81 | 1 000 ||
no-snapshot || 1 225 | 8 885 || 336 | 1 000 ||
snapshot || 1 068 | 7 909 || 307 | 1 000 ||
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 49 646 065 126 | 49 655 216 377
no-snapshot | 17 924 862 856 | 18 411 316 571
snapshot | 9 009 024 710 | 9 012 770 725
Private repo #2
We currently have less data available for that repository.
* Before is a sparse-revlog repository without this series
* After is a sparse-revlog repository with this series + 1000 chain limit
Manifest Size:
Before: 1 531 485 040 bytes
After: 1 091 422 451 bytes
Manifest Chain:
Before: 2 218 avg; 6 575 Max
After: 442 avg; 1 000 Max
Full Store Size
Before: 15 203 955 615
after: 8 207 180 693
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 07 Sep 2018 11:18:45 -0400 |
parents | a5891e94bfe1 |
children | 3fc2ef49959c |
line wrap: on
line source
# Copyright 2017-present Gregory Szorc <gregory.szorc@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """generate release notes from commit messages (EXPERIMENTAL) It is common to maintain files detailing changes in a project between releases. Maintaining these files can be difficult and time consuming. The :hg:`releasenotes` command provided by this extension makes the process simpler by automating it. """ from __future__ import absolute_import import difflib import errno import re import sys import textwrap from mercurial.i18n import _ from mercurial import ( config, error, minirst, node, pycompat, registrar, scmutil, util, ) cmdtable = {} command = registrar.command(cmdtable) try: import fuzzywuzzy.fuzz as fuzz fuzz.token_set_ratio except ImportError: fuzz = None # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'ships-with-hg-core' DEFAULT_SECTIONS = [ ('feature', _('New Features')), ('bc', _('Backwards Compatibility Changes')), ('fix', _('Bug Fixes')), ('perf', _('Performance Improvements')), ('api', _('API Changes')), ] RE_DIRECTIVE = re.compile('^\.\. ([a-zA-Z0-9_]+)::\s*([^$]+)?$') RE_ISSUE = r'\bissue ?[0-9]{4,6}(?![0-9])\b' BULLET_SECTION = _('Other Changes') class parsedreleasenotes(object): def __init__(self): self.sections = {} def __contains__(self, section): return section in self.sections def __iter__(self): return iter(sorted(self.sections)) def addtitleditem(self, section, title, paragraphs): """Add a titled release note entry.""" self.sections.setdefault(section, ([], [])) self.sections[section][0].append((title, paragraphs)) def addnontitleditem(self, section, paragraphs): """Adds a non-titled release note entry. Will be rendered as a bullet point. """ self.sections.setdefault(section, ([], [])) self.sections[section][1].append(paragraphs) def titledforsection(self, section): """Returns titled entries in a section. Returns a list of (title, paragraphs) tuples describing sub-sections. """ return self.sections.get(section, ([], []))[0] def nontitledforsection(self, section): """Returns non-titled, bulleted paragraphs in a section.""" return self.sections.get(section, ([], []))[1] def hastitledinsection(self, section, title): return any(t[0] == title for t in self.titledforsection(section)) def merge(self, ui, other): """Merge another instance into this one. This is used to combine multiple sources of release notes together. """ if not fuzz: ui.warn(_("module 'fuzzywuzzy' not found, merging of similar " "releasenotes is disabled\n")) for section in other: existingnotes = converttitled(self.titledforsection(section)) + \ convertnontitled(self.nontitledforsection(section)) for title, paragraphs in other.titledforsection(section): if self.hastitledinsection(section, title): # TODO prompt for resolution if different and running in # interactive mode. ui.write(_('%s already exists in %s section; ignoring\n') % (title, section)) continue incoming_str = converttitled([(title, paragraphs)])[0] if section == 'fix': issue = getissuenum(incoming_str) if issue: if findissue(ui, existingnotes, issue): continue if similar(ui, existingnotes, incoming_str): continue self.addtitleditem(section, title, paragraphs) for paragraphs in other.nontitledforsection(section): if paragraphs in self.nontitledforsection(section): continue incoming_str = convertnontitled([paragraphs])[0] if section == 'fix': issue = getissuenum(incoming_str) if issue: if findissue(ui, existingnotes, issue): continue if similar(ui, existingnotes, incoming_str): continue self.addnontitleditem(section, paragraphs) class releasenotessections(object): def __init__(self, ui, repo=None): if repo: sections = util.sortdict(DEFAULT_SECTIONS) custom_sections = getcustomadmonitions(repo) if custom_sections: sections.update(custom_sections) self._sections = list(sections.iteritems()) else: self._sections = list(DEFAULT_SECTIONS) def __iter__(self): return iter(self._sections) def names(self): return [t[0] for t in self._sections] def sectionfromtitle(self, title): for name, value in self._sections: if value == title: return name return None def converttitled(titledparagraphs): """ Convert titled paragraphs to strings """ string_list = [] for title, paragraphs in titledparagraphs: lines = [] for para in paragraphs: lines.extend(para) string_list.append(' '.join(lines)) return string_list def convertnontitled(nontitledparagraphs): """ Convert non-titled bullets to strings """ string_list = [] for paragraphs in nontitledparagraphs: lines = [] for para in paragraphs: lines.extend(para) string_list.append(' '.join(lines)) return string_list def getissuenum(incoming_str): """ Returns issue number from the incoming string if it exists """ issue = re.search(RE_ISSUE, incoming_str, re.IGNORECASE) if issue: issue = issue.group() return issue def findissue(ui, existing, issue): """ Returns true if issue number already exists in notes. """ if any(issue in s for s in existing): ui.write(_('"%s" already exists in notes; ignoring\n') % issue) return True else: return False def similar(ui, existing, incoming_str): """ Returns true if similar note found in existing notes. """ if len(incoming_str.split()) > 10: merge = similaritycheck(incoming_str, existing) if not merge: ui.write(_('"%s" already exists in notes file; ignoring\n') % incoming_str) return True else: return False else: return False def similaritycheck(incoming_str, existingnotes): """ Returns false when note fragment can be merged to existing notes. """ # fuzzywuzzy not present if not fuzz: return True merge = True for bullet in existingnotes: score = fuzz.token_set_ratio(incoming_str, bullet) if score > 75: merge = False break return merge def getcustomadmonitions(repo): ctx = repo['.'] p = config.config() def read(f, sections=None, remap=None): if f in ctx: data = ctx[f].data() p.parse(f, data, sections, remap, read) else: raise error.Abort(_(".hgreleasenotes file \'%s\' not found") % repo.pathto(f)) if '.hgreleasenotes' in ctx: read('.hgreleasenotes') return p['sections'] def checkadmonitions(ui, repo, directives, revs): """ Checks the commit messages for admonitions and their validity. .. abcd:: First paragraph under this admonition For this commit message, using `hg releasenotes -r . --check` returns: Invalid admonition 'abcd' present in changeset 3ea92981e103 As admonition 'abcd' is neither present in default nor custom admonitions """ for rev in revs: ctx = repo[rev] admonition = re.search(RE_DIRECTIVE, ctx.description()) if admonition: if admonition.group(1) in directives: continue else: ui.write(_("Invalid admonition '%s' present in changeset %s" "\n") % (admonition.group(1), ctx.hex()[:12])) sim = lambda x: difflib.SequenceMatcher(None, admonition.group(1), x).ratio() similar = [s for s in directives if sim(s) > 0.6] if len(similar) == 1: ui.write(_("(did you mean %s?)\n") % similar[0]) elif similar: ss = ", ".join(sorted(similar)) ui.write(_("(did you mean one of %s?)\n") % ss) def _getadmonitionlist(ui, sections): for section in sections: ui.write("%s: %s\n" % (section[0], section[1])) def parsenotesfromrevisions(repo, directives, revs): notes = parsedreleasenotes() for rev in revs: ctx = repo[rev] blocks, pruned = minirst.parse(ctx.description(), admonitions=directives) for i, block in enumerate(blocks): if block['type'] != 'admonition': continue directive = block['admonitiontitle'] title = block['lines'][0].strip() if block['lines'] else None if i + 1 == len(blocks): raise error.Abort(_('changeset %s: release notes directive %s ' 'lacks content') % (ctx, directive)) # Now search ahead and find all paragraphs attached to this # admonition. paragraphs = [] for j in range(i + 1, len(blocks)): pblock = blocks[j] # Margin blocks may appear between paragraphs. Ignore them. if pblock['type'] == 'margin': continue if pblock['type'] == 'admonition': break if pblock['type'] != 'paragraph': repo.ui.warn(_('changeset %s: unexpected block in release ' 'notes directive %s\n') % (ctx, directive)) if pblock['indent'] > 0: paragraphs.append(pblock['lines']) else: break # TODO consider using title as paragraph for more concise notes. if not paragraphs: repo.ui.warn(_("error parsing releasenotes for revision: " "'%s'\n") % node.hex(ctx.node())) if title: notes.addtitleditem(directive, title, paragraphs) else: notes.addnontitleditem(directive, paragraphs) return notes def parsereleasenotesfile(sections, text): """Parse text content containing generated release notes.""" notes = parsedreleasenotes() blocks = minirst.parse(text)[0] def gatherparagraphsbullets(offset, title=False): notefragment = [] for i in range(offset + 1, len(blocks)): block = blocks[i] if block['type'] == 'margin': continue elif block['type'] == 'section': break elif block['type'] == 'bullet': if block['indent'] != 0: raise error.Abort(_('indented bullet lists not supported')) if title: lines = [l[1:].strip() for l in block['lines']] notefragment.append(lines) continue else: lines = [[l[1:].strip() for l in block['lines']]] for block in blocks[i + 1:]: if block['type'] in ('bullet', 'section'): break if block['type'] == 'paragraph': lines.append(block['lines']) notefragment.append(lines) continue elif block['type'] != 'paragraph': raise error.Abort(_('unexpected block type in release notes: ' '%s') % block['type']) if title: notefragment.append(block['lines']) return notefragment currentsection = None for i, block in enumerate(blocks): if block['type'] != 'section': continue title = block['lines'][0] # TODO the parsing around paragraphs and bullet points needs some # work. if block['underline'] == '=': # main section name = sections.sectionfromtitle(title) if not name: raise error.Abort(_('unknown release notes section: %s') % title) currentsection = name bullet_points = gatherparagraphsbullets(i) if bullet_points: for para in bullet_points: notes.addnontitleditem(currentsection, para) elif block['underline'] == '-': # sub-section if title == BULLET_SECTION: bullet_points = gatherparagraphsbullets(i) for para in bullet_points: notes.addnontitleditem(currentsection, para) else: paragraphs = gatherparagraphsbullets(i, True) notes.addtitleditem(currentsection, title, paragraphs) else: raise error.Abort(_('unsupported section type for %s') % title) return notes def serializenotes(sections, notes): """Serialize release notes from parsed fragments and notes. This function essentially takes the output of ``parsenotesfromrevisions()`` and ``parserelnotesfile()`` and produces output combining the 2. """ lines = [] for sectionname, sectiontitle in sections: if sectionname not in notes: continue lines.append(sectiontitle) lines.append('=' * len(sectiontitle)) lines.append('') # First pass to emit sub-sections. for title, paragraphs in notes.titledforsection(sectionname): lines.append(title) lines.append('-' * len(title)) lines.append('') wrapper = textwrap.TextWrapper(width=78) for i, para in enumerate(paragraphs): if i: lines.append('') lines.extend(wrapper.wrap(' '.join(para))) lines.append('') # Second pass to emit bullet list items. # If the section has titled and non-titled items, we can't # simply emit the bullet list because it would appear to come # from the last title/section. So, we emit a new sub-section # for the non-titled items. nontitled = notes.nontitledforsection(sectionname) if notes.titledforsection(sectionname) and nontitled: # TODO make configurable. lines.append(BULLET_SECTION) lines.append('-' * len(BULLET_SECTION)) lines.append('') for paragraphs in nontitled: wrapper = textwrap.TextWrapper(initial_indent='* ', subsequent_indent=' ', width=78) lines.extend(wrapper.wrap(' '.join(paragraphs[0]))) wrapper = textwrap.TextWrapper(initial_indent=' ', subsequent_indent=' ', width=78) for para in paragraphs[1:]: lines.append('') lines.extend(wrapper.wrap(' '.join(para))) lines.append('') if lines and lines[-1]: lines.append('') return '\n'.join(lines) @command('releasenotes', [('r', 'rev', '', _('revisions to process for release notes'), _('REV')), ('c', 'check', False, _('checks for validity of admonitions (if any)'), _('REV')), ('l', 'list', False, _('list the available admonitions with their title'), None)], _('hg releasenotes [-r REV] [-c] FILE')) def releasenotes(ui, repo, file_=None, **opts): """parse release notes from commit messages into an output file Given an output file and set of revisions, this command will parse commit messages for release notes then add them to the output file. Release notes are defined in commit messages as ReStructuredText directives. These have the form:: .. directive:: title content Each ``directive`` maps to an output section in a generated release notes file, which itself is ReStructuredText. For example, the ``.. feature::`` directive would map to a ``New Features`` section. Release note directives can be either short-form or long-form. In short- form, ``title`` is omitted and the release note is rendered as a bullet list. In long form, a sub-section with the title ``title`` is added to the section. The ``FILE`` argument controls the output file to write gathered release notes to. The format of the file is:: Section 1 ========= ... Section 2 ========= ... Only sections with defined release notes are emitted. If a section only has short-form notes, it will consist of bullet list:: Section ======= * Release note 1 * Release note 2 If a section has long-form notes, sub-sections will be emitted:: Section ======= Note 1 Title ------------ Description of the first long-form note. Note 2 Title ------------ Description of the second long-form note. If the ``FILE`` argument points to an existing file, that file will be parsed for release notes having the format that would be generated by this command. The notes from the processed commit messages will be *merged* into this parsed set. During release notes merging: * Duplicate items are automatically ignored * Items that are different are automatically ignored if the similarity is greater than a threshold. This means that the release notes file can be updated independently from this command and changes should not be lost when running this command on that file. A particular use case for this is to tweak the wording of a release note after it has been added to the release notes file. The -c/--check option checks the commit message for invalid admonitions. The -l/--list option, presents the user with a list of existing available admonitions along with their title. This also includes the custom admonitions (if any). """ opts = pycompat.byteskwargs(opts) sections = releasenotessections(ui, repo) listflag = opts.get('list') if listflag and opts.get('rev'): raise error.Abort(_('cannot use both \'--list\' and \'--rev\'')) if listflag and opts.get('check'): raise error.Abort(_('cannot use both \'--list\' and \'--check\'')) if listflag: return _getadmonitionlist(ui, sections) rev = opts.get('rev') revs = scmutil.revrange(repo, [rev or 'not public()']) if opts.get('check'): return checkadmonitions(ui, repo, sections.names(), revs) incoming = parsenotesfromrevisions(repo, sections.names(), revs) if file_ is None: ui.pager('releasenotes') return ui.write(serializenotes(sections, incoming)) try: with open(file_, 'rb') as fh: notes = parsereleasenotesfile(sections, fh.read()) except IOError as e: if e.errno != errno.ENOENT: raise notes = parsedreleasenotes() notes.merge(ui, incoming) with open(file_, 'wb') as fh: fh.write(serializenotes(sections, notes)) @command('debugparsereleasenotes', norepo=True) def debugparsereleasenotes(ui, path, repo=None): """parse release notes and print resulting data structure""" if path == '-': text = sys.stdin.read() else: with open(path, 'rb') as fh: text = fh.read() sections = releasenotessections(ui, repo) notes = parsereleasenotesfile(sections, text) for section in notes: ui.write(_('section: %s\n') % section) for title, paragraphs in notes.titledforsection(section): ui.write(_(' subsection: %s\n') % title) for para in paragraphs: ui.write(_(' paragraph: %s\n') % ' '.join(para)) for paragraphs in notes.nontitledforsection(section): ui.write(_(' bullet point:\n')) for para in paragraphs: ui.write(_(' paragraph: %s\n') % ' '.join(para))