Mercurial > evolve
view docs/test2rst.py @ 5979:4a09e95d29c9 stable
rewriteutil: fix broken touch of merge commits (issue6416)
`rewriteutil.rewrite()` is for rewriting a linear chain of commits
into a single commit, i.e. what `hg fold` does. Many of the callers
passed in a single commit because they wanted to rewrite just a single
commit (e.g. `hg touch`). Before this patch, the code worked by going
through the commits to fold and adding up all the modified files in
them, then building a `memctx` based on that. As reported in
issue6416, that can lose changes in merge commits. We could probably
fix that without changing the existing code too much, but it seems the
easiest way is to rewrite the code so it instead creates the new
commit by effectively checking out the base and then revert to the
head of the chain, so that's what this patch does. It does so by using
in-memory merge.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 05 Oct 2020 08:35:17 -0700 |
parents | 1d80cda7fe93 |
children |
line wrap: on
line source
#!/usr/bin/env python3 import argparse import os import re ignored_patterns = [ re.compile(r'^#if'), re.compile(r'^#else'), re.compile(r'^#endif'), re.compile(r'#rest-ignore$'), ] def rstify(orig): """Take contents of a .t file and produce reStructuredText""" newlines = [] code_block_mode = False sphinx_directive_mode = False for line in orig.splitlines(): # Empty lines doesn't change output if not line: newlines.append(line) code_block_mode = False sphinx_directive_mode = False continue ignored = False for pattern in ignored_patterns: if pattern.search(line): ignored = True break if ignored: continue # Sphinx directives mode if line.startswith(' .. '): # Insert a empty line to makes sphinx happy newlines.append("") # And unindent the directive line = line[2:] sphinx_directive_mode = True # Code mode codeline = line.startswith(' ') if codeline and not sphinx_directive_mode: if code_block_mode is False: newlines.extend(['::', '']) code_block_mode = True newlines.append(line) return "\n".join(newlines) def main(): ap = argparse.ArgumentParser() ap.add_argument('testfile', help='.t file to transform') opts = ap.parse_args() with open(opts.testfile) as f: content = f.read() rst = rstify(content) target = os.path.splitext(opts.testfile)[0] + '.rst' with open(target, 'w') as f: f.write(rst) if __name__ == '__main__': main()