minirst: simplify and standardize field list formatting

The default width of field lists is changed from 12 to 14 to align minirst with
the rst2html tool. Shrinking the width of the left column to fit the content is
removed, to keep formatting simple and uniform.

mercurial/minirst.py

@@ -1,687 +1,677 b''
 # minirst.py - minimal reStructuredText parser
 #
 # Copyright 2009, 2010 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 """simplified reStructuredText parser.
 
 This parser knows just enough about reStructuredText to parse the
 Mercurial docstrings.
 
 It cheats in a major way: nested blocks are not really nested. They
 are just indented blocks that look like they are nested. This relies
 on the user to keep the right indentation for the blocks.
 
 Remember to update http://mercurial.selenic.com/wiki/HelpStyleGuide
 when adding support for new constructs.
 """
 
 import re
 import util, encoding
 from i18n import _
 
 def replace(text, substs):
     '''
     Apply a list of (find, replace) pairs to a text.
 
     >>> replace("foo bar", [('f', 'F'), ('b', 'B')])
     'Foo Bar'
     >>> encoding.encoding = 'latin1'
     >>> replace('\\x81\\\\', [('\\\\', '/')])
     '\\x81/'
     >>> encoding.encoding = 'shiftjis'
     >>> replace('\\x81\\\\', [('\\\\', '/')])
     '\\x81\\\\'
     '''
 
     # some character encodings (cp932 for Japanese, at least) use
     # ASCII characters other than control/alphabet/digit as a part of
     # multi-bytes characters, so direct replacing with such characters
     # on strings in local encoding causes invalid byte sequences.
     utext = text.decode(encoding.encoding)
     for f, t in substs:
         utext = utext.replace(f, t)
     return utext.encode(encoding.encoding)
 
 _blockre = re.compile(r"\n(?:\s*\n)+")
 
 def findblocks(text):
     """Find continuous blocks of lines in text.
 
     Returns a list of dictionaries representing the blocks. Each block
     has an 'indent' field and a 'lines' field.
     """
     blocks = []
     for b in _blockre.split(text.lstrip('\n').rstrip()):
         lines = b.splitlines()
         if lines:
             indent = min((len(l) - len(l.lstrip())) for l in lines)
             lines = [l[indent:] for l in lines]
             blocks.append(dict(indent=indent, lines=lines))
     return blocks
 
 def findliteralblocks(blocks):
     """Finds literal blocks and adds a 'type' field to the blocks.
 
     Literal blocks are given the type 'literal', all other blocks are
     given type the 'paragraph'.
     """
     i = 0
     while i < len(blocks):
         # Searching for a block that looks like this:
         #
         # +------------------------------+
         # | paragraph                    |
         # | (ends with "::")             |
         # +------------------------------+
         #    +---------------------------+
         #    | indented literal block    |
         #    +---------------------------+
         blocks[i]['type'] = 'paragraph'
         if blocks[i]['lines'][-1].endswith('::') and i + 1 < len(blocks):
             indent = blocks[i]['indent']
             adjustment = blocks[i + 1]['indent'] - indent
 
             if blocks[i]['lines'] == ['::']:
                 # Expanded form: remove block
                 del blocks[i]
                 i -= 1
             elif blocks[i]['lines'][-1].endswith(' ::'):
                 # Partially minimized form: remove space and both
                 # colons.
                 blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-3]
             else:
                 # Fully minimized form: remove just one colon.
                 blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-1]
 
             # List items are formatted with a hanging indent. We must
             # correct for this here while we still have the original
             # information on the indentation of the subsequent literal
             # blocks available.
             m = _bulletre.match(blocks[i]['lines'][0])
             if m:
                 indent += m.end()
                 adjustment -= m.end()
 
             # Mark the following indented blocks.
             while i + 1 < len(blocks) and blocks[i + 1]['indent'] > indent:
                 blocks[i + 1]['type'] = 'literal'
                 blocks[i + 1]['indent'] -= adjustment
                 i += 1
         i += 1
     return blocks
 
 _bulletre = re.compile(r'(-|[0-9A-Za-z]+\.|\(?[0-9A-Za-z]+\)|\|) ')
 _optionre = re.compile(r'^(-([a-zA-Z0-9]), )?(--[a-z0-9-]+)'
                        r'((.*)  +)(.*)$')
 _fieldre = re.compile(r':(?![: ])([^:]*)(?<! ):[ ]+(.*)')
 _definitionre = re.compile(r'[^ ]')
 _tablere = re.compile(r'(=+\s+)*=+')
 
 def splitparagraphs(blocks):
     """Split paragraphs into lists."""
     # Tuples with (list type, item regexp, single line items?). Order
     # matters: definition lists has the least specific regexp and must
     # come last.
     listtypes = [('bullet', _bulletre, True),
                  ('option', _optionre, True),
                  ('field', _fieldre, True),
                  ('definition', _definitionre, False)]
 
     def match(lines, i, itemre, singleline):
         """Does itemre match an item at line i?
 
         A list item can be followed by an idented line or another list
         item (but only if singleline is True).
         """
         line1 = lines[i]
         line2 = i + 1 < len(lines) and lines[i + 1] or ''
         if not itemre.match(line1):
             return False
         if singleline:
             return line2 == '' or line2[0] == ' ' or itemre.match(line2)
         else:
             return line2.startswith(' ')
 
     i = 0
     while i < len(blocks):
         if blocks[i]['type'] == 'paragraph':
             lines = blocks[i]['lines']
             for type, itemre, singleline in listtypes:
                 if match(lines, 0, itemre, singleline):
                     items = []
                     for j, line in enumerate(lines):
                         if match(lines, j, itemre, singleline):
                             items.append(dict(type=type, lines=[],
                                               indent=blocks[i]['indent']))
                         items[-1]['lines'].append(line)
                     blocks[i:i + 1] = items
                     break
         i += 1
     return blocks
 
-_fieldwidth = 12
+_fieldwidth = 14
 
 def updatefieldlists(blocks):
-    """Find key and maximum key width for field lists."""
+    """Find key for field lists."""
     i = 0
     while i < len(blocks):
         if blocks[i]['type'] != 'field':
             i += 1
             continue
 
-        keywidth = 0
         j = i
         while j < len(blocks) and blocks[j]['type'] == 'field':
             m = _fieldre.match(blocks[j]['lines'][0])
             key, rest = m.groups()
             blocks[j]['lines'][0] = rest
             blocks[j]['key'] = key
-            keywidth = max(keywidth, len(key))
             j += 1
 
-        for block in blocks[i:j]:
-            block['keywidth'] = keywidth
         i = j + 1
 
     return blocks
 
 def updateoptionlists(blocks):
     i = 0
     while i < len(blocks):
         if blocks[i]['type'] != 'option':
             i += 1
             continue
 
         optstrwidth = 0
         j = i
         while j < len(blocks) and blocks[j]['type'] == 'option':
             m = _optionre.match(blocks[j]['lines'][0])
 
             shortoption = m.group(2)
             group3 = m.group(3)
             longoption = group3[2:].strip()
             desc = m.group(6).strip()
             longoptionarg = m.group(5).strip()
             blocks[j]['lines'][0] = desc
 
             noshortop = ''
             if not shortoption:
                 noshortop = '   '
 
             opt = "%s%s" %   (shortoption and "-%s " % shortoption or '',
                             ("%s--%s %s") % (noshortop, longoption,
                                              longoptionarg))
             opt = opt.rstrip()
             blocks[j]['optstr'] = opt
             optstrwidth = max(optstrwidth, encoding.colwidth(opt))
             j += 1
 
         for block in blocks[i:j]:
             block['optstrwidth'] = optstrwidth
         i = j + 1
     return blocks
 
 def prunecontainers(blocks, keep):
     """Prune unwanted containers.
 
     The blocks must have a 'type' field, i.e., they should have been
     run through findliteralblocks first.
     """
     pruned = []
     i = 0
     while i + 1 < len(blocks):
         # Searching for a block that looks like this:
         #
         # +-------+---------------------------+
         # | ".. container ::" type            |
         # +---+                               |
         #     | blocks                        |
         #     +-------------------------------+
         if (blocks[i]['type'] == 'paragraph' and
             blocks[i]['lines'][0].startswith('.. container::')):
             indent = blocks[i]['indent']
             adjustment = blocks[i + 1]['indent'] - indent
             containertype = blocks[i]['lines'][0][15:]
             prune = containertype not in keep
             if prune:
                 pruned.append(containertype)
 
             # Always delete "..container:: type" block
             del blocks[i]
             j = i
             i -= 1
             while j < len(blocks) and blocks[j]['indent'] > indent:
                 if prune:
                     del blocks[j]
                 else:
                     blocks[j]['indent'] -= adjustment
                     j += 1
         i += 1
     return blocks, pruned
 
 _sectionre = re.compile(r"""^([-=`:.'"~^_*+#])\1+$""")
 
 def findtables(blocks):
     '''Find simple tables
 
        Only simple one-line table elements are supported
     '''
 
     for block in blocks:
         # Searching for a block that looks like this:
         #
         # === ==== ===
         #  A    B   C
         # === ==== ===  <- optional
         #  1    2   3
         #  x    y   z
         # === ==== ===
         if (block['type'] == 'paragraph' and
             len(block['lines']) > 2 and
             _tablere.match(block['lines'][0]) and
             block['lines'][0] == block['lines'][-1]):
             block['type'] = 'table'
             block['header'] = False
             div = block['lines'][0]
 
             # column markers are ASCII so we can calculate column
             # position in bytes
             columns = [x for x in xrange(len(div))
                        if div[x] == '=' and (x == 0 or div[x - 1] == ' ')]
             rows = []
             for l in block['lines'][1:-1]:
                 if l == div:
                     block['header'] = True
                     continue
                 row = []
                 # we measure columns not in bytes or characters but in
                 # colwidth which makes things tricky
                 pos = columns[0] # leading whitespace is bytes
                 for n, start in enumerate(columns):
                     if n + 1 < len(columns):
                         width = columns[n + 1] - start
                         v = encoding.getcols(l, pos, width) # gather columns
                         pos += len(v) # calculate byte position of end
                         row.append(v.strip())
                     else:
                         row.append(l[pos:].strip())
                 rows.append(row)
 
             block['table'] = rows
 
     return blocks
 
 def findsections(blocks):
     """Finds sections.
 
     The blocks must have a 'type' field, i.e., they should have been
     run through findliteralblocks first.
     """
     for block in blocks:
         # Searching for a block that looks like this:
         #
         # +------------------------------+
         # | Section title                |
         # | -------------                |
         # +------------------------------+
         if (block['type'] == 'paragraph' and
             len(block['lines']) == 2 and
             encoding.colwidth(block['lines'][0]) == len(block['lines'][1]) and
             _sectionre.match(block['lines'][1])):
             block['underline'] = block['lines'][1][0]
             block['type'] = 'section'
             del block['lines'][1]
     return blocks
 
 def inlineliterals(blocks):
     substs = [('``', '"')]
     for b in blocks:
         if b['type'] in ('paragraph', 'section'):
             b['lines'] = [replace(l, substs) for l in b['lines']]
     return blocks
 
 def hgrole(blocks):
     substs = [(':hg:`', '"hg '), ('`', '"')]
     for b in blocks:
         if b['type'] in ('paragraph', 'section'):
             # Turn :hg:`command` into "hg command". This also works
             # when there is a line break in the command and relies on
             # the fact that we have no stray back-quotes in the input
             # (run the blocks through inlineliterals first).
             b['lines'] = [replace(l, substs) for l in b['lines']]
     return blocks
 
 def addmargins(blocks):
     """Adds empty blocks for vertical spacing.
 
     This groups bullets, options, and definitions together with no vertical
     space between them, and adds an empty block between all other blocks.
     """
     i = 1
     while i < len(blocks):
         if (blocks[i]['type'] == blocks[i - 1]['type'] and
             blocks[i]['type'] in ('bullet', 'option', 'field')):
             i += 1
         else:
             blocks.insert(i, dict(lines=[''], indent=0, type='margin'))
             i += 2
     return blocks
 
 def prunecomments(blocks):
     """Remove comments."""
     i = 0
     while i < len(blocks):
         b = blocks[i]
         if b['type'] == 'paragraph' and (b['lines'][0].startswith('.. ') or
                                          b['lines'] == ['..']):
             del blocks[i]
             if i < len(blocks) and blocks[i]['type'] == 'margin':
                 del blocks[i]
         else:
             i += 1
     return blocks
 
 _admonitionre = re.compile(r"\.\. (admonition|attention|caution|danger|"
                            r"error|hint|important|note|tip|warning)::",
                            flags=re.IGNORECASE)
 
 def findadmonitions(blocks):
     """
     Makes the type of the block an admonition block if
     the first line is an admonition directive
     """
     i = 0
     while i < len(blocks):
         m = _admonitionre.match(blocks[i]['lines'][0])
         if m:
             blocks[i]['type'] = 'admonition'
             admonitiontitle = blocks[i]['lines'][0][3:m.end() - 2].lower()
 
             firstline = blocks[i]['lines'][0][m.end() + 1:]
             if firstline:
                 blocks[i]['lines'].insert(1, '   ' + firstline)
 
             blocks[i]['admonitiontitle'] = admonitiontitle
             del blocks[i]['lines'][0]
         i = i + 1
     return blocks
 
 _admonitiontitles = {'attention': _('Attention:'),
                      'caution': _('Caution:'),
                      'danger': _('!Danger!')  ,
                      'error': _('Error:'),
                      'hint': _('Hint:'),
                      'important': _('Important:'),
                      'note': _('Note:'),
                      'tip': _('Tip:'),
                      'warning': _('Warning!')}
 
 def formatoption(block, width):
     desc = ' '.join(map(str.strip, block['lines']))
     colwidth = encoding.colwidth(block['optstr'])
     usablewidth = width - 1
     hanging = block['optstrwidth']
     initindent = '%s%s  ' % (block['optstr'], ' ' * ((hanging - colwidth)))
     hangindent = ' ' * (encoding.colwidth(initindent) + 1)
     return ' %s\n' % (util.wrap(desc, usablewidth,
                                            initindent=initindent,
                                            hangindent=hangindent))
 
 def formatblock(block, width):
     """Format a block according to width."""
     if width <= 0:
         width = 78
     indent = ' ' * block['indent']
     if block['type'] == 'admonition':
         admonition = _admonitiontitles[block['admonitiontitle']]
         hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
 
         defindent = indent + hang * ' '
         text = ' '.join(map(str.strip, block['lines']))
         return '%s\n%s\n' % (indent + admonition,
                              util.wrap(text, width=width,
                                        initindent=defindent,
                                        hangindent=defindent))
     if block['type'] == 'margin':
         return '\n'
     if block['type'] == 'literal':
         indent += '  '
         return indent + ('\n' + indent).join(block['lines']) + '\n'
     if block['type'] == 'section':
         underline = encoding.colwidth(block['lines'][0]) * block['underline']
         return "%s%s\n%s%s\n" % (indent, block['lines'][0],indent, underline)
     if block['type'] == 'table':
         table = block['table']
         # compute column widths
         widths = [max([encoding.colwidth(e) for e in c]) for c in zip(*table)]
         text = ''
         span = sum(widths) + len(widths) - 1
         indent = ' ' * block['indent']
         hang = ' ' * (len(indent) + span - widths[-1])
 
         for row in table:
             l = []
             for w, v in zip(widths, row):
                 pad = ' ' * (w - encoding.colwidth(v))
                 l.append(v + pad)
             l = ' '.join(l)
             l = util.wrap(l, width=width, initindent=indent, hangindent=hang)
             if not text and block['header']:
                 text = l + '\n' + indent + '-' * (min(width, span)) + '\n'
             else:
                 text += l + "\n"
         return text
     if block['type'] == 'definition':
         term = indent + block['lines'][0]
         hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
         defindent = indent + hang * ' '
         text = ' '.join(map(str.strip, block['lines'][1:]))
         return '%s\n%s\n' % (term, util.wrap(text, width=width,
                                              initindent=defindent,
                                              hangindent=defindent))
     subindent = indent
     if block['type'] == 'bullet':
         if block['lines'][0].startswith('| '):
             # Remove bullet for line blocks and add no extra
             # indention.
             block['lines'][0] = block['lines'][0][2:]
         else:
             m = _bulletre.match(block['lines'][0])
             subindent = indent + m.end() * ' '
     elif block['type'] == 'field':
-        keywidth = block['keywidth']
         key = block['key']
-
         subindent = indent + _fieldwidth * ' '
         if len(key) + 2 > _fieldwidth:
             # key too large, use full line width
             key = key.ljust(width)
-        elif keywidth + 2 < _fieldwidth:
-            # all keys are small, add only two spaces
-            key = key.ljust(keywidth + 2)
-            subindent = indent + (keywidth + 2) * ' '
         else:
-            # mixed sizes, use fieldwidth for this one
+            # key fits within field width
             key = key.ljust(_fieldwidth)
         block['lines'][0] = key + block['lines'][0]
     elif block['type'] == 'option':
         return formatoption(block, width)
 
     text = ' '.join(map(str.strip, block['lines']))
     return util.wrap(text, width=width,
                      initindent=indent,
                      hangindent=subindent) + '\n'
 
 def formathtml(blocks):
     """Format RST blocks as HTML"""
 
     out = []
     headernest = ''
     listnest = []
 
     def openlist(start, level):
         if not listnest or listnest[-1][0] != start:
             listnest.append((start, level))
             out.append('<%s>\n' % start)
 
     blocks = [b for b in blocks if b['type'] != 'margin']
 
     for pos, b in enumerate(blocks):
         btype = b['type']
         level = b['indent']
         lines = b['lines']
 
         if btype == 'admonition':
             admonition = _admonitiontitles[b['admonitiontitle']]
             text = ' '.join(map(str.strip, lines))
             out.append('<p>\n<b>%s</b> %s\n</p>\n' % (admonition, text))
         elif btype == 'paragraph':
             out.append('<p>\n%s\n</p>\n' % '\n'.join(lines))
         elif btype == 'margin':
             pass
         elif btype == 'literal':
             out.append('<pre>\n%s\n</pre>\n' % '\n'.join(lines))
         elif btype == 'section':
             i = b['underline']
             if i not in headernest:
                 headernest += i
             level = headernest.index(i) + 1
             out.append('<h%d>%s</h%d>\n' % (level, lines[0], level))
         elif btype == 'table':
             table = b['table']
             t = []
             for row in table:
                 l = []
                 for v in zip(row):
                     if not t:
                         l.append('<th>%s</th>' % v)
                     else:
                         l.append('<td>%s</td>' % v)
                 t.append(' <tr>%s</tr>\n' % ''.join(l))
             out.append('<table>\n%s</table>\n' % ''.join(t))
         elif btype == 'definition':
             openlist('dl', level)
             term = lines[0]
             text = ' '.join(map(str.strip, lines[1:]))
             out.append(' <dt>%s\n <dd>%s\n' % (term, text))
         elif btype == 'bullet':
             bullet, head = lines[0].split(' ', 1)
             if bullet == '-':
                 openlist('ul', level)
             else:
                 openlist('ol', level)
             out.append(' <li> %s\n' % ' '.join([head] + lines[1:]))
         elif btype == 'field':
             openlist('dl', level)
             key = b['key']
             text = ' '.join(map(str.strip, lines))
             out.append(' <dt>%s\n <dd>%s\n' % (key, text))
         elif btype == 'option':
             openlist('dl', level)
             opt = b['optstr']
             desc = ' '.join(map(str.strip, lines))
             out.append(' <dt>%s\n <dd>%s\n' % (opt, desc))
 
         # close lists if indent level of next block is lower
         if listnest:
             start, level = listnest[-1]
             if pos == len(blocks) - 1:
                 out.append('</%s>\n' % start)
                 listnest.pop()
             else:
                 nb = blocks[pos + 1]
                 ni = nb['indent']
                 if (ni < level or
                     (ni == level and
                      nb['type'] not in 'definition bullet field option')):
                     out.append('</%s>\n' % start)
                     listnest.pop()
 
     return ''.join(out)
 
 def parse(text, indent=0, keep=None):
     """Parse text into a list of blocks"""
     pruned = []
     blocks = findblocks(text)
     for b in blocks:
         b['indent'] += indent
     blocks = findliteralblocks(blocks)
     blocks = findtables(blocks)
     blocks, pruned = prunecontainers(blocks, keep or [])
     blocks = findsections(blocks)
     blocks = inlineliterals(blocks)
     blocks = hgrole(blocks)
     blocks = splitparagraphs(blocks)
     blocks = updatefieldlists(blocks)
     blocks = updateoptionlists(blocks)
     blocks = addmargins(blocks)
     blocks = prunecomments(blocks)
     blocks = findadmonitions(blocks)
     return blocks, pruned
 
 def formatblocks(blocks, width):
     text = ''.join(formatblock(b, width) for b in blocks)
     return text
 
 def format(text, width=80, indent=0, keep=None, style='plain'):
     """Parse and format the text according to width."""
     blocks, pruned = parse(text, indent, keep or [])
     if style == 'html':
         text = formathtml(blocks)
     else:
         text = ''.join(formatblock(b, width) for b in blocks)
     if keep is None:
         return text
     else:
         return text, pruned
 
 def getsections(blocks):
     '''return a list of (section name, nesting level, blocks) tuples'''
     nest = ""
     level = 0
     secs = []
     for b in blocks:
         if b['type'] == 'section':
             i = b['underline']
             if i not in nest:
                 nest += i
             level = nest.index(i) + 1
             nest = nest[:level]
             secs.append((b['lines'][0], level, [b]))
         else:
             if not secs:
                 # add an initial empty section
                 secs = [('', 0, [])]
             secs[-1][2].append(b)
     return secs
 
 def decorateblocks(blocks, width):
     '''generate a list of (section name, line text) pairs for search'''
     lines = []
     for s in getsections(blocks):
         section = s[0]
         text = formatblocks(s[2], width)
         lines.append([(section, l) for l in text.splitlines(True)])
     return lines
 
 def maketable(data, indent=0, header=False):
     '''Generate an RST table for the given table data'''
 
     widths = [max(encoding.colwidth(e) for e in c) for c in zip(*data)]
     indent = ' ' * indent
     div = indent + ' '.join('=' * w for w in widths) + '\n'
 
     out = [div]
     for row in data:
         l = []
         for w, v in zip(widths, row):
             pad = ' ' * (w - encoding.colwidth(v))
             l.append(v + pad)
         out.append(indent + ' '.join(l) + "\n")
     if header and len(data) > 1:
         out.insert(2, div)
     out.append(div)
     return ''.join(out)

tests/test-convert.t

@@ -1,393 +1,395 b''
   $ "$TESTDIR/hghave" unix-permissions || exit 80
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert=
   > [convert]
   > hg.saverev=False
   > EOF
   $ hg help convert
   hg convert [OPTION]... SOURCE [DEST [REVMAP]]
   
   convert a foreign SCM repository to a Mercurial one.
   
       Accepted source formats [identifiers]:
   
       - Mercurial [hg]
       - CVS [cvs]
       - Darcs [darcs]
       - git [git]
       - Subversion [svn]
       - Monotone [mtn]
       - GNU Arch [gnuarch]
       - Bazaar [bzr]
       - Perforce [p4]
   
       Accepted destination formats [identifiers]:
   
       - Mercurial [hg]
       - Subversion [svn] (history on branches is not preserved)
   
       If no revision is given, all revisions will be converted. Otherwise,
       convert will only import up to the named revision (given in a format
       understood by the source).
   
       If no destination directory name is specified, it defaults to the basename
       of the source with "-hg" appended. If the destination repository doesn't
       exist, it will be created.
   
       By default, all sources except Mercurial will use --branchsort. Mercurial
       uses --sourcesort to preserve original revision numbers order. Sort modes
       have the following effects:
   
       --branchsort  convert from parent to child revision when possible, which
                     means branches are usually converted one after the other.
                     It generates more compact repositories.
       --datesort    sort revisions by date. Converted repositories have good-
                     looking changelogs but are often an order of magnitude
                     larger than the same ones generated by --branchsort.
       --sourcesort  try to preserve source revisions order, only supported by
                     Mercurial sources.
   
       If "REVMAP" isn't given, it will be put in a default location
       ("<dest>/.hg/shamap" by default). The "REVMAP" is a simple text file that
       maps each source commit ID to the destination ID for that revision, like
       so:
   
         <source ID> <destination ID>
   
       If the file doesn't exist, it's automatically created. It's updated on
       each commit copied, so "hg convert" can be interrupted and can be run
       repeatedly to copy new commits.
   
       The authormap is a simple text file that maps each source commit author to
       a destination commit author. It is handy for source SCMs that use unix
       logins to identify authors (eg: CVS). One line per author mapping and the
       line format is:
   
         source author = destination author
   
       Empty lines and lines starting with a "#" are ignored.
   
       The filemap is a file that allows filtering and remapping of files and
       directories. Each line can contain one of the following directives:
   
         include path/to/file-or-dir
   
         exclude path/to/file-or-dir
   
         rename path/to/source path/to/destination
   
       Comment lines start with "#". A specified path matches if it equals the
       full relative name of a file or one of its parent directories. The
       "include" or "exclude" directive with the longest matching path applies,
       so line order does not matter.
   
       The "include" directive causes a file, or all files under a directory, to
       be included in the destination repository, and the exclusion of all other
       files and directories not explicitly included. The "exclude" directive
       causes files or directories to be omitted. The "rename" directive renames
       a file or directory if it is converted. To rename from a subdirectory into
       the root of the repository, use "." as the path to rename to.
   
       The splicemap is a file that allows insertion of synthetic history,
       letting you specify the parents of a revision. This is useful if you want
       to e.g. give a Subversion merge two parents, or graft two disconnected
       series of history together. Each entry contains a key, followed by a
       space, followed by one or two comma-separated values:
   
         key parent1, parent2
   
       The key is the revision ID in the source revision control system whose
       parents should be modified (same format as a key in .hg/shamap). The
       values are the revision IDs (in either the source or destination revision
       control system) that should be used as the new parents for that node. For
       example, if you have merged "release-1.0" into "trunk", then you should
       specify the revision on "trunk" as the first parent and the one on the
       "release-1.0" branch as the second.
   
       The branchmap is a file that allows you to rename a branch when it is
       being brought in from whatever external repository. When used in
       conjunction with a splicemap, it allows for a powerful combination to help
       fix even the most badly mismanaged repositories and turn them into nicely
       structured Mercurial repositories. The branchmap contains lines of the
       form:
   
         original_branch_name new_branch_name
   
       where "original_branch_name" is the name of the branch in the source
       repository, and "new_branch_name" is the name of the branch is the
       destination repository. No whitespace is allowed in the branch names. This
       can be used to (for instance) move code in one repository from "default"
       to a named branch.
   
       Mercurial Source
       ''''''''''''''''
   
       The Mercurial source recognizes the following configuration options, which
       you can set on the command line with "--config":
   
       convert.hg.ignoreerrors
-                  ignore integrity errors when reading. Use it to fix Mercurial
-                  repositories with missing revlogs, by converting from and to
-                  Mercurial. Default is False.
+                    ignore integrity errors when reading. Use it to fix
+                    Mercurial repositories with missing revlogs, by converting
+                    from and to Mercurial. Default is False.
       convert.hg.saverev
-                  store original revision ID in changeset (forces target IDs to
-                  change). It takes a boolean argument and defaults to False.
+                    store original revision ID in changeset (forces target IDs
+                    to change). It takes a boolean argument and defaults to
+                    False.
       convert.hg.startrev
-                  convert start revision and its descendants. It takes a hg
-                  revision identifier and defaults to 0.
+                    convert start revision and its descendants. It takes a hg
+                    revision identifier and defaults to 0.
   
       CVS Source
       ''''''''''
   
       CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
       indicate the starting point of what will be converted. Direct access to
       the repository files is not needed, unless of course the repository is
       ":local:". The conversion uses the top level directory in the sandbox to
       find the CVS repository, and then uses CVS rlog commands to find files to
       convert. This means that unless a filemap is given, all files under the
       starting directory will be converted, and that any directory
       reorganization in the CVS sandbox is ignored.
   
       The following options can be used with "--config":
   
       convert.cvsps.cache
-                  Set to False to disable remote log caching, for testing and
-                  debugging purposes. Default is True.
+                    Set to False to disable remote log caching, for testing and
+                    debugging purposes. Default is True.
       convert.cvsps.fuzz
-                  Specify the maximum time (in seconds) that is allowed between
-                  commits with identical user and log message in a single
-                  changeset. When very large files were checked in as part of a
-                  changeset then the default may not be long enough. The default
-                  is 60.
+                    Specify the maximum time (in seconds) that is allowed
+                    between commits with identical user and log message in a
+                    single changeset. When very large files were checked in as
+                    part of a changeset then the default may not be long enough.
+                    The default is 60.
       convert.cvsps.mergeto
-                  Specify a regular expression to which commit log messages are
-                  matched. If a match occurs, then the conversion process will
-                  insert a dummy revision merging the branch on which this log
-                  message occurs to the branch indicated in the regex. Default
-                  is "{{mergetobranch ([-\w]+)}}"
+                    Specify a regular expression to which commit log messages
+                    are matched. If a match occurs, then the conversion process
+                    will insert a dummy revision merging the branch on which
+                    this log message occurs to the branch indicated in the
+                    regex. Default is "{{mergetobranch ([-\w]+)}}"
       convert.cvsps.mergefrom
-                  Specify a regular expression to which commit log messages are
-                  matched. If a match occurs, then the conversion process will
-                  add the most recent revision on the branch indicated in the
-                  regex as the second parent of the changeset. Default is
-                  "{{mergefrombranch ([-\w]+)}}"
-      hook.cvslog
-                  Specify a Python function to be called at the end of gathering
-                  the CVS log. The function is passed a list with the log
-                  entries, and can modify the entries in-place, or add or delete
-                  them.
+                    Specify a regular expression to which commit log messages
+                    are matched. If a match occurs, then the conversion process
+                    will add the most recent revision on the branch indicated in
+                    the regex as the second parent of the changeset. Default is
+                    "{{mergefrombranch ([-\w]+)}}"
+      hook.cvslog   Specify a Python function to be called at the end of
+                    gathering the CVS log. The function is passed a list with
+                    the log entries, and can modify the entries in-place, or add
+                    or delete them.
       hook.cvschangesets
-                  Specify a Python function to be called after the changesets
-                  are calculated from the the CVS log. The function is passed a
-                  list with the changeset entries, and can modify the changesets
-                  in-place, or add or delete them.
+                    Specify a Python function to be called after the changesets
+                    are calculated from the the CVS log. The function is passed
+                    a list with the changeset entries, and can modify the
+                    changesets in-place, or add or delete them.
   
       An additional "debugcvsps" Mercurial command allows the builtin changeset
       merging code to be run without doing a conversion. Its parameters and
       output are similar to that of cvsps 2.1. Please see the command help for
       more details.
   
       Subversion Source
       '''''''''''''''''
   
       Subversion source detects classical trunk/branches/tags layouts. By
       default, the supplied "svn://repo/path/" source URL is converted as a
       single branch. If "svn://repo/path/trunk" exists it replaces the default
       branch. If "svn://repo/path/branches" exists, its subdirectories are
       listed as possible branches. If "svn://repo/path/tags" exists, it is
       looked for tags referencing converted branches. Default "trunk",
       "branches" and "tags" values can be overridden with following options. Set
       them to paths relative to the source URL, or leave them blank to disable
       auto detection.
   
       The following options can be set with "--config":
   
       convert.svn.branches
-                  specify the directory containing branches. The default is
-                  "branches".
+                    specify the directory containing branches. The default is
+                    "branches".
       convert.svn.tags
-                  specify the directory containing tags. The default is "tags".
+                    specify the directory containing tags. The default is
+                    "tags".
       convert.svn.trunk
-                  specify the name of the trunk branch. The default is "trunk".
+                    specify the name of the trunk branch. The default is
+                    "trunk".
   
       Source history can be retrieved starting at a specific revision, instead
       of being integrally converted. Only single branch conversions are
       supported.
   
       convert.svn.startrev
-                  specify start Subversion revision number. The default is 0.
+                    specify start Subversion revision number. The default is 0.
   
       Perforce Source
       '''''''''''''''
   
       The Perforce (P4) importer can be given a p4 depot path or a client
       specification as source. It will convert all files in the source to a flat
       Mercurial repository, ignoring labels, branches and integrations. Note
       that when a depot path is given you then usually should specify a target
       directory, because otherwise the target may be named "...-hg".
   
       It is possible to limit the amount of source history to be converted by
       specifying an initial Perforce revision:
   
       convert.p4.startrev
-                  specify initial Perforce revision (a Perforce changelist
-                  number).
+                    specify initial Perforce revision (a Perforce changelist
+                    number).
   
       Mercurial Destination
       '''''''''''''''''''''
   
       The following options are supported:
   
       convert.hg.clonebranches
-                  dispatch source branches in separate clones. The default is
-                  False.
+                    dispatch source branches in separate clones. The default is
+                    False.
       convert.hg.tagsbranch
-                  branch name for tag revisions, defaults to "default".
+                    branch name for tag revisions, defaults to "default".
       convert.hg.usebranchnames
-                  preserve branch names. The default is True.
+                    preserve branch names. The default is True.
   
   options:
   
    -s --source-type TYPE source repository type
    -d --dest-type TYPE   destination repository type
    -r --rev REV          import up to target revision REV
    -A --authormap FILE   remap usernames using this file
       --filemap FILE     remap file names using contents of file
       --splicemap FILE   splice synthesized history into place
       --branchmap FILE   change branch names while converting
       --branchsort       try to sort changesets by branches
       --datesort         try to sort changesets by date
       --sourcesort       preserve source changesets order
   
   use "hg -v help convert" to show more info
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg ci -d'0 0' -Ama
   adding a
   $ hg cp a b
   $ hg ci -d'1 0' -mb
   $ hg rm a
   $ hg ci -d'2 0' -mc
   $ hg mv b a
   $ hg ci -d'3 0' -md
   $ echo a >> a
   $ hg ci -d'4 0' -me
   $ cd ..
   $ hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded'
   assuming destination a-hg
   initializing destination a-hg repository
   scanning source...
   sorting...
   converting...
   4 a
   3 b
   2 c
   1 d
   0 e
   $ hg --cwd a-hg pull ../a
   pulling from ../a
   searching for changes
   no changes found
   $ touch bogusfile
 
 should fail
 
   $ hg convert a bogusfile
   initializing destination bogusfile repository
   abort: cannot create new bundle repository
   [255]
   $ mkdir bogusdir
   $ chmod 000 bogusdir
 
 should fail
 
   $ hg convert a bogusdir
   abort: Permission denied: bogusdir
   [255]
 
 should succeed
 
   $ chmod 700 bogusdir
   $ hg convert a bogusdir
   initializing destination bogusdir repository
   scanning source...
   sorting...
   converting...
   4 a
   3 b
   2 c
   1 d
   0 e
 
 test pre and post conversion actions
 
   $ echo 'include b' > filemap
   $ hg convert --debug --filemap filemap a partialb | \
   >     grep 'run hg'
   run hg source pre-conversion action
   run hg sink pre-conversion action
   run hg sink post-conversion action
   run hg source post-conversion action
 
 converting empty dir should fail "nicely
 
   $ mkdir emptydir
 
 override $PATH to ensure p4 not visible; use $PYTHON in case we're
 running from a devel copy, not a temp installation
 
   $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir
   assuming destination emptydir-hg
   initializing destination emptydir-hg repository
   emptydir does not look like a CVS checkout
   emptydir does not look like a Git repository
   emptydir does not look like a Subversion repository
   emptydir is not a local Mercurial repository
   emptydir does not look like a darcs repository
   emptydir does not look like a monotone repository
   emptydir does not look like a GNU Arch repository
   emptydir does not look like a Bazaar repository
   cannot find required "p4" tool
   abort: emptydir: missing or unsupported repository
   [255]
 
 convert with imaginary source type
 
   $ hg convert --source-type foo a a-foo
   initializing destination a-foo repository
   abort: foo: invalid source repository type
   [255]
 
 convert with imaginary sink type
 
   $ hg convert --dest-type foo a a-foo
   abort: foo: invalid destination repository type
   [255]
 
 testing: convert must not produce duplicate entries in fncache
 
   $ hg convert a b
   initializing destination b repository
   scanning source...
   sorting...
   converting...
   4 a
   3 b
   2 c
   1 d
   0 e
 
 contents of fncache file:
 
   $ cat b/.hg/store/fncache | sort
   data/a.i
   data/b.i
 
 test bogus URL
 
   $ hg convert -q bzr+ssh://[e-mail]/baz baz
   abort: bzr+ssh://[e-mail]/baz: missing or unsupported repository
   [255]

tests/test-extension.t

@@ -1,479 +1,479 b''
 Test basic extension support
 
   $ "$TESTDIR/hghave" no-outer-repo || exit 80
 
   $ cat > foobar.py <<EOF
   > import os
   > from mercurial import commands
   > 
   > def uisetup(ui):
   >     ui.write("uisetup called\\n")
   > 
   > def reposetup(ui, repo):
   >     ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
   >     ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
   > 
   > def foo(ui, *args, **kwargs):
   >     ui.write("Foo\\n")
   > 
   > def bar(ui, *args, **kwargs):
   >     ui.write("Bar\\n")
   > 
   > cmdtable = {
   >    "foo": (foo, [], "hg foo"),
   >    "bar": (bar, [], "hg bar"),
   > }
   > 
   > commands.norepo += ' bar'
   > EOF
   $ abspath=`pwd`/foobar.py
 
   $ mkdir barfoo
   $ cp foobar.py barfoo/__init__.py
   $ barfoopath=`pwd`/barfoo
 
   $ hg init a
   $ cd a
   $ echo foo > file
   $ hg add file
   $ hg commit -m 'add file'
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "foobar = $abspath" >> $HGRCPATH
   $ hg foo
   uisetup called
   reposetup called for a
   ui == repo.ui
   Foo
 
   $ cd ..
   $ hg clone a b
   uisetup called
   reposetup called for a
   ui == repo.ui
   reposetup called for b
   ui == repo.ui
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg bar
   uisetup called
   Bar
   $ echo 'foobar = !' >> $HGRCPATH
 
 module/__init__.py-style
 
   $ echo "barfoo = $barfoopath" >> $HGRCPATH
   $ cd a
   $ hg foo
   uisetup called
   reposetup called for a
   ui == repo.ui
   Foo
   $ echo 'barfoo = !' >> $HGRCPATH
 
 Check that extensions are loaded in phases:
 
   $ cat > foo.py <<EOF
   > import os
   > name = os.path.basename(__file__).rsplit('.', 1)[0]
   > print "1) %s imported" % name
   > def uisetup(ui):
   >     print "2) %s uisetup" % name
   > def extsetup():
   >     print "3) %s extsetup" % name
   > def reposetup(ui, repo):
   >    print "4) %s reposetup" % name
   > EOF
 
   $ cp foo.py bar.py
   $ echo 'foo = foo.py' >> $HGRCPATH
   $ echo 'bar = bar.py' >> $HGRCPATH
 
 Command with no output, we just want to see the extensions loaded:
 
   $ hg paths
   1) foo imported
   1) bar imported
   2) foo uisetup
   2) bar uisetup
   3) foo extsetup
   3) bar extsetup
   4) foo reposetup
   4) bar reposetup
 
 Check hgweb's load order:
 
   $ cat > hgweb.cgi <<EOF
   > #!/usr/bin/env python
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
   > 
   > application = hgweb('.', 'test repo')
   > wsgicgi.launch(application)
   > EOF
 
   $ SCRIPT_NAME='/' SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \
   >    | grep '^[0-9]) ' # ignores HTML output
   1) foo imported
   1) bar imported
   2) foo uisetup
   2) bar uisetup
   3) foo extsetup
   3) bar extsetup
   4) foo reposetup
   4) bar reposetup
   4) foo reposetup
   4) bar reposetup
 
   $ echo 'foo = !' >> $HGRCPATH
   $ echo 'bar = !' >> $HGRCPATH
 
   $ cd ..
 
   $ cat > empty.py <<EOF
   > '''empty cmdtable
   > '''
   > cmdtable = {}
   > EOF
   $ emptypath=`pwd`/empty.py
   $ echo "empty = $emptypath" >> $HGRCPATH
   $ hg help empty
   empty extension - empty cmdtable
   
   no commands defined
 
   $ echo 'empty = !' >> $HGRCPATH
 
   $ cat > debugextension.py <<EOF
   > '''only debugcommands
   > '''
   > def debugfoobar(ui, repo, *args, **opts):
   >     "yet another debug command"
   >     pass
   > 
   > def foo(ui, repo, *args, **opts):
   >     """yet another foo command
   > 
   >     This command has been DEPRECATED since forever.
   >     """
   >     pass
   > 
   > cmdtable = {
   >    "debugfoobar": (debugfoobar, (), "hg debugfoobar"),
   >    "foo": (foo, (), "hg foo")
   > }
   > EOF
   $ debugpath=`pwd`/debugextension.py
   $ echo "debugextension = $debugpath" >> $HGRCPATH
 
   $ hg help debugextension
   debugextension extension - only debugcommands
   
   no commands defined
 
   $ hg --verbose help debugextension
   debugextension extension - only debugcommands
   
   list of commands:
   
    foo:
         yet another foo command
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
 
   $ hg --debug help debugextension
   debugextension extension - only debugcommands
   
   list of commands:
   
    debugfoobar:
         yet another debug command
    foo:
         yet another foo command
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
   $ echo 'debugextension = !' >> $HGRCPATH
 
 Extension module help vs command help:
 
   $ echo 'extdiff =' >> $HGRCPATH
   $ hg help extdiff
   hg extdiff [OPT]... [FILE]...
   
   use external program to diff repository (or selected files)
   
       Show differences between revisions for the specified files, using an
       external program. The default program used is diff, with default options
       "-Npru".
   
       To select a different program, use the -p/--program option. The program
       will be passed the names of two directories to compare. To pass additional
       options to the program, use -o/--option. These will be passed before the
       names of the directories to compare.
   
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is
       compared to the working directory, and, when no revisions are specified,
       the working directory files are compared to its parent.
   
   use "hg help -e extdiff" to show help for the extdiff extension
   
   options:
   
    -p --program CMD         comparison program to run
    -o --option OPT [+]      pass option to comparison program
    -r --rev REV [+]         revision
    -c --change REV          change made by revision
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
   
   [+] marked option can be specified multiple times
   
   use "hg -v help extdiff" to show more info
 
   $ hg help --extension extdiff
   extdiff extension - command to allow external programs to compare revisions
   
   The extdiff Mercurial extension allows you to use external programs to compare
   revisions, or revision with working directory. The external diff programs are
   called with a configurable set of options and two non-option arguments: paths
   to directories containing snapshots of files to compare.
   
   The extdiff extension also allows you to configure new diff commands, so you
   do not need to type "hg extdiff -p kdiff3" always.
   
     [extdiff]
     # add new command that runs GNU diff(1) in 'context diff' mode
     cdiff = gdiff -Nprc5
     ## or the old way:
     #cmd.cdiff = gdiff
     #opts.cdiff = -Nprc5
   
     # add new command called vdiff, runs kdiff3
     vdiff = kdiff3
   
     # add new command called meld, runs meld (no need to name twice)
     meld =
   
     # add new command called vimdiff, runs gvimdiff with DirDiff plugin
     # (see http://www.vim.org/scripts/script.php?script_id=102) Non
     # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
     # your .vimrc
     vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
   
   Tool arguments can include variables that are expanded at runtime:
   
     $parent1, $plabel1 - filename, descriptive label of first parent
     $child,   $clabel  - filename, descriptive label of child revision
     $parent2, $plabel2 - filename, descriptive label of second parent
     $root              - repository root
     $parent is an alias for $parent1.
   
   The extdiff extension will look in your [diff-tools] and [merge-tools]
   sections for diff tool arguments, when none are specified in [extdiff].
   
     [extdiff]
     kdiff3 =
   
     [diff-tools]
     kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
   
   You can use -I/-X and list of file or directory names like normal "hg diff"
   command. The extdiff extension makes snapshots of only needed files, so
   running the external diff program will actually be pretty fast (at least
   faster than having to compare the entire tree).
   
   list of commands:
   
    extdiff   use external program to diff repository (or selected files)
   
   use "hg -v help extdiff" to show builtin aliases and global options
 
   $ echo 'extdiff = !' >> $HGRCPATH
 
 Test help topic with same name as extension
 
   $ cat > multirevs.py <<EOF
   > from mercurial import commands
   > """multirevs extension
   > Big multi-line module docstring."""
   > def multirevs(ui, repo, arg, *args, **opts):
   >     """multirevs command"""
   >     pass
   > cmdtable = {
   >    "multirevs": (multirevs, [], 'ARG')
   > }
   > commands.norepo += ' multirevs'
   > EOF
   $ echo "multirevs = multirevs.py" >> $HGRCPATH
 
   $ hg help multirevs
   Specifying Multiple Revisions
   
       When Mercurial accepts more than one revision, they may be specified
       individually, or provided as a topologically continuous range, separated
       by the ":" character.
   
       The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
       revision identifiers. Both BEGIN and END are optional. If BEGIN is not
       specified, it defaults to revision number 0. If END is not specified, it
       defaults to the tip. The range ":" thus means "all revisions".
   
       If BEGIN is greater than END, revisions are treated in reverse order.
   
       A range acts as a closed interval. This means that a range of 3:5 gives 3,
       4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
   
   use "hg help -c multirevs" to see help for the multirevs command
 
   $ hg help -c multirevs
   hg multirevs ARG
   
   multirevs command
   
   use "hg -v help multirevs" to show more info
 
   $ hg multirevs
   hg multirevs: invalid arguments
   hg multirevs ARG
   
   multirevs command
   
   use "hg help multirevs" to show the full help text
   [255]
 
   $ echo "multirevs = !" >> $HGRCPATH
 
 Issue811: Problem loading extensions twice (by site and by user)
 
   $ debugpath=`pwd`/debugissue811.py
   $ cat > debugissue811.py <<EOF
   > '''show all loaded extensions
   > '''
   > from mercurial import extensions, commands
   > 
   > def debugextensions(ui):
   >     "yet another debug command"
   >     ui.write("%s\n" % '\n'.join([x for x, y in extensions.extensions()]))
   > 
   > cmdtable = {"debugextensions": (debugextensions, (), "hg debugextensions")}
   > commands.norepo += " debugextensions"
   > EOF
   $ echo "debugissue811 = $debugpath" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ echo "hgext.mq=" >> $HGRCPATH
   $ echo "hgext/mq=" >> $HGRCPATH
 
 Show extensions:
 
   $ hg debugextensions
   debugissue811
   mq
 
 Disabled extension commands:
 
   $ HGRCPATH=
   $ export HGRCPATH
   $ hg help email
   'email' is provided by the following extension:
   
-      patchbomb  command to send changesets as (a series of) patch emails
+      patchbomb     command to send changesets as (a series of) patch emails
   
   use "hg help extensions" for information on enabling extensions
   $ hg qdel
   hg: unknown command 'qdel'
   'qdelete' is provided by the following extension:
   
-      mq  manage a stack of patches
+      mq            manage a stack of patches
   
   use "hg help extensions" for information on enabling extensions
   [255]
   $ hg churn
   hg: unknown command 'churn'
   'churn' is provided by the following extension:
   
-      churn  command to display statistics about repository history
+      churn         command to display statistics about repository history
   
   use "hg help extensions" for information on enabling extensions
   [255]
 
 Disabled extensions:
 
   $ hg help churn
   churn extension - command to display statistics about repository history
   
   use "hg help extensions" for information on enabling extensions
   $ hg help patchbomb
   patchbomb extension - command to send changesets as (a series of) patch emails
   
   use "hg help extensions" for information on enabling extensions
 
 Broken disabled extension and command:
 
   $ mkdir hgext
   $ echo > hgext/__init__.py
   $ cat > hgext/broken.py <<EOF
   > "broken extension'
   > EOF
   $ cat > path.py <<EOF
   > import os, sys
   > sys.path.insert(0, os.environ['HGEXTPATH'])
   > EOF
   $ HGEXTPATH=`pwd`
   $ export HGEXTPATH
 
   $ hg --config extensions.path=./path.py help broken
   broken extension - (no help text available)
   
   use "hg help extensions" for information on enabling extensions
 
   $ cat > hgext/forest.py <<EOF
   > cmdtable = None
   > EOF
   $ hg --config extensions.path=./path.py help foo > /dev/null
   warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
   hg: unknown command 'foo'
   warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
   [255]

tests/test-help.t

@@ -1,781 +1,781 b''
 Short help:
 
   $ hg
   Mercurial Distributed SCM
   
   basic commands:
   
    add        add the specified files on the next commit
    annotate   show changeset information by line for each file
    clone      make a copy of an existing repository
    commit     commit the specified files or all outstanding changes
    diff       diff repository (or selected files)
    export     dump the header and diffs for one or more changesets
    forget     forget the specified files on the next commit
    init       create a new repository in the given directory
    log        show revision history of entire repository or files
    merge      merge working directory with another revision
    phase      set or show the current phase name
    pull       pull changes from the specified source
    push       push changes to the specified destination
    remove     remove the specified files on the next commit
    serve      start stand-alone webserver
    status     show changed files in the working directory
    summary    summarize working directory state
    update     update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
 
   $ hg -q
    add        add the specified files on the next commit
    annotate   show changeset information by line for each file
    clone      make a copy of an existing repository
    commit     commit the specified files or all outstanding changes
    diff       diff repository (or selected files)
    export     dump the header and diffs for one or more changesets
    forget     forget the specified files on the next commit
    init       create a new repository in the given directory
    log        show revision history of entire repository or files
    merge      merge working directory with another revision
    phase      set or show the current phase name
    pull       pull changes from the specified source
    push       push changes to the specified destination
    remove     remove the specified files on the next commit
    serve      start stand-alone webserver
    status     show changed files in the working directory
    summary    summarize working directory state
    update     update working directory (or switch revisions)
 
   $ hg help
   Mercurial Distributed SCM
   
   list of commands:
   
    add          add the specified files on the next commit
    addremove    add all new files, delete all missing files
    annotate     show changeset information by line for each file
    archive      create an unversioned archive of a repository revision
    backout      reverse effect of earlier changeset
    bisect       subdivision search of changesets
    bookmarks    track a line of development with movable markers
    branch       set or show the current branch name
    branches     list repository named branches
    bundle       create a changegroup file
    cat          output the current or given revision of files
    clone        make a copy of an existing repository
    commit       commit the specified files or all outstanding changes
    copy         mark files as copied for the next commit
    diff         diff repository (or selected files)
    export       dump the header and diffs for one or more changesets
    forget       forget the specified files on the next commit
    graft        copy changes from other branches onto the current branch
    grep         search for a pattern in specified files and revisions
    heads        show current repository heads or show branch heads
    help         show help for a given topic or a help overview
    identify     identify the working copy or specified revision
    import       import an ordered set of patches
    incoming     show new changesets found in source
    init         create a new repository in the given directory
    locate       locate files matching specific patterns
    log          show revision history of entire repository or files
    manifest     output the current or given revision of the project manifest
    merge        merge working directory with another revision
    outgoing     show changesets not found in the destination
    parents      show the parents of the working directory or revision
    paths        show aliases for remote repositories
    phase        set or show the current phase name
    pull         pull changes from the specified source
    push         push changes to the specified destination
    recover      roll back an interrupted transaction
    remove       remove the specified files on the next commit
    rename       rename files; equivalent of copy + remove
    resolve      redo merges or set/view the merge status of files
    revert       restore files to their checkout state
    rollback     roll back the last transaction (dangerous)
    root         print the root (top) of the current working directory
    serve        start stand-alone webserver
    showconfig   show combined config settings from all hgrc files
    status       show changed files in the working directory
    summary      summarize working directory state
    tag          add one or more tags for the current or given revision
    tags         list repository tags
    tip          show the tip revision
    unbundle     apply one or more changegroup files
    update       update working directory (or switch revisions)
    verify       verify the integrity of the repository
    version      output version and copyright information
   
   additional help topics:
   
    config       Configuration Files
    dates        Date Formats
    diffs        Diff Formats
    environment  Environment Variables
    extensions   Using additional features
    filesets     Specifying File Sets
    glossary     Glossary
    hgignore     syntax for Mercurial ignore files
    hgweb        Configuring hgweb
    merge-tools  Merge Tools
    multirevs    Specifying Multiple Revisions
    patterns     File Name Patterns
    revisions    Specifying Single Revisions
    revsets      Specifying Revision Sets
    subrepos     Subrepositories
    templating   Template Usage
    urls         URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
   $ hg -q help
    add          add the specified files on the next commit
    addremove    add all new files, delete all missing files
    annotate     show changeset information by line for each file
    archive      create an unversioned archive of a repository revision
    backout      reverse effect of earlier changeset
    bisect       subdivision search of changesets
    bookmarks    track a line of development with movable markers
    branch       set or show the current branch name
    branches     list repository named branches
    bundle       create a changegroup file
    cat          output the current or given revision of files
    clone        make a copy of an existing repository
    commit       commit the specified files or all outstanding changes
    copy         mark files as copied for the next commit
    diff         diff repository (or selected files)
    export       dump the header and diffs for one or more changesets
    forget       forget the specified files on the next commit
    graft        copy changes from other branches onto the current branch
    grep         search for a pattern in specified files and revisions
    heads        show current repository heads or show branch heads
    help         show help for a given topic or a help overview
    identify     identify the working copy or specified revision
    import       import an ordered set of patches
    incoming     show new changesets found in source
    init         create a new repository in the given directory
    locate       locate files matching specific patterns
    log          show revision history of entire repository or files
    manifest     output the current or given revision of the project manifest
    merge        merge working directory with another revision
    outgoing     show changesets not found in the destination
    parents      show the parents of the working directory or revision
    paths        show aliases for remote repositories
    phase        set or show the current phase name
    pull         pull changes from the specified source
    push         push changes to the specified destination
    recover      roll back an interrupted transaction
    remove       remove the specified files on the next commit
    rename       rename files; equivalent of copy + remove
    resolve      redo merges or set/view the merge status of files
    revert       restore files to their checkout state
    rollback     roll back the last transaction (dangerous)
    root         print the root (top) of the current working directory
    serve        start stand-alone webserver
    showconfig   show combined config settings from all hgrc files
    status       show changed files in the working directory
    summary      summarize working directory state
    tag          add one or more tags for the current or given revision
    tags         list repository tags
    tip          show the tip revision
    unbundle     apply one or more changegroup files
    update       update working directory (or switch revisions)
    verify       verify the integrity of the repository
    version      output version and copyright information
   
   additional help topics:
   
    config       Configuration Files
    dates        Date Formats
    diffs        Diff Formats
    environment  Environment Variables
    extensions   Using additional features
    filesets     Specifying File Sets
    glossary     Glossary
    hgignore     syntax for Mercurial ignore files
    hgweb        Configuring hgweb
    merge-tools  Merge Tools
    multirevs    Specifying Multiple Revisions
    patterns     File Name Patterns
    revisions    Specifying Single Revisions
    revsets      Specifying Revision Sets
    subrepos     Subrepositories
    templating   Template Usage
    urls         URL Paths
 
 Test short command list with verbose option
 
   $ hg -v help shortlist
   Mercurial Distributed SCM
   
   basic commands:
   
    add:
         add the specified files on the next commit
    annotate, blame:
         show changeset information by line for each file
    clone:
         make a copy of an existing repository
    commit, ci:
         commit the specified files or all outstanding changes
    diff:
         diff repository (or selected files)
    export:
         dump the header and diffs for one or more changesets
    forget:
         forget the specified files on the next commit
    init:
         create a new repository in the given directory
    log, history:
         show revision history of entire repository or files
    merge:
         merge working directory with another revision
    phase:
         set or show the current phase name
    pull:
         pull changes from the specified source
    push:
         push changes to the specified destination
    remove, rm:
         remove the specified files on the next commit
    serve:
         start stand-alone webserver
    status, st:
         show changed files in the working directory
    summary, sum:
         summarize working directory state
    update, up, checkout, co:
         update working directory (or switch revisions)
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
   
   use "hg help" for the full list of commands
 
   $ hg add -h
   hg add [OPTION]... [FILE]...
   
   add the specified files on the next commit
   
       Schedule files to be version controlled and added to the repository.
   
       The files will be added to the repository at the next commit. To undo an
       add before that, see "hg forget".
   
       If no names are given, add all files to the repository.
   
       Returns 0 if all files are successfully added.
   
   options:
   
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -S --subrepos            recurse into subrepositories
    -n --dry-run             do not perform actions, just print output
   
   [+] marked option can be specified multiple times
   
   use "hg -v help add" to show more info
 
 Verbose help for add
 
   $ hg add -hv
   hg add [OPTION]... [FILE]...
   
   add the specified files on the next commit
   
       Schedule files to be version controlled and added to the repository.
   
       The files will be added to the repository at the next commit. To undo an
       add before that, see "hg forget".
   
       If no names are given, add all files to the repository.
   
       An example showing how new (unknown) files are added automatically by "hg
       add":
   
         $ ls
         foo.c
         $ hg status
         ? foo.c
         $ hg add
         adding foo.c
         $ hg status
         A foo.c
   
       Returns 0 if all files are successfully added.
   
   options:
   
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -S --subrepos            recurse into subrepositories
    -n --dry-run             do not perform actions, just print output
   
   [+] marked option can be specified multiple times
   
   global options:
   
    -R --repository REPO   repository root directory or name of overlay bundle
                           file
       --cwd DIR           change working directory
    -y --noninteractive    do not prompt, automatically pick the first choice for
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
       --encoding ENCODE   set the charset encoding (default: ascii)
       --encodingmode MODE set the charset encoding mode (default: strict)
       --traceback         always print a traceback on exception
       --time              time how long the command takes
       --profile           print command execution profile
       --version           output version information and exit
    -h --help              display help and exit
   
   [+] marked option can be specified multiple times
 
 Test help option with version option
 
   $ hg add -h --version
   Mercurial Distributed SCM (version *) (glob)
   (see http://mercurial.selenic.com for more information)
   
   Copyright (C) 2005-2012 Matt Mackall and others
   This is free software; see the source for copying conditions. There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
   $ hg add --skjdfks
   hg add: option --skjdfks not recognized
   hg add [OPTION]... [FILE]...
   
   add the specified files on the next commit
   
   options:
   
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -S --subrepos            recurse into subrepositories
    -n --dry-run             do not perform actions, just print output
   
   [+] marked option can be specified multiple times
   
   use "hg help add" to show the full help text
   [255]
 
 Test ambiguous command help
 
   $ hg help ad
   list of commands:
   
    add         add the specified files on the next commit
    addremove   add all new files, delete all missing files
   
   use "hg -v help ad" to show builtin aliases and global options
 
 Test command without options
 
   $ hg help verify
   hg verify
   
   verify the integrity of the repository
   
       Verify the integrity of the current repository.
   
       This will perform an extensive check of the repository's integrity,
       validating the hashes and checksums of each entry in the changelog,
       manifest, and tracked files, as well as the integrity of their crosslinks
       and indices.
   
       Returns 0 on success, 1 if errors are encountered.
   
   use "hg -v help verify" to show more info
 
   $ hg help diff
   hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
   
   diff repository (or selected files)
   
       Show differences between revisions for the specified files.
   
       Differences between files are shown using the unified diff format.
   
       Note:
          diff may generate unexpected results for merges, as it will default to
          comparing against the working directory's first parent changeset if no
          revisions are specified.
   
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is
       compared to the working directory, and, when no revisions are specified,
       the working directory files are compared to its parent.
   
       Alternatively you can specify -c/--change with a revision to see the
       changes in that changeset relative to its first parent.
   
       Without the -a/--text option, diff will avoid generating diffs of files it
       detects as binary. With -a, diff will generate a diff anyway, probably
       with undesirable results.
   
       Use the -g/--git option to generate diffs in the git extended diff format.
       For more information, read "hg help diffs".
   
       Returns 0 on success.
   
   options:
   
    -r --rev REV [+]         revision
    -c --change REV          change made by revision
    -a --text                treat all files as text
    -g --git                 use git extended diff format
       --nodates             omit dates from diff headers
    -p --show-function       show which function each change is in
       --reverse             produce a diff that undoes the changes
    -w --ignore-all-space    ignore white space when comparing lines
    -b --ignore-space-change ignore changes in the amount of white space
    -B --ignore-blank-lines  ignore changes whose lines are all blank
    -U --unified NUM         number of lines of context to show
       --stat                output diffstat-style summary of changes
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -S --subrepos            recurse into subrepositories
   
   [+] marked option can be specified multiple times
   
   use "hg -v help diff" to show more info
 
   $ hg help status
   hg status [OPTION]... [FILE]...
   
   aliases: st
   
   show changed files in the working directory
   
       Show status of files in the repository. If names are given, only files
       that match are shown. Files that are clean or ignored or the source of a
       copy/move operation, are not listed unless -c/--clean, -i/--ignored,
       -C/--copies or -A/--all are given. Unless options described with "show
       only ..." are given, the options -mardu are used.
   
       Option -q/--quiet hides untracked (unknown and ignored) files unless
       explicitly requested with -u/--unknown or -i/--ignored.
   
       Note:
          status may appear to disagree with diff if permissions have changed or
          a merge has occurred. The standard diff format does not report
          permission changes and diff only reports changes relative to one merge
          parent.
   
       If one revision is given, it is used as the base revision. If two
       revisions are given, the differences between them are shown. The --change
       option can also be used as a shortcut to list the changed files of a
       revision from its first parent.
   
       The codes used to show the status of files are:
   
         M = modified
         A = added
         R = removed
         C = clean
         ! = missing (deleted by non-hg command, but still tracked)
         ? = not tracked
         I = ignored
           = origin of the previous file listed as A (added)
   
       Returns 0 on success.
   
   options:
   
    -A --all                 show status of all files
    -m --modified            show only modified files
    -a --added               show only added files
    -r --removed             show only removed files
    -d --deleted             show only deleted (but tracked) files
    -c --clean               show only files without changes
    -u --unknown             show only unknown (not tracked) files
    -i --ignored             show only ignored files
    -n --no-status           hide status prefix
    -C --copies              show source of copied files
    -0 --print0              end filenames with NUL, for use with xargs
       --rev REV [+]         show difference from revision
       --change REV          list the changed files of a revision
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -S --subrepos            recurse into subrepositories
   
   [+] marked option can be specified multiple times
   
   use "hg -v help status" to show more info
 
   $ hg -q help status
   hg status [OPTION]... [FILE]...
   
   show changed files in the working directory
 
   $ hg help foo
   hg: unknown command 'foo'
   Mercurial Distributed SCM
   
   basic commands:
   
    add        add the specified files on the next commit
    annotate   show changeset information by line for each file
    clone      make a copy of an existing repository
    commit     commit the specified files or all outstanding changes
    diff       diff repository (or selected files)
    export     dump the header and diffs for one or more changesets
    forget     forget the specified files on the next commit
    init       create a new repository in the given directory
    log        show revision history of entire repository or files
    merge      merge working directory with another revision
    phase      set or show the current phase name
    pull       pull changes from the specified source
    push       push changes to the specified destination
    remove     remove the specified files on the next commit
    serve      start stand-alone webserver
    status     show changed files in the working directory
    summary    summarize working directory state
    update     update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
   [255]
 
   $ hg skjdfks
   hg: unknown command 'skjdfks'
   Mercurial Distributed SCM
   
   basic commands:
   
    add        add the specified files on the next commit
    annotate   show changeset information by line for each file
    clone      make a copy of an existing repository
    commit     commit the specified files or all outstanding changes
    diff       diff repository (or selected files)
    export     dump the header and diffs for one or more changesets
    forget     forget the specified files on the next commit
    init       create a new repository in the given directory
    log        show revision history of entire repository or files
    merge      merge working directory with another revision
    phase      set or show the current phase name
    pull       pull changes from the specified source
    push       push changes to the specified destination
    remove     remove the specified files on the next commit
    serve      start stand-alone webserver
    status     show changed files in the working directory
    summary    summarize working directory state
    update     update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
   [255]
 
   $ cat > helpext.py <<EOF
   > import os
   > from mercurial import commands
   > 
   > def nohelp(ui, *args, **kwargs):
   >     pass
   > 
   > cmdtable = {
   >     "nohelp": (nohelp, [], "hg nohelp"),
   > }
   > 
   > commands.norepo += ' nohelp'
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
 
 Test command with no help text
 
   $ hg help nohelp
   hg nohelp
   
   (no help text available)
   
   use "hg -v help nohelp" to show more info
 
 Test that default list of commands omits extension commands
 
   $ hg help
   Mercurial Distributed SCM
   
   list of commands:
   
    add          add the specified files on the next commit
    addremove    add all new files, delete all missing files
    annotate     show changeset information by line for each file
    archive      create an unversioned archive of a repository revision
    backout      reverse effect of earlier changeset
    bisect       subdivision search of changesets
    bookmarks    track a line of development with movable markers
    branch       set or show the current branch name
    branches     list repository named branches
    bundle       create a changegroup file
    cat          output the current or given revision of files
    clone        make a copy of an existing repository
    commit       commit the specified files or all outstanding changes
    copy         mark files as copied for the next commit
    diff         diff repository (or selected files)
    export       dump the header and diffs for one or more changesets
    forget       forget the specified files on the next commit
    graft        copy changes from other branches onto the current branch
    grep         search for a pattern in specified files and revisions
    heads        show current repository heads or show branch heads
    help         show help for a given topic or a help overview
    identify     identify the working copy or specified revision
    import       import an ordered set of patches
    incoming     show new changesets found in source
    init         create a new repository in the given directory
    locate       locate files matching specific patterns
    log          show revision history of entire repository or files
    manifest     output the current or given revision of the project manifest
    merge        merge working directory with another revision
    outgoing     show changesets not found in the destination
    parents      show the parents of the working directory or revision
    paths        show aliases for remote repositories
    phase        set or show the current phase name
    pull         pull changes from the specified source
    push         push changes to the specified destination
    recover      roll back an interrupted transaction
    remove       remove the specified files on the next commit
    rename       rename files; equivalent of copy + remove
    resolve      redo merges or set/view the merge status of files
    revert       restore files to their checkout state
    rollback     roll back the last transaction (dangerous)
    root         print the root (top) of the current working directory
    serve        start stand-alone webserver
    showconfig   show combined config settings from all hgrc files
    status       show changed files in the working directory
    summary      summarize working directory state
    tag          add one or more tags for the current or given revision
    tags         list repository tags
    tip          show the tip revision
    unbundle     apply one or more changegroup files
    update       update working directory (or switch revisions)
    verify       verify the integrity of the repository
    version      output version and copyright information
   
   enabled extensions:
   
-   helpext  (no help text available)
+   helpext       (no help text available)
   
   additional help topics:
   
    config       Configuration Files
    dates        Date Formats
    diffs        Diff Formats
    environment  Environment Variables
    extensions   Using additional features
    filesets     Specifying File Sets
    glossary     Glossary
    hgignore     syntax for Mercurial ignore files
    hgweb        Configuring hgweb
    merge-tools  Merge Tools
    multirevs    Specifying Multiple Revisions
    patterns     File Name Patterns
    revisions    Specifying Single Revisions
    revsets      Specifying Revision Sets
    subrepos     Subrepositories
    templating   Template Usage
    urls         URL Paths
   
   use "hg -v help" to show builtin aliases and global options
 
 
 
 Test list of commands with command with no help text
 
   $ hg help helpext
   helpext extension - no help text available
   
   list of commands:
   
    nohelp   (no help text available)
   
   use "hg -v help helpext" to show builtin aliases and global options
 
 Test a help topic
 
   $ hg help revs
   Specifying Single Revisions
   
       Mercurial supports several ways to specify individual revisions.
   
       A plain integer is treated as a revision number. Negative integers are
       treated as sequential offsets from the tip, with -1 denoting the tip, -2
       denoting the revision prior to the tip, and so forth.
   
       A 40-digit hexadecimal string is treated as a unique revision identifier.
   
       A hexadecimal string less than 40 characters long is treated as a unique
       revision identifier and is referred to as a short-form identifier. A
       short-form identifier is only valid if it is the prefix of exactly one
       full-length identifier.
   
       Any other string is treated as a tag or branch name. A tag name is a
       symbolic name associated with a revision identifier. A branch name denotes
       the tipmost revision of that branch. Tag and branch names must not contain
       the ":" character.
   
       The reserved name "tip" is a special tag that always identifies the most
       recent revision.
   
       The reserved name "null" indicates the null revision. This is the revision
       of an empty repository, and the parent of revision 0.
   
       The reserved name "." indicates the working directory parent. If no
       working directory is checked out, it is equivalent to null. If an
       uncommitted merge is in progress, "." is the revision of the first parent.
 
 Test templating help
 
   $ hg help templating | egrep '(desc|diffstat|firstline|nonempty)  '
-      desc        String. The text of the changeset description.
-      diffstat    String. Statistics of changes with the following format:
-      firstline   Any text. Returns the first line of text.
-      nonempty    Any text. Returns '(none)' if the string is empty.
+      desc          String. The text of the changeset description.
+      diffstat      String. Statistics of changes with the following format:
+      firstline     Any text. Returns the first line of text.
+      nonempty      Any text. Returns '(none)' if the string is empty.
 
 Test help hooks
 
   $ cat > helphook1.py <<EOF
   > from mercurial import help
   > 
   > def rewrite(topic, doc):
   >     return doc + '\nhelphook1\n'
   > 
   > def extsetup(ui):
   >     help.addtopichook('revsets', rewrite)
   > EOF
   $ cat > helphook2.py <<EOF
   > from mercurial import help
   > 
   > def rewrite(topic, doc):
   >     return doc + '\nhelphook2\n'
   > 
   > def extsetup(ui):
   >     help.addtopichook('revsets', rewrite)
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
   $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
   $ hg help revsets | grep helphook
       helphook1
       helphook2

tests/test-minirst.py.out

@@ -1,764 +1,766 b''
 == paragraphs ==
 60 column format:
 ----------------------------------------------------------------------
 This is some text in the first paragraph.
 
   A small indented paragraph. It is followed by some lines
   containing random whitespace.
 
 The third and final paragraph.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 This is some text in the first
 paragraph.
 
   A small indented paragraph.
   It is followed by some lines
   containing random
   whitespace.
 
 The third and final paragraph.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 This is some text in the first paragraph.
 </p>
 <p>
 A small indented paragraph.
 It is followed by some lines
 containing random whitespace.
 </p>
 <p>
 The third and final paragraph.
 </p>
 ----------------------------------------------------------------------
 
 == definitions ==
 60 column format:
 ----------------------------------------------------------------------
 A Term
   Definition. The indented lines make up the definition.
 
 Another Term
     Another definition. The final line in the definition
     determines the indentation, so this will be indented
     with four spaces.
 
   A Nested/Indented Term
     Definition.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 A Term
   Definition. The indented
   lines make up the
   definition.
 
 Another Term
     Another definition. The
     final line in the
     definition determines the
     indentation, so this will
     be indented with four
     spaces.
 
   A Nested/Indented Term
     Definition.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <dl>
  <dt>A Term
  <dd>Definition. The indented lines make up the definition.
  <dt>Another Term
  <dd>Another definition. The final line in the definition determines the indentation, so this will be indented with four spaces.
  <dt>A Nested/Indented Term
  <dd>Definition.
 </dl>
 ----------------------------------------------------------------------
 
 == literals ==
 60 column format:
 ----------------------------------------------------------------------
 The fully minimized form is the most convenient form:
 
   Hello
     literal
       world
 
 In the partially minimized form a paragraph simply ends with
 space-double-colon.
 
   ////////////////////////////////////////
   long un-wrapped line in a literal block
   \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
   This literal block is started with '::',
     the so-called expanded form. The paragraph
       with '::' disappears in the final output.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 The fully minimized form is
 the most convenient form:
 
   Hello
     literal
       world
 
 In the partially minimized
 form a paragraph simply ends
 with space-double-colon.
 
   ////////////////////////////////////////
   long un-wrapped line in a literal block
   \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
   This literal block is started with '::',
     the so-called expanded form. The paragraph
       with '::' disappears in the final output.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 The fully minimized form is the most
 convenient form:
 </p>
 <pre>
 Hello
   literal
     world
 </pre>
 <p>
 In the partially minimized form a paragraph
 simply ends with space-double-colon.
 </p>
 <pre>
 ////////////////////////////////////////
 long un-wrapped line in a literal block
 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 </pre>
 <pre>
 This literal block is started with '::',
   the so-called expanded form. The paragraph
     with '::' disappears in the final output.
 </pre>
 ----------------------------------------------------------------------
 
 == lists ==
 60 column format:
 ----------------------------------------------------------------------
 - This is the first list item.
 
   Second paragraph in the first list item.
 
 - List items need not be separated by a blank line.
 - And will be rendered without one in any case.
 
 We can have indented lists:
 
   - This is an indented list item
   - Another indented list item:
 
       - A literal block in the middle
             of an indented list.
 
       (The above is not a list item since we are in the literal block.)
 
   Literal block with no indentation (apart from
   the two spaces added to all literal blocks).
 
 1. This is an enumerated list (first item).
 2. Continuing with the second item.
 (1) foo
 (2) bar
 1) Another
 2) List
 
 Line blocks are also a form of list:
 
 This is the first line. The line continues here.
 This is the second line.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 - This is the first list item.
 
   Second paragraph in the
   first list item.
 
 - List items need not be
   separated by a blank line.
 - And will be rendered without
   one in any case.
 
 We can have indented lists:
 
   - This is an indented list
     item
   - Another indented list
     item:
 
       - A literal block in the middle
             of an indented list.
 
       (The above is not a list item since we are in the literal block.)
 
   Literal block with no indentation (apart from
   the two spaces added to all literal blocks).
 
 1. This is an enumerated list
    (first item).
 2. Continuing with the second
    item.
 (1) foo
 (2) bar
 1) Another
 2) List
 
 Line blocks are also a form of
 list:
 
 This is the first line. The
 line continues here.
 This is the second line.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <ul>
  <li> This is the first list item.
 <p>
 Second paragraph in the first list item.
 </p>
  <li> List items need not be separated   by a blank line.
  <li> And will be rendered without   one in any case.
 </ul>
 <p>
 We can have indented lists:
 </p>
 <ul>
  <li> This is an indented list item
  <li> Another indented list item:
 <pre>
 - A literal block in the middle
       of an indented list.
 </pre>
 <pre>
 (The above is not a list item since we are in the literal block.)
 </pre>
 </ul>
 <pre>
 Literal block with no indentation (apart from
 the two spaces added to all literal blocks).
 </pre>
 <ol>
  <li> This is an enumerated list (first item).
  <li> Continuing with the second item.
  <li> foo
  <li> bar
  <li> Another
  <li> List
 </ol>
 <p>
 Line blocks are also a form of list:
 </p>
 <ol>
  <li> This is the first line.   The line continues here.
  <li> This is the second line.
 </ol>
 ----------------------------------------------------------------------
 
 == options ==
 60 column format:
 ----------------------------------------------------------------------
 There is support for simple option lists, but only with long
 options:
 
  -X --exclude filter  an option with a short and long option
                       with an argument
  -I --include         an option with both a short option and
                       a long option
     --all             Output all.
     --both            Output both (this description is quite
                       long).
     --long            Output all day long.
     --par             This option has two paragraphs in its
                       description. This is the first.
 
                       This is the second.  Blank lines may
                       be omitted between options (as above)
                       or left in (as here).
 
 The next paragraph looks like an option list, but lacks the
 two-space marker after the option. It is treated as a normal
 paragraph:
 
 --foo bar baz
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 There is support for simple
 option lists, but only with
 long options:
 
  -X --exclude filter  an
                       option
                       with a
                       short
                       and
                       long
                       option
                       with an
                       argumen
                       t
  -I --include         an
                       option
                       with
                       both a
                       short
                       option
                       and a
                       long
                       option
     --all             Output
                       all.
     --both            Output
                       both
                       (this d
                       escript
                       ion is
                       quite
                       long).
     --long            Output
                       all day
                       long.
     --par             This
                       option
                       has two
                       paragra
                       phs in
                       its des
                       criptio
                       n. This
                       is the
                       first.
 
                       This is
                       the
                       second.
                       Blank
                       lines
                       may be
                       omitted
                       between
                       options
                       (as
                       above)
                       or left
                       in (as
                       here).
 
 The next paragraph looks like
 an option list, but lacks the
 two-space marker after the
 option. It is treated as a
 normal paragraph:
 
 --foo bar baz
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 There is support for simple option lists,
 but only with long options:
 </p>
 <dl>
  <dt>-X --exclude filter
  <dd>an option with a short and long option with an argument
  <dt>-I --include
  <dd>an option with both a short option and a long option
  <dt>   --all
  <dd>Output all.
  <dt>   --both
  <dd>Output both (this description is quite long).
  <dt>   --long
  <dd>Output all day long.
  <dt>   --par
  <dd>This option has two paragraphs in its description. This is the first.
 <p>
 This is the second.  Blank lines may be omitted between
 options (as above) or left in (as here).
 </p>
 </dl>
 <p>
 The next paragraph looks like an option list, but lacks the two-space
 marker after the option. It is treated as a normal paragraph:
 </p>
 <p>
 --foo bar baz
 </p>
 ----------------------------------------------------------------------
 
 == fields ==
 60 column format:
 ----------------------------------------------------------------------
-a   First item.
-ab  Second item. Indentation and wrapping is handled
-    automatically.
+a             First item.
+ab            Second item. Indentation and wrapping is
+              handled automatically.
 
 Next list:
 
-small       The larger key below triggers full indentation
-            here.
+small         The larger key below triggers full indentation
+              here.
 much too large
-            This key is big enough to get its own line.
+              This key is big enough to get its own line.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
-a   First item.
-ab  Second item. Indentation
-    and wrapping is handled
-    automatically.
+a             First item.
+ab            Second item.
+              Indentation and
+              wrapping is
+              handled
+              automatically.
 
 Next list:
 
-small       The larger key
-            below triggers
-            full indentation
-            here.
+small         The larger key
+              below triggers
+              full indentation
+              here.
 much too large
-            This key is big
-            enough to get its
-            own line.
+              This key is big
+              enough to get
+              its own line.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <dl>
  <dt>a
  <dd>First item.
  <dt>ab
  <dd>Second item. Indentation and wrapping is handled automatically.
 </dl>
 <p>
 Next list:
 </p>
 <dl>
  <dt>small
  <dd>The larger key below triggers full indentation here.
  <dt>much too large
  <dd>This key is big enough to get its own line.
 </dl>
 ----------------------------------------------------------------------
 
 == containers (normal) ==
 60 column format:
 ----------------------------------------------------------------------
 Normal output.
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Normal output.
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Normal output.
 </p>
 ----------------------------------------------------------------------
 
 == containers (verbose) ==
 60 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Verbose output.
 ----------------------------------------------------------------------
 ['debug', 'debug']
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Verbose output.
 ----------------------------------------------------------------------
 ['debug', 'debug']
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Normal output.
 </p>
 <p>
 Verbose output.
 </p>
 ----------------------------------------------------------------------
 ['debug', 'debug']
 ----------------------------------------------------------------------
 
 == containers (debug) ==
 60 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Initial debug output.
 ----------------------------------------------------------------------
 ['verbose']
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Initial debug output.
 ----------------------------------------------------------------------
 ['verbose']
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Normal output.
 </p>
 <p>
 Initial debug output.
 </p>
 ----------------------------------------------------------------------
 ['verbose']
 ----------------------------------------------------------------------
 
 == containers (verbose debug) ==
 60 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Initial debug output.
 
 Verbose output.
 
 Debug output.
 ----------------------------------------------------------------------
 []
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Normal output.
 
 Initial debug output.
 
 Verbose output.
 
 Debug output.
 ----------------------------------------------------------------------
 []
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Normal output.
 </p>
 <p>
 Initial debug output.
 </p>
 <p>
 Verbose output.
 </p>
 <p>
 Debug output.
 </p>
 ----------------------------------------------------------------------
 []
 ----------------------------------------------------------------------
 
 == roles ==
 60 column format:
 ----------------------------------------------------------------------
 Please see "hg add".
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Please see "hg add".
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Please see "hg add".
 </p>
 ----------------------------------------------------------------------
 
 == sections ==
 60 column format:
 ----------------------------------------------------------------------
 Title
 =====
 
 Section
 -------
 
 Subsection
 ''''''''''
 
 Markup: "foo" and "hg help"
 ---------------------------
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Title
 =====
 
 Section
 -------
 
 Subsection
 ''''''''''
 
 Markup: "foo" and "hg help"
 ---------------------------
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <h1>Title</h1>
 <h2>Section</h2>
 <h3>Subsection</h3>
 <h2>Markup: "foo" and "hg help"</h2>
 ----------------------------------------------------------------------
 
 == admonitions ==
 60 column format:
 ----------------------------------------------------------------------
 Note:
    This is a note
 
    - Bullet 1
    - Bullet 2
 
    Warning!
       This is a warning Second input line of warning
 
 !Danger!
    This is danger
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Note:
    This is a note
 
    - Bullet 1
    - Bullet 2
 
    Warning!
       This is a warning Second
       input line of warning
 
 !Danger!
    This is danger
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 <b>Note:</b> This is a note
 </p>
 <ul>
  <li> Bullet 1
  <li> Bullet 2
 </ul>
 <p>
 <b>Warning!</b> This is a warning Second input line of warning
 </p>
 <p>
 <b>!Danger!</b> This is danger
 </p>
 ----------------------------------------------------------------------
 
 == comments ==
 60 column format:
 ----------------------------------------------------------------------
 Some text.
 
    Some indented text.
 
 Empty comment above
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
 Some text.
 
    Some indented text.
 
 Empty comment above
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <p>
 Some text.
 </p>
 <p>
 Some indented text.
 </p>
 <p>
 Empty comment above
 </p>
 ----------------------------------------------------------------------
 
   === === ========================================
   a   b   c                                       
   === === ========================================
   1   2   3                                       
   foo bar baz this list is very very very long man
   === === ========================================
 
 == table ==
 60 column format:
 ----------------------------------------------------------------------
   a   b   c
   ------------------------------------------------
   1   2   3
   foo bar baz this list is very very very long man
 ----------------------------------------------------------------------
 
 30 column format:
 ----------------------------------------------------------------------
   a   b   c
   ------------------------------
   1   2   3
   foo bar baz this list is
           very very very long
           man
 ----------------------------------------------------------------------
 
 html format:
 ----------------------------------------------------------------------
 <table>
  <tr><th>a</th><th>b</th><th>c</th></tr>
  <tr><td>1</td><td>2</td><td>3</td></tr>
  <tr><td>foo</td><td>bar</td><td>baz this list is very very very long man</td></tr>
 </table>
 ----------------------------------------------------------------------
 

tests/test-qrecord.t

@@ -1,397 +1,397 b''
 Create configuration
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
 
 help record (no record)
 
   $ hg help record
   record extension - commands to interactively select changes for commit/qrefresh
   
   use "hg help extensions" for information on enabling extensions
 
 help qrecord (no record)
 
   $ hg help qrecord
   'qrecord' is provided by the following extension:
   
-      record  commands to interactively select changes for commit/qrefresh
+      record        commands to interactively select changes for commit/qrefresh
   
   use "hg help extensions" for information on enabling extensions
 
   $ echo "[extensions]"     >> $HGRCPATH
   $ echo "record="          >> $HGRCPATH
 
 help record (record)
 
   $ hg help record
   hg record [OPTION]... [FILE]...
   
   interactively select changes to commit
   
       If a list of files is omitted, all changes reported by "hg status" will be
       candidates for recording.
   
       See "hg help dates" for a list of formats valid for -d/--date.
   
       You will be prompted for whether to record changes to each modified file,
       and for files with multiple changes, for each change to use. For each
       query, the following responses are possible:
   
         y - record this change
         n - skip this change
   
         s - skip remaining changes to this file
         f - record remaining changes to this file
   
         d - done, skip remaining changes and files
         a - record all changes to all remaining files
         q - quit, recording no changes
   
         ? - display help
   
       This command is not available when committing a merge.
   
   options:
   
    -A --addremove           mark new/missing files as added/removed before
                             committing
       --close-branch        mark a branch as closed, hiding it from the branch
                             list
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
    -d --date DATE           record the specified date as commit date
    -u --user USER           record the specified user as committer
    -S --subrepos            recurse into subrepositories
    -w --ignore-all-space    ignore white space when comparing lines
    -b --ignore-space-change ignore changes in the amount of white space
    -B --ignore-blank-lines  ignore changes whose lines are all blank
   
   [+] marked option can be specified multiple times
   
   use "hg -v help record" to show more info
 
 help (no mq, so no qrecord)
 
   $ hg help qrecord
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   use "hg -v help qrecord" to show more info
 
   $ hg init a
 
 qrecord (mq not present)
 
   $ hg -R a qrecord
   hg qrecord: invalid arguments
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
   use "hg help qrecord" to show the full help text
   [255]
 
 qrecord patch (mq not present)
 
   $ hg -R a qrecord patch
   abort: 'mq' extension not loaded
   [255]
 
 help (bad mq)
 
   $ echo "mq=nonexistant" >> $HGRCPATH
   $ hg help qrecord
   *** failed to import extension mq from nonexistant: [Errno 2] * (glob)
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   use "hg -v help qrecord" to show more info
 
 help (mq present)
 
   $ sed 's/mq=nonexistant/mq=/' $HGRCPATH > hgrc.tmp
   $ mv hgrc.tmp $HGRCPATH
 
   $ hg help qrecord
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   options:
   
    -e --edit                edit commit message
    -g --git                 use git extended diff format
    -U --currentuser         add "From: <current user>" to patch
    -u --user USER           add "From: <USER>" to patch
    -D --currentdate         add "Date: <current date>" to patch
    -d --date DATE           add "Date: <DATE>" to patch
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
    -w --ignore-all-space    ignore white space when comparing lines
    -b --ignore-space-change ignore changes in the amount of white space
    -B --ignore-blank-lines  ignore changes whose lines are all blank
       --mq                  operate on patch repository
   
   [+] marked option can be specified multiple times
   
   use "hg -v help qrecord" to show more info
 
   $ cd a
 
 Base commit
 
   $ cat > 1.txt <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ cat > 2.txt <<EOF
   > a
   > b
   > c
   > d
   > e
   > f
   > EOF
 
   $ mkdir dir
   $ cat > dir/a.txt <<EOF
   > hello world
   > 
   > someone
   > up
   > there
   > loves
   > me
   > EOF
 
   $ hg add 1.txt 2.txt dir/a.txt
   $ hg commit -m 'initial checkin'
 
 Changing files
 
   $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
   $ sed -e 's/b/b b/' 2.txt > 2.txt.new
   $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
 
   $ mv -f 1.txt.new 1.txt
   $ mv -f 2.txt.new 2.txt
   $ mv -f dir/a.txt.new dir/a.txt
 
 Whole diff
 
   $ hg diff --nodates
   diff -r 1057167b20ef 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
   -4
   +4 4
    5
   diff -r 1057167b20ef 2.txt
   --- a/2.txt
   +++ b/2.txt
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   diff -r 1057167b20ef dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 qrecord with bad patch name, should abort before prompting
 
   $ hg qrecord .hg
   abort: patch name cannot begin with ".hg"
   [255]
 
 qrecord a.patch
 
   $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
   > y
   > y
   > n
   > y
   > y
   > n
   > EOF
   diff --git a/1.txt b/1.txt
   2 hunks, 2 lines changed
   examine changes to '1.txt'? [Ynsfdaq?] 
   @@ -1,3 +1,3 @@
    1
   -2
   +2 2
    3
   record change 1/4 to '1.txt'? [Ynsfdaq?] 
   @@ -3,3 +3,3 @@
    3
   -4
   +4 4
    5
   record change 2/4 to '1.txt'? [Ynsfdaq?] 
   diff --git a/2.txt b/2.txt
   1 hunks, 1 lines changed
   examine changes to '2.txt'? [Ynsfdaq?] 
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   record change 3/4 to '2.txt'? [Ynsfdaq?] 
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynsfdaq?] 
 
 After qrecord a.patch 'tip'"
 
   $ hg tip -p
   changeset:   1:5d1ca63427ee
   tag:         a.patch
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     aaa
   
   diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
    4
    5
   diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
   --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   
 
 After qrecord a.patch 'diff'"
 
   $ hg diff --nodates
   diff -r 5d1ca63427ee 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   diff -r 5d1ca63427ee dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 qrecord b.patch
 
   $ hg qrecord -d '0 0' -m bbb b.patch <<EOF
   > y
   > y
   > y
   > y
   > EOF
   diff --git a/1.txt b/1.txt
   1 hunks, 1 lines changed
   examine changes to '1.txt'? [Ynsfdaq?] 
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   record change 1/2 to '1.txt'? [Ynsfdaq?] 
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynsfdaq?] 
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] 
 
 After qrecord b.patch 'tip'
 
   $ hg tip -p
   changeset:   2:b056198bf878
   tag:         b.patch
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     bbb
   
   diff -r 5d1ca63427ee -r b056198bf878 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
   --- a/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   
 
 After qrecord b.patch 'diff'
 
   $ hg diff --nodates