mercurial-scm/hg: mercurial/utils/stringutil.py annotate

annotate mercurial/utils/stringutil.py @ 39878:3e896b51aa5d

storageutil: move metadata parsing and packing from revlog (API) Parsing and writing of revision text metadata is likely identical across storage backends. Let's move the code out of revlog so we don't need to import the revlog module in order to use it. Differential Revision: https://phab.mercurial-scm.org/D4754

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 24 Sep 2018 14:31:31 -0700
parents	0f549da54379
children	f2fbd32c7664

rev	line source
37083 f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37082 diff changeset	1 # stringutil.py - utility for generic string formatting, parsing, etc.
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # Copyright 2005 K. Thananchayan <thananck@yahoo.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	7 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9996 diff changeset	8 # GNU General Public License version 2 or any later version.
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	9
37083 f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37082 diff changeset	10 from __future__ import absolute_import
1082 ce96e316278a Update util.py docstrings, fix walk test mpm@selenic.com parents: 1081 diff changeset	11
37476 e9dea82ea1f3 wireproto: convert python literal to object without using unsafe eval() Yuya Nishihara <yuya@tcha.org> parents: 37322 diff changeset	12 import ast
31453 3b7a6941a6ef py3: call codecs.escape_encode() directly Yuya Nishihara <yuya@tcha.org> parents: 31451 diff changeset	13 import codecs
21907 7e5dfa00e3c2 util: rename 're' to 'remod' Siddharth Agarwal <sid0@fb.com> parents: 21857 diff changeset	14 import re as remod
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	15 import textwrap
39296 ce145f8eface stringutil: teach pprint() to recognize generators Gregory Szorc <gregory.szorc@gmail.com> parents: 39063 diff changeset	16 import types
3769 96095d9ff1f8 Add encoding detection Matt Mackall <mpm@selenic.com> parents: 3767 diff changeset	17
37083 f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37082 diff changeset	18 from ..i18n import _
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	19 from ..thirdparty import attr
37083 f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37082 diff changeset	20
f99d64e8a4e4 stringutil: move generic string helpers to new module Yuya Nishihara <yuya@tcha.org> parents: 37082 diff changeset	21 from .. import (
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	22 encoding,
ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	23 error,
28818 6041fb8f2da8 pycompat: add empty and queue to handle py3 divergence timeless <timeless@mozdev.org> parents: 28497 diff changeset	24 pycompat,
27358 ac839ee45b6a util: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27357 diff changeset	25 )
37010 8453699a1f21 util: observable proxy objects for sockets Gregory Szorc <gregory.szorc@gmail.com> parents: 36991 diff changeset	26
38474 96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	27 # regex special chars pulled from https://bugs.python.org/issue29995
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	28 # which was part of Python 3.7.
38477 de275ab362cb stringutil: update list of re-special characters to include &~ Augie Fackler <augie@google.com> parents: 38474 diff changeset	29 _respecial = pycompat.bytestr(b'()[]{}?*+-\|^$\\.&~# \t\n\r\v\f')
38474 96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	30 _regexescapemap = {ord(i): (b'\\' + i).decode('latin1') for i in _respecial}
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	31
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	32 def reescape(pat):
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	33 """Drop-in replacement for re.escape."""
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	34 # NOTE: it is intentional that this works on unicodes and not
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	35 # bytes, as it's only possible to do the escaping with
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	36 # unicode.translate, not bytes.translate. Sigh.
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	37 wantuni = True
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	38 if isinstance(pat, bytes):
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	39 wantuni = False
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	40 pat = pat.decode('latin1')
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	41 pat = pat.translate(_regexescapemap)
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	42 if wantuni:
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	43 return pat
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	44 return pat.encode('latin1')
96f65bdf0bf4 stringutil: add a new function to do minimal regex escaping Augie Fackler <augie@google.com> parents: 38264 diff changeset	45
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	46 def pprint(o, bprefix=False, indent=0):
37300 2f859ad7ed8c stringutil: add function to pretty print an object Gregory Szorc <gregory.szorc@gmail.com> parents: 37290 diff changeset	47 """Pretty print an object."""
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	48 return b''.join(pprintgen(o, bprefix=bprefix, indent=indent))
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	49
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	50 def pprintgen(o, bprefix=False, indent=0, _level=1):
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	51 """Pretty print an object to a generator of atoms.
39353 0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	52
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	53 ``bprefix`` is a flag influencing whether bytestrings are preferred with
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	54 a ``b''`` prefix.
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	55
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	56 ``indent`` controls whether collections and nested data structures
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	57 span multiple lines via the indentation amount in spaces. By default,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	58 no newlines are emitted.
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	59 """
39353 0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	60
37619 68132a95df31 stringutil: support more types with pprint() Gregory Szorc <gregory.szorc@gmail.com> parents: 37476 diff changeset	61 if isinstance(o, bytes):
37750 f7194c925003 stringutil: make b prefixes on string output optional Augie Fackler <augie@google.com> parents: 37749 diff changeset	62 if bprefix:
39353 0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	63 yield "b'%s'" % escapestr(o)
0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	64 else:
0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	65 yield "'%s'" % escapestr(o)
37619 68132a95df31 stringutil: support more types with pprint() Gregory Szorc <gregory.szorc@gmail.com> parents: 37476 diff changeset	66 elif isinstance(o, bytearray):
68132a95df31 stringutil: support more types with pprint() Gregory Szorc <gregory.szorc@gmail.com> parents: 37476 diff changeset	67 # codecs.escape_encode() can't handle bytearray, so escapestr fails
68132a95df31 stringutil: support more types with pprint() Gregory Szorc <gregory.szorc@gmail.com> parents: 37476 diff changeset	68 # without coercion.
39353 0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	69 yield "bytearray['%s']" % escapestr(bytes(o))
37300 2f859ad7ed8c stringutil: add function to pretty print an object Gregory Szorc <gregory.szorc@gmail.com> parents: 37290 diff changeset	70 elif isinstance(o, list):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	71 if not o:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	72 yield '[]'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	73 return
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	74
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	75 yield '['
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	76
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	77 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	78 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	79 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	80
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	81 for i, a in enumerate(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	82 for chunk in pprintgen(a, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	83 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	84 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	85
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	86 if i + 1 < len(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	87 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	88 yield ',\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	89 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	90 else:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	91 yield ', '
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	92
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	93 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	94 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	95 yield ' ' * ((_level - 1) * indent)
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	96
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	97 yield ']'
37300 2f859ad7ed8c stringutil: add function to pretty print an object Gregory Szorc <gregory.szorc@gmail.com> parents: 37290 diff changeset	98 elif isinstance(o, dict):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	99 if not o:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	100 yield '{}'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	101 return
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	102
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	103 yield '{'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	104
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	105 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	106 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	107 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	108
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	109 for i, (k, v) in enumerate(sorted(o.items())):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	110 for chunk in pprintgen(k, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	111 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	112 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	113
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	114 yield ': '
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	115
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	116 for chunk in pprintgen(v, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	117 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	118 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	119
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	120 if i + 1 < len(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	121 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	122 yield ',\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	123 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	124 else:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	125 yield ', '
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	126
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	127 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	128 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	129 yield ' ' * ((_level - 1) * indent)
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	130
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	131 yield '}'
39051 2aebe138ef6e stringutil: teach pprint about sets Augie Fackler <augie@google.com> parents: 38783 diff changeset	132 elif isinstance(o, set):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	133 if not o:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	134 yield 'set([])'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	135 return
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	136
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	137 yield 'set(['
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	138
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	139 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	140 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	141 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	142
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	143 for i, k in enumerate(sorted(o)):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	144 for chunk in pprintgen(k, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	145 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	146 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	147
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	148 if i + 1 < len(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	149 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	150 yield ',\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	151 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	152 else:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	153 yield ', '
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	154
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	155 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	156 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	157 yield ' ' * ((_level - 1) * indent)
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	158
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	159 yield '])'
37932 bf6bb710b40f stringutil: teach pprint about tuples Augie Fackler <augie@google.com> parents: 37750 diff changeset	160 elif isinstance(o, tuple):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	161 if not o:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	162 yield '()'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	163 return
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	164
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	165 yield '('
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	166
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	167 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	168 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	169 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	170
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	171 for i, a in enumerate(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	172 for chunk in pprintgen(a, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	173 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	174 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	175
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	176 if i + 1 < len(o):
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	177 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	178 yield ',\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	179 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	180 else:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	181 yield ', '
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	182
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	183 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	184 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	185 yield ' ' * ((_level - 1) * indent)
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	186
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	187 yield ')'
39296 ce145f8eface stringutil: teach pprint() to recognize generators Gregory Szorc <gregory.szorc@gmail.com> parents: 39063 diff changeset	188 elif isinstance(o, types.GeneratorType):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	189 # Special case of empty generator.
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	190 try:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	191 nextitem = next(o)
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	192 except StopIteration:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	193 yield 'gen[]'
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	194 return
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	195
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	196 yield 'gen['
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	197
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	198 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	199 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	200 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	201
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	202 last = False
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	203
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	204 while not last:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	205 current = nextitem
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	206
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	207 try:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	208 nextitem = next(o)
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	209 except StopIteration:
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	210 last = True
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	211
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	212 for chunk in pprintgen(current, bprefix=bprefix, indent=indent,
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	213 _level=_level + 1):
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	214 yield chunk
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	215
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	216 if not last:
39378 0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	217 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	218 yield ',\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	219 yield ' ' * (_level * indent)
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	220 else:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	221 yield ', '
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	222
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	223 if indent:
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	224 yield '\n'
0f549da54379 stringutil: teach pprint() to indent Gregory Szorc <gregory.szorc@gmail.com> parents: 39354 diff changeset	225 yield ' ' * ((_level -1) * indent)
39354 5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	226
5ed7c6caf24d stringutil: emit multiple chunks when pretty printing Gregory Szorc <gregory.szorc@gmail.com> parents: 39353 diff changeset	227 yield ']'
37300 2f859ad7ed8c stringutil: add function to pretty print an object Gregory Szorc <gregory.szorc@gmail.com> parents: 37290 diff changeset	228 else:
39353 0d21b1f1722c stringutil: refactor core of pprint so it emits chunks Gregory Szorc <gregory.szorc@gmail.com> parents: 39296 diff changeset	229 yield pycompat.byterepr(o)
37300 2f859ad7ed8c stringutil: add function to pretty print an object Gregory Szorc <gregory.szorc@gmail.com> parents: 37290 diff changeset	230
38261 f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	231 def prettyrepr(o):
f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	232 """Pretty print a representation of a possibly-nested object"""
f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	233 lines = []
f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	234 rs = pycompat.byterepr(o)
38264 fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	235 p0 = p1 = 0
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	236 while p0 < len(rs):
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	237 # '... field=<type ... field=<type ...'
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	238 # ~~~~~~~~~~~~~~~~
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	239 # p0 p1 q0 q1
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	240 q0 = -1
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	241 q1 = rs.find('<', p1 + 1)
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	242 if q1 < 0:
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	243 q1 = len(rs)
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	244 elif q1 > p1 + 1 and rs.startswith('=', q1 - 1):
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	245 # backtrack for ' field=<'
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	246 q0 = rs.rfind(' ', p1 + 1, q1 - 1)
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	247 if q0 < 0:
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	248 q0 = q1
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	249 else:
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	250 q0 += 1 # skip ' '
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	251 l = rs.count('<', 0, p0) - rs.count('>', 0, p0)
38261 f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	252 assert l >= 0
38264 fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	253 lines.append((l, rs[p0:q0].rstrip()))
fbb2eddea4d2 stringutil: fix prettyrepr() to not orphan foo=<...> line Yuya Nishihara <yuya@tcha.org> parents: 38261 diff changeset	254 p0, p1 = q0, q1
38261 f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	255 return '\n'.join(' ' * l + s for l, s in lines)
f3033692ccef stringutil: promote smartset.prettyformat() to utility function Yuya Nishihara <yuya@tcha.org> parents: 37942 diff changeset	256
38576 a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	257 def buildrepr(r):
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	258 """Format an optional printable representation from unexpanded bits
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	259
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	260 ======== =================================
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	261 type(r) example
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	262 ======== =================================
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	263 tuple ('<not %r>', other)
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	264 bytes '<branch closed>'
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	265 callable lambda: '<branch %r>' % sorted(b)
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	266 object other
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	267 ======== =================================
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	268 """
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	269 if r is None:
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	270 return ''
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	271 elif isinstance(r, tuple):
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	272 return r[0] % pycompat.rapply(pycompat.maybebytestr, r[1:])
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	273 elif isinstance(r, bytes):
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	274 return r
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	275 elif callable(r):
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	276 return r()
a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	277 else:
39052 38409be2f521 stringutil: have buildrepr delegate to pprint for unknown types Augie Fackler <augie@google.com> parents: 39051 diff changeset	278 return pprint(r)
38576 a3130208db1c stringutil: move _formatsetrepr() from smartset Yuya Nishihara <yuya@tcha.org> parents: 38477 diff changeset	279
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 917 diff changeset	280 def binary(s):
6507 9699864de219 Let util.binary check entire data for \0 (issue1066, issue1079) Christian Ebert <blacktrash@gmx.net> parents: 6501 diff changeset	281 """return true if a string is binary data"""
8118 35f7fda52c92 util: return boolean result directly in util.binary Martin Geisler <mg@lazybytes.net> parents: 8011 diff changeset	282 return bool(s and '\0' in s)
6762 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	283
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	284 def stringmatcher(pattern, casesensitive=True):
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	285 """
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	286 accepts a string, possibly starting with 're:' or 'literal:' prefix.
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	287 returns the matcher name, pattern, and matcher function.
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	288 missing or unknown prefixes are treated as literal matches.
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	289
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	290 helper for tests:
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	291 >>> def test(pattern, *tests):
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	292 ... kind, pattern, matcher = stringmatcher(pattern)
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	293 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	294 >>> def itest(pattern, *tests):
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	295 ... kind, pattern, matcher = stringmatcher(pattern, casesensitive=False)
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	296 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	297
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	298 exact matching (no prefix):
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	299 >>> test(b'abcdefg', b'abc', b'def', b'abcdefg')
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	300 ('literal', 'abcdefg', [False, False, True])
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	301
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	302 regex matching ('re:' prefix)
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	303 >>> test(b're:a.+b', b'nomatch', b'fooadef', b'fooadefbar')
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	304 ('re', 'a.+b', [False, False, True])
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	305
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	306 force exact matches ('literal:' prefix)
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	307 >>> test(b'literal:re:foobar', b'foobar', b're:foobar')
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	308 ('literal', 're:foobar', [False, True])
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	309
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	310 unknown prefixes are ignored and treated as literals
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	311 >>> test(b'foo:bar', b'foo', b'bar', b'foo:bar')
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	312 ('literal', 'foo:bar', [False, False, True])
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	313
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	314 case insensitive regex matches
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	315 >>> itest(b're:A.+b', b'nomatch', b'fooadef', b'fooadefBar')
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	316 ('re', 'A.+b', [False, False, True])
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	317
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	318 case insensitive literal matches
34131 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34084 diff changeset	319 >>> itest(b'ABCDEFG', b'abc', b'def', b'abcdefg')
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	320 ('literal', 'ABCDEFG', [False, False, True])
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	321 """
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	322 if pattern.startswith('re:'):
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	323 pattern = pattern[3:]
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	324 try:
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	325 flags = 0
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	326 if not casesensitive:
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	327 flags = remod.I
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	328 regex = remod.compile(pattern, flags)
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	329 except remod.error as e:
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	330 raise error.ParseError(_('invalid regular expression: %s')
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	331 % e)
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	332 return 're', pattern, regex.search
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	333 elif pattern.startswith('literal:'):
7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	334 pattern = pattern[8:]
30773 c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	335
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	336 match = pattern.__eq__
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	337
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	338 if not casesensitive:
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	339 ipat = encoding.lower(pattern)
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	340 match = lambda s: ipat == encoding.lower(s)
c390b40fe1d7 util: teach stringmatcher to handle forced case insensitive matches Matt Harbison <matt_harbison@yahoo.com> parents: 30761 diff changeset	341 return 'literal', pattern, match
26481 7d132557e44a util: extract stringmatcher() from revset Matt Harbison <matt_harbison@yahoo.com> parents: 26480 diff changeset	342
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	343 def shortuser(user):
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	344 """Return a short representation of a user name or email address."""
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	345 f = user.find('@')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	346 if f >= 0:
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	347 user = user[:f]
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	348 f = user.find('<')
e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	349 if f >= 0:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	350 user = user[f + 1:]
3176 7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	351 f = user.find(' ')
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	352 if f >= 0:
7492b33bdd9f shortuser should stop before the first space character. Thomas Arendsen Hein <thomas@intevation.de> parents: 3147 diff changeset	353 user = user[:f]
3533 bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	354 f = user.find('.')
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	355 if f >= 0:
bb44489b901f shortname: truncate at '.' too Matt Mackall <mpm@selenic.com> parents: 3466 diff changeset	356 user = user[:f]
1903 e4abeafd6eb1 move shortuser into util module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1635 diff changeset	357 return user
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1903 1882 diff changeset	358
16360 e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	359 def emailuser(user):
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	360 """Return the user portion of an email address."""
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	361 f = user.find('@')
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	362 if f >= 0:
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	363 user = user[:f]
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	364 f = user.find('<')
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	365 if f >= 0:
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	366 user = user[f + 1:]
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	367 return user
e5788269741a templates/filters: extracting the user portion of an email address Matteo Capobianco <m.capobianco@gmail.com> parents: 15720 diff changeset	368
5975 75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	369 def email(author):
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	370 '''get email of author.'''
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	371 r = author.find('>')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	372 if r == -1:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	373 r = None
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	374 return author[author.find('<') + 1:r]
5975 75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5949 diff changeset	375
37155 fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	376 def person(author):
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	377 """Returns the name before an email address,
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	378 interpreting it as per RFC 5322
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	379
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	380 >>> person(b'foo@bar')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	381 'foo'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	382 >>> person(b'Foo Bar <foo@bar>')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	383 'Foo Bar'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	384 >>> person(b'"Foo Bar" <foo@bar>')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	385 'Foo Bar'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	386 >>> person(b'"Foo \"buz\" Bar" <foo@bar>')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	387 'Foo "buz" Bar'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	388 >>> # The following are invalid, but do exist in real-life
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	389 ...
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	390 >>> person(b'Foo "buz" Bar <foo@bar>')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	391 'Foo "buz" Bar'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	392 >>> person(b'"Foo Bar <foo@bar>')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	393 'Foo Bar'
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	394 """
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	395 if '@' not in author:
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	396 return author
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	397 f = author.find('<')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	398 if f != -1:
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	399 return author[:f].strip(' "').replace('\\"', '"')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	400 f = author.find('@')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	401 return author[:f].replace('.', ' ')
fb7140f1d09d stringutil: move person function from templatefilters Connor Sheehan <sheehan@mozilla.com> parents: 37154 diff changeset	402
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	403 @attr.s(hash=True)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	404 class mailmapping(object):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	405 '''Represents a username/email key or value in
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	406 a mailmap file'''
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	407 email = attr.ib()
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	408 name = attr.ib(default=None)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	409
37246 0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	410 def _ismailmaplineinvalid(names, emails):
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	411 '''Returns True if the parsed names and emails
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	412 in a mailmap entry are invalid.
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	413
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	414 >>> # No names or emails fails
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	415 >>> names, emails = [], []
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	416 >>> _ismailmaplineinvalid(names, emails)
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	417 True
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	418 >>> # Only one email fails
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	419 >>> emails = [b'email@email.com']
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	420 >>> _ismailmaplineinvalid(names, emails)
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	421 True
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	422 >>> # One email and one name passes
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	423 >>> names = [b'Test Name']
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	424 >>> _ismailmaplineinvalid(names, emails)
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	425 False
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	426 >>> # No names but two emails passes
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	427 >>> names = []
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	428 >>> emails = [b'proper@email.com', b'commit@email.com']
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	429 >>> _ismailmaplineinvalid(names, emails)
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	430 False
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	431 '''
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	432 return not emails or not names and len(emails) < 2
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	433
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	434 def parsemailmap(mailmapcontent):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	435 """Parses data in the .mailmap format
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	436
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	437 >>> mmdata = b"\\n".join([
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	438 ... b'# Comment',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	439 ... b'Name <commit1@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	440 ... b'<name@email.xx> <commit2@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	441 ... b'Name <proper@email.xx> <commit3@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	442 ... b'Name <proper@email.xx> Commit <commit4@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	443 ... ])
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	444 >>> mm = parsemailmap(mmdata)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	445 >>> for key in sorted(mm.keys()):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	446 ... print(key)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	447 mailmapping(email='commit1@email.xx', name=None)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	448 mailmapping(email='commit2@email.xx', name=None)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	449 mailmapping(email='commit3@email.xx', name=None)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	450 mailmapping(email='commit4@email.xx', name='Commit')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	451 >>> for val in sorted(mm.values()):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	452 ... print(val)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	453 mailmapping(email='commit1@email.xx', name='Name')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	454 mailmapping(email='name@email.xx', name=None)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	455 mailmapping(email='proper@email.xx', name='Name')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	456 mailmapping(email='proper@email.xx', name='Name')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	457 """
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	458 mailmap = {}
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	459
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	460 if mailmapcontent is None:
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	461 return mailmap
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	462
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	463 for line in mailmapcontent.splitlines():
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	464
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	465 # Don't bother checking the line if it is a comment or
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	466 # is an improperly formed author field
37246 0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	467 if line.lstrip().startswith('#'):
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	468 continue
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	469
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	470 # names, emails hold the parsed emails and names for each line
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	471 # name_builder holds the words in a persons name
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	472 names, emails = [], []
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	473 namebuilder = []
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	474
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	475 for element in line.split():
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	476 if element.startswith('#'):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	477 # If we reach a comment in the mailmap file, move on
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	478 break
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	479
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	480 elif element.startswith('<') and element.endswith('>'):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	481 # We have found an email.
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	482 # Parse it, and finalize any names from earlier
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	483 emails.append(element[1:-1]) # Slice off the "<>"
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	484
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	485 if namebuilder:
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	486 names.append(' '.join(namebuilder))
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	487 namebuilder = []
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	488
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	489 # Break if we have found a second email, any other
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	490 # data does not fit the spec for .mailmap
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	491 if len(emails) > 1:
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	492 break
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	493
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	494 else:
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	495 # We have found another word in the committers name
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	496 namebuilder.append(element)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	497
37246 0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	498 # Check to see if we have parsed the line into a valid form
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	499 # We require at least one email, and either at least one
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	500 # name or a second email
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	501 if _ismailmaplineinvalid(names, emails):
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	502 continue
0e7550b0964c stringutil: improve check for failed mailmap line parsing Connor Sheehan <sheehan@mozilla.com> parents: 37245 diff changeset	503
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	504 mailmapkey = mailmapping(
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	505 email=emails[-1],
54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	506 name=names[-1] if len(names) == 2 else None,
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	507 )
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	508
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	509 mailmap[mailmapkey] = mailmapping(
37245 54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	510 email=emails[0],
54b896f195d1 stringutil: rename local email/names variables to their plural forms Connor Sheehan <sheehan@mozilla.com> parents: 37210 diff changeset	511 name=names[0] if names else None,
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	512 )
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	513
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	514 return mailmap
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	515
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	516 def mapname(mailmap, author):
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	517 """Returns the author field according to the mailmap cache, or
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	518 the original author field.
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	519
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	520 >>> mmdata = b"\\n".join([
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	521 ... b'# Comment',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	522 ... b'Name <commit1@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	523 ... b'<name@email.xx> <commit2@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	524 ... b'Name <proper@email.xx> <commit3@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	525 ... b'Name <proper@email.xx> Commit <commit4@email.xx>',
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	526 ... ])
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	527 >>> m = parsemailmap(mmdata)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	528 >>> mapname(m, b'Commit <commit1@email.xx>')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	529 'Name <commit1@email.xx>'
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	530 >>> mapname(m, b'Name <commit2@email.xx>')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	531 'Name <name@email.xx>'
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	532 >>> mapname(m, b'Commit <commit3@email.xx>')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	533 'Name <proper@email.xx>'
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	534 >>> mapname(m, b'Commit <commit4@email.xx>')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	535 'Name <proper@email.xx>'
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	536 >>> mapname(m, b'Unknown Name <unknown@email.com>')
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	537 'Unknown Name <unknown@email.com>'
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	538 """
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	539 # If the author field coming in isn't in the correct format,
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	540 # or the mailmap is empty just return the original author field
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	541 if not isauthorwellformed(author) or not mailmap:
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	542 return author
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	543
37247 2ed180117f76 stringutil: edit comment to reflect actual data type name Connor Sheehan <sheehan@mozilla.com> parents: 37246 diff changeset	544 # Turn the user name into a mailmapping
37210 2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	545 commit = mailmapping(name=person(author), email=email(author))
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	546
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	547 try:
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	548 # Try and use both the commit email and name as the key
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	549 proper = mailmap[commit]
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	550
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	551 except KeyError:
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	552 # If the lookup fails, use just the email as the key instead
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	553 # We call this commit2 as not to erase original commit fields
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	554 commit2 = mailmapping(email=commit.email)
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	555 proper = mailmap.get(commit2, mailmapping(None, None))
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	556
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	557 # Return the author field with proper values filled in
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	558 return '%s <%s>' % (
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	559 proper.name if proper.name else commit.name,
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	560 proper.email if proper.email else commit.email,
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	561 )
2a2ce93e12f4 templatefuncs: add mailmap template function Connor Sheehan <sheehan@mozilla.com> parents: 37155 diff changeset	562
37154 f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	563 _correctauthorformat = remod.compile(br'^[^<]+\s\<[^<>]+@[^<>]+\>$')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	564
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	565 def isauthorwellformed(author):
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	566 '''Return True if the author field is well formed
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	567 (ie "Contributor Name <contrib@email.dom>")
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	568
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	569 >>> isauthorwellformed(b'Good Author <good@author.com>')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	570 True
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	571 >>> isauthorwellformed(b'Author <good@author.com>')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	572 True
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	573 >>> isauthorwellformed(b'Bad Author')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	574 False
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	575 >>> isauthorwellformed(b'Bad Author <author@author.com')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	576 False
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	577 >>> isauthorwellformed(b'Bad Author author@author.com')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	578 False
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	579 >>> isauthorwellformed(b'<author@author.com>')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	580 False
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	581 >>> isauthorwellformed(b'Bad Author <author>')
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	582 False
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	583 '''
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	584 return _correctauthorformat.match(author) is not None
f8e1f48de118 stringutil: add isauthorwellformed function Connor Sheehan <sheehan@mozilla.com> parents: 37083 diff changeset	585
3767 1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	586 def ellipsis(text, maxlength=400):
21857 86c2d792a4b7 util: replace 'ellipsis' implementation by 'encoding.trim' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21813 diff changeset	587 """Trim string to at most maxlength (default: 400) columns in display."""
86c2d792a4b7 util: replace 'ellipsis' implementation by 'encoding.trim' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21813 diff changeset	588 return encoding.trim(text, maxlength, ellipsis='...')
3767 1861fa38a6a7 Move ellipsis code to util.ellipsis() and improve maxlength handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 3721 diff changeset	589
31451 53865692a354 util: wrap s.encode('string_escape') call for future py3 compatibility Yuya Nishihara <yuya@tcha.org> parents: 31449 diff changeset	590 def escapestr(s):
39063 1419ba5e3b56 stringutil: if we get a memoryview in escapestr, coerce it to bytes Augie Fackler <augie@google.com> parents: 39052 diff changeset	591 if isinstance(s, memoryview):
1419ba5e3b56 stringutil: if we get a memoryview in escapestr, coerce it to bytes Augie Fackler <augie@google.com> parents: 39052 diff changeset	592 s = bytes(s)
31453 3b7a6941a6ef py3: call codecs.escape_encode() directly Yuya Nishihara <yuya@tcha.org> parents: 31451 diff changeset	593 # call underlying function of s.encode('string_escape') directly for
3b7a6941a6ef py3: call codecs.escape_encode() directly Yuya Nishihara <yuya@tcha.org> parents: 31451 diff changeset	594 # Python 3 compatibility
3b7a6941a6ef py3: call codecs.escape_encode() directly Yuya Nishihara <yuya@tcha.org> parents: 31451 diff changeset	595 return codecs.escape_encode(s)[0]
31451 53865692a354 util: wrap s.encode('string_escape') call for future py3 compatibility Yuya Nishihara <yuya@tcha.org> parents: 31449 diff changeset	596
31484 afb335353d28 util: wrap s.decode('string_escape') calls for future py3 compatibility Yuya Nishihara <yuya@tcha.org> parents: 31465 diff changeset	597 def unescapestr(s):
31485 cad95575dc46 py3: call codecs.escape_decode() directly Yuya Nishihara <yuya@tcha.org> parents: 31484 diff changeset	598 return codecs.escape_decode(s)[0]
31484 afb335353d28 util: wrap s.decode('string_escape') calls for future py3 compatibility Yuya Nishihara <yuya@tcha.org> parents: 31465 diff changeset	599
33682 1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	600 def forcebytestr(obj):
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	601 """Portably format an arbitrary object (e.g. exception) into a byte
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	602 string."""
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	603 try:
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	604 return pycompat.bytestr(obj)
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	605 except UnicodeEncodeError:
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	606 # non-ascii string, may be lossy
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	607 return pycompat.bytestr(encoding.strtolocal(str(obj)))
1d5e497c08b3 py3: convert arbitrary exception object to byte string more reliably Yuya Nishihara <yuya@tcha.org> parents: 33619 diff changeset	608
5291 23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	609 def uirepr(s):
23651848d638 extdiff: avoid repr() doubling paths backslashes under Windows Patrick Mezard <pmezard@gmail.com> parents: 5213 diff changeset	610 # Avoid double backslash in Windows path repr()
36266 1fa33bd848ee py3: fix bytes-unicode dance while building docstring of extdiff Yuya Nishihara <yuya@tcha.org> parents: 36235 diff changeset	611 return pycompat.byterepr(pycompat.bytestr(s)).replace(b'\\\\', b'\\')
7547 4949729ee9ee python implementation of diffstat Alexander Solovyov <piranha@piranha.org.ua> parents: 7537 diff changeset	612
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	613 # delay import of textwrap
37079 736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	614 def _MBTextWrapper(**kwargs):
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	615 class tw(textwrap.TextWrapper):
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	616 """
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	617 Extend TextWrapper for width-awareness.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	618
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	619 Neither number of 'bytes' in any encoding nor 'characters' is
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	620 appropriate to calculate terminal columns for specified string.
12957 9f2ac318b92e util: clarify purpose of MBTextWrapper class Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12938 diff changeset	621
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	622 Original TextWrapper implementation uses built-in 'len()' directly,
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	623 so overriding is needed to use width information of each characters.
12957 9f2ac318b92e util: clarify purpose of MBTextWrapper class Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12938 diff changeset	624
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	625 In addition, characters classified into 'ambiguous' width are
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17391 diff changeset	626 treated as wide in East Asian area, but as narrow in other.
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	627
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	628 This requires use decision to determine width of such characters.
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	629 """
15065 24a6c3f903bb util: wrap lines with multi-byte characters correctly (issue2943) Mads Kiilerich <mads@kiilerich.com> parents: 15024 diff changeset	630 def _cutdown(self, ucstr, space_left):
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	631 l = 0
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	632 colwidth = encoding.ucolwidth
38783 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38576 diff changeset	633 for i in pycompat.xrange(len(ucstr)):
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	634 l += colwidth(ucstr[i])
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	635 if space_left < l:
15065 24a6c3f903bb util: wrap lines with multi-byte characters correctly (issue2943) Mads Kiilerich <mads@kiilerich.com> parents: 15024 diff changeset	636 return (ucstr[:i], ucstr[i:])
24a6c3f903bb util: wrap lines with multi-byte characters correctly (issue2943) Mads Kiilerich <mads@kiilerich.com> parents: 15024 diff changeset	637 return ucstr, ''
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	638
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	639 # overriding of base class
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	640 def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	641 space_left = max(width - cur_len, 1)
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	642
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	643 if self.break_long_words:
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	644 cut, res = self._cutdown(reversed_chunks[-1], space_left)
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	645 cur_line.append(cut)
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	646 reversed_chunks[-1] = res
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	647 elif not cur_line:
d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	648 cur_line.append(reversed_chunks.pop())
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	649
26201 c5b2074ae8c0 util: capitalize Python in MBTextWrapper._wrap_chunks comment timeless@mozdev.org parents: 26126 diff changeset	650 # this overriding code is imported from TextWrapper of Python 2.6
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	651 # to calculate columns of string by 'encoding.ucolwidth()'
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	652 def _wrap_chunks(self, chunks):
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	653 colwidth = encoding.ucolwidth
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	654
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	655 lines = []
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	656 if self.width <= 0:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	657 raise ValueError("invalid width %r (must be > 0)" % self.width)
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	658
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	659 # Arrange in reverse order so items can be efficiently popped
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	660 # from a stack of chucks.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	661 chunks.reverse()
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	662
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	663 while chunks:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	664
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	665 # Start the list of chunks that will make up the current line.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	666 # cur_len is just the length of all the chunks in cur_line.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	667 cur_line = []
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	668 cur_len = 0
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	669
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	670 # Figure out which static string will prefix this line.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	671 if lines:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	672 indent = self.subsequent_indent
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	673 else:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	674 indent = self.initial_indent
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	675
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	676 # Maximum width for this line.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	677 width = self.width - len(indent)
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	678
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	679 # First chunk on line is whitespace -- drop it, unless this
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17391 diff changeset	680 # is the very beginning of the text (i.e. no lines started yet).
32527 47ce079b1afa util: look for empty-sysstr instead of empty-bytesstr in textwrap code Augie Fackler <raf@durin42.com> parents: 32462 diff changeset	681 if self.drop_whitespace and chunks[-1].strip() == r'' and lines:
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	682 del chunks[-1]
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	683
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	684 while chunks:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	685 l = colwidth(chunks[-1])
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	686
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	687 # Can at least squeeze this chunk onto the current line.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	688 if cur_len + l <= width:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	689 cur_line.append(chunks.pop())
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	690 cur_len += l
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	691
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	692 # Nope, this line is full.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	693 else:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	694 break
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	695
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	696 # The current line is full, and the next chunk is too big to
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	697 # fit on any line (not just this one).
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	698 if chunks and colwidth(chunks[-1]) > width:
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	699 self._handle_long_word(chunks, cur_line, cur_len, width)
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	700
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	701 # If the last chunk on this line is all whitespace, drop it.
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	702 if (self.drop_whitespace and
32527 47ce079b1afa util: look for empty-sysstr instead of empty-bytesstr in textwrap code Augie Fackler <raf@durin42.com> parents: 32462 diff changeset	703 cur_line and cur_line[-1].strip() == r''):
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	704 del cur_line[-1]
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	705
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	706 # Convert current line back to a string and store it in list
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	707 # of all lines (return value).
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	708 if cur_line:
32546 3b8155305fbe util: use sysstr.join instead of bytes.join in textwrap wrapper Augie Fackler <raf@durin42.com> parents: 32527 diff changeset	709 lines.append(indent + r''.join(cur_line))
15066 24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	710
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	711 return lines
24efa83d81cb i18n: calculate terminal columns by width information of each characters FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15065 diff changeset	712
37079 736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	713 global _MBTextWrapper
736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	714 _MBTextWrapper = tw
13316 d119403fd266 util: delay loading of textwrap Matt Mackall <mpm@selenic.com> parents: 13313 diff changeset	715 return tw(**kwargs)
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	716
12698 7aef77e74cf3 util: make wrap() require a width argument Matt Mackall <mpm@selenic.com> parents: 12689 diff changeset	717 def wrap(line, width, initindent='', hangindent=''):
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	718 maxindent = max(len(hangindent), len(initindent))
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	719 if width <= maxindent:
9417 4c3fb45123e5 util, minirst: do not crash with COLUMNS=0 Martin Geisler <mg@lazybytes.net> parents: 9397 diff changeset	720 # adjust for weird terminal size
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11256 diff changeset	721 width = max(78, maxindent + 1)
31338 a9a28ca17615 util: pass encoding.[encoding\|encodingmode] as unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31315 diff changeset	722 line = line.decode(pycompat.sysstr(encoding.encoding),
37080 bad90b80b315 util: adjust indent level in wrap() Yuya Nishihara <yuya@tcha.org> parents: 37079 diff changeset	723 pycompat.sysstr(encoding.encodingmode))
31338 a9a28ca17615 util: pass encoding.[encoding\|encodingmode] as unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31315 diff changeset	724 initindent = initindent.decode(pycompat.sysstr(encoding.encoding),
37080 bad90b80b315 util: adjust indent level in wrap() Yuya Nishihara <yuya@tcha.org> parents: 37079 diff changeset	725 pycompat.sysstr(encoding.encodingmode))
31338 a9a28ca17615 util: pass encoding.[encoding\|encodingmode] as unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31315 diff changeset	726 hangindent = hangindent.decode(pycompat.sysstr(encoding.encoding),
37080 bad90b80b315 util: adjust indent level in wrap() Yuya Nishihara <yuya@tcha.org> parents: 37079 diff changeset	727 pycompat.sysstr(encoding.encodingmode))
37079 736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	728 wrapper = _MBTextWrapper(width=width,
736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	729 initial_indent=initindent,
736024df4498 util: mark MBTextWrapper as private Yuya Nishihara <yuya@tcha.org> parents: 37078 diff changeset	730 subsequent_indent=hangindent)
31338 a9a28ca17615 util: pass encoding.[encoding\|encodingmode] as unicodes Pulkit Goyal <7895pulkit@gmail.com> parents: 31315 diff changeset	731 return wrapper.fill(line).encode(pycompat.sysstr(encoding.encoding))
8938 9b8c9266c59d commands: wrap short descriptions in 'hg help' Martin Geisler <mg@lazybytes.net> parents: 8785 diff changeset	732
12088 1f71dffabc53 parsebool: accept always as true and never as false Augie Fackler <durin42@gmail.com> parents: 12087 diff changeset	733 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, 'always': True,
1f71dffabc53 parsebool: accept always as true and never as false Augie Fackler <durin42@gmail.com> parents: 12087 diff changeset	734 '0': False, 'no': False, 'false': False, 'off': False,
1f71dffabc53 parsebool: accept always as true and never as false Augie Fackler <durin42@gmail.com> parents: 12087 diff changeset	735 'never': False}
12087 a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	736
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	737 def parsebool(s):
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	738 """Parse s into a boolean.
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	739
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	740 If s is not a valid boolean, returns None.
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	741 """
a88a4720c2f0 parsebool: create new function and use it for config parsing Augie Fackler <durin42@gmail.com> parents: 12086 diff changeset	742 return _booleans.get(s.lower(), None)
37290 cc5a040fe150 wireproto: syntax for encoding CBOR into frames Gregory Szorc <gregory.szorc@gmail.com> parents: 37247 diff changeset	743
37476 e9dea82ea1f3 wireproto: convert python literal to object without using unsafe eval() Yuya Nishihara <yuya@tcha.org> parents: 37322 diff changeset	744 def evalpythonliteral(s):
e9dea82ea1f3 wireproto: convert python literal to object without using unsafe eval() Yuya Nishihara <yuya@tcha.org> parents: 37322 diff changeset	745 """Evaluate a string containing a Python literal expression"""
e9dea82ea1f3 wireproto: convert python literal to object without using unsafe eval() Yuya Nishihara <yuya@tcha.org> parents: 37322 diff changeset	746 # We could backport our tokenizer hack to rewrite '' to u'' if we want
37681 3942bd8db8b2 stringutil: ast.literal_eval needs a unicode on py3 Augie Fackler <augie@google.com> parents: 37619 diff changeset	747 if pycompat.ispy3:
3942bd8db8b2 stringutil: ast.literal_eval needs a unicode on py3 Augie Fackler <augie@google.com> parents: 37619 diff changeset	748 return ast.literal_eval(s.decode('latin1'))
37476 e9dea82ea1f3 wireproto: convert python literal to object without using unsafe eval() Yuya Nishihara <yuya@tcha.org> parents: 37322 diff changeset	749 return ast.literal_eval(s)

Mercurial > public > mercurial-scm > hg

annotate mercurial/utils/stringutil.py @ 39878:3e896b51aa5d