| durin42 | |
| pulkit |
| hg-reviewers |
It seems the factor 20 is less than the frequency of " < \d" compared
to " \d > ".
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/revsetbenchmarks.py (4 lines) | |||
| M | hgext/histedit.py (2 lines) | |||
| M | hgext/patchbomb.py (6 lines) | |||
| M | hgext/shelve.py (2 lines) | |||
| M | mercurial/cmdutil.py (2 lines) | |||
| M | mercurial/debugcommands.py (2 lines) | |||
| M | mercurial/obsolete.py (4 lines) | |||
| M | mercurial/templatefilters.py (2 lines) | |||
| M | mercurial/util.py (6 lines) |
| elif factor < 2: | elif factor < 2: | ||||
| return '%3i%%' % (factor * 100) | return '%3i%%' % (factor * 100) | ||||
| elif factor < 10: | elif factor < 10: | ||||
| return 'x%3.1f' % factor | return 'x%3.1f' % factor | ||||
| elif factor < 1000: | elif factor < 1000: | ||||
| return '%4s' % ('x%i' % factor) | return '%4s' % ('x%i' % factor) | ||||
| else: | else: | ||||
| order = int(math.log(factor)) + 1 | order = int(math.log(factor)) + 1 | ||||
| while 1 < math.log(factor): | while math.log(factor) > 1: | ||||
| factor //= 0 | factor //= 0 | ||||
| return 'x%ix%i' % (factor, order) | return 'x%ix%i' % (factor, order) | ||||
| def formattiming(value): | def formattiming(value): | ||||
| """format a value to strictly 8 char, dropping some precision if needed""" | """format a value to strictly 8 char, dropping some precision if needed""" | ||||
| if value < 10**7: | if value < 10**7: | ||||
| return ('%.6f' % value)[:8] | return ('%.6f' % value)[:8] | ||||
| else: | else: | ||||
| out.append('%6d' % data[var]['count']) | out.append('%6d' % data[var]['count']) | ||||
| print(mask % (idx, ' '.join(out))) | print(mask % (idx, ' '.join(out))) | ||||
| def printheader(variants, maxidx, verbose=False, relative=False): | def printheader(variants, maxidx, verbose=False, relative=False): | ||||
| header = [' ' * (idxwidth(maxidx) + 1)] | header = [' ' * (idxwidth(maxidx) + 1)] | ||||
| for var in variants: | for var in variants: | ||||
| if not var: | if not var: | ||||
| var = 'iter' | var = 'iter' | ||||
| if 8 < len(var): | if len(var) > 8: | ||||
| var = var[:3] + '..' + var[-3:] | var = var[:3] + '..' + var[-3:] | ||||
| header.append('%-8s' % var) | header.append('%-8s' % var) | ||||
| if relative: | if relative: | ||||
| header.append(' ') | header.append(' ') | ||||
| if verbose: | if verbose: | ||||
| header.append('%-8s' % 'comb') | header.append('%-8s' % 'comb') | ||||
| header.append('%-8s' % 'user') | header.append('%-8s' % 'user') | ||||
| header.append('%-8s' % 'sys') | header.append('%-8s' % 'sys') | ||||
| if revs: | if revs: | ||||
| revs = [repo.lookup(rev) for rev in revs] | revs = [repo.lookup(rev) for rev in revs] | ||||
| outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) | outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) | ||||
| if not outgoing.missing: | if not outgoing.missing: | ||||
| raise error.Abort(_('no outgoing ancestors')) | raise error.Abort(_('no outgoing ancestors')) | ||||
| roots = list(repo.revs("roots(%ln)", outgoing.missing)) | roots = list(repo.revs("roots(%ln)", outgoing.missing)) | ||||
| if 1 < len(roots): | if len(roots) > 1: | ||||
| msg = _('there are ambiguous outgoing revisions') | msg = _('there are ambiguous outgoing revisions') | ||||
| hint = _("see 'hg help histedit' for more detail") | hint = _("see 'hg help histedit' for more detail") | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| return repo[roots[0]].node() | return repo[roots[0]].node() | ||||
| @command('histedit', | @command('histedit', | ||||
| [('', 'commands', '', | [('', 'commands', '', | ||||
| _('read history edits from the specified file'), _('FILE')), | _('read history edits from the specified file'), _('FILE')), | ||||
| introconfig = ui.config('patchbomb', 'intro') | introconfig = ui.config('patchbomb', 'intro') | ||||
| if opts.get('intro') or opts.get('desc'): | if opts.get('intro') or opts.get('desc'): | ||||
| intro = True | intro = True | ||||
| elif introconfig == 'always': | elif introconfig == 'always': | ||||
| intro = True | intro = True | ||||
| elif introconfig == 'never': | elif introconfig == 'never': | ||||
| intro = False | intro = False | ||||
| elif introconfig == 'auto': | elif introconfig == 'auto': | ||||
| intro = 1 < number | intro = number > 1 | ||||
| else: | else: | ||||
| ui.write_err(_('warning: invalid patchbomb.intro value "%s"\n') | ui.write_err(_('warning: invalid patchbomb.intro value "%s"\n') | ||||
| % introconfig) | % introconfig) | ||||
| ui.write_err(_('(should be one of always, never, auto)\n')) | ui.write_err(_('(should be one of always, never, auto)\n')) | ||||
| intro = 1 < number | intro = number > 1 | ||||
| return intro | return intro | ||||
| def _formatflags(ui, repo, rev, flags): | def _formatflags(ui, repo, rev, flags): | ||||
| """build flag string optionally by template""" | """build flag string optionally by template""" | ||||
| tmpl = ui.config('patchbomb', 'flagtemplate') | tmpl = ui.config('patchbomb', 'flagtemplate') | ||||
| if not tmpl: | if not tmpl: | ||||
| return ' '.join(flags) | return ' '.join(flags) | ||||
| out = util.stringio() | out = util.stringio() | ||||
| else: | else: | ||||
| out = [repo[r] for r in revs] | out = [repo[r] for r in revs] | ||||
| known = publicpeer.known(h.node() for h in out) | known = publicpeer.known(h.node() for h in out) | ||||
| missing = [] | missing = [] | ||||
| for idx, h in enumerate(out): | for idx, h in enumerate(out): | ||||
| if not known[idx]: | if not known[idx]: | ||||
| missing.append(h) | missing.append(h) | ||||
| if missing: | if missing: | ||||
| if 1 < len(missing): | if len(missing) > 1: | ||||
| msg = _('public "%s" is missing %s and %i others') | msg = _('public "%s" is missing %s and %i others') | ||||
| msg %= (publicurl, missing[0], len(missing) - 1) | msg %= (publicurl, missing[0], len(missing) - 1) | ||||
| else: | else: | ||||
| msg = _('public url %s is missing %s') | msg = _('public url %s is missing %s') | ||||
| msg %= (publicurl, missing[0]) | msg %= (publicurl, missing[0]) | ||||
| missingrevs = [ctx.rev() for ctx in missing] | missingrevs = [ctx.rev() for ctx in missing] | ||||
| revhint = ' '.join('-r %s' % h | revhint = ' '.join('-r %s' % h | ||||
| for h in repo.set('heads(%ld)', missingrevs)) | for h in repo.set('heads(%ld)', missingrevs)) | ||||
| repo.vfs.unlinkpath(cls._filename, ignoremissing=True) | repo.vfs.unlinkpath(cls._filename, ignoremissing=True) | ||||
| def cleanupoldbackups(repo): | def cleanupoldbackups(repo): | ||||
| vfs = vfsmod.vfs(repo.vfs.join(backupdir)) | vfs = vfsmod.vfs(repo.vfs.join(backupdir)) | ||||
| maxbackups = repo.ui.configint('shelve', 'maxbackups') | maxbackups = repo.ui.configint('shelve', 'maxbackups') | ||||
| hgfiles = [f for f in vfs.listdir() | hgfiles = [f for f in vfs.listdir() | ||||
| if f.endswith('.' + patchextension)] | if f.endswith('.' + patchextension)] | ||||
| hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles]) | hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles]) | ||||
| if 0 < maxbackups and maxbackups < len(hgfiles): | if maxbackups > 0 and maxbackups < len(hgfiles): | ||||
| bordermtime = hgfiles[-maxbackups][0] | bordermtime = hgfiles[-maxbackups][0] | ||||
| else: | else: | ||||
| bordermtime = None | bordermtime = None | ||||
| for mtime, f in hgfiles[:len(hgfiles) - maxbackups]: | for mtime, f in hgfiles[:len(hgfiles) - maxbackups]: | ||||
| if mtime == bordermtime: | if mtime == bordermtime: | ||||
| # keep it, because timestamp can't decide exact order of backups | # keep it, because timestamp can't decide exact order of backups | ||||
| continue | continue | ||||
| base = f[:-(1 + len(patchextension))] | base = f[:-(1 + len(patchextension))] | ||||
| merging is committed. | merging is committed. | ||||
| This returns baseformname with '.merge' appended if it is a merge, | This returns baseformname with '.merge' appended if it is a merge, | ||||
| otherwise '.normal' is appended. | otherwise '.normal' is appended. | ||||
| """ | """ | ||||
| if isinstance(ctxorbool, bool): | if isinstance(ctxorbool, bool): | ||||
| if ctxorbool: | if ctxorbool: | ||||
| return baseformname + ".merge" | return baseformname + ".merge" | ||||
| elif 1 < len(ctxorbool.parents()): | elif len(ctxorbool.parents()) > 1: | ||||
| return baseformname + ".merge" | return baseformname + ".merge" | ||||
| return baseformname + ".normal" | return baseformname + ".normal" | ||||
| def getcommiteditor(edit=False, finishdesc=None, extramsg=None, | def getcommiteditor(edit=False, finishdesc=None, extramsg=None, | ||||
| editform='', **opts): | editform='', **opts): | ||||
| """get appropriate commit message editor according to '--edit' option | """get appropriate commit message editor according to '--edit' option | ||||
| numdeltas = numrevs - numfull - numempty - numsemi | numdeltas = numrevs - numfull - numempty - numsemi | ||||
| numoprev = numprev - nump1prev - nump2prev | numoprev = numprev - nump1prev - nump2prev | ||||
| totalrawsize = datasize[2] | totalrawsize = datasize[2] | ||||
| datasize[2] /= numrevs | datasize[2] /= numrevs | ||||
| fulltotal = fullsize[2] | fulltotal = fullsize[2] | ||||
| fullsize[2] /= numfull | fullsize[2] /= numfull | ||||
| semitotal = semisize[2] | semitotal = semisize[2] | ||||
| snaptotal = {} | snaptotal = {} | ||||
| if 0 < numsemi: | if numsemi > 0: | ||||
| semisize[2] /= numsemi | semisize[2] /= numsemi | ||||
| for depth in snapsizedepth: | for depth in snapsizedepth: | ||||
| snaptotal[depth] = snapsizedepth[depth][2] | snaptotal[depth] = snapsizedepth[depth][2] | ||||
| snapsizedepth[depth][2] /= numsnapdepth[depth] | snapsizedepth[depth][2] /= numsnapdepth[depth] | ||||
| deltatotal = deltasize[2] | deltatotal = deltasize[2] | ||||
| if numdeltas > 0: | if numdeltas > 0: | ||||
| deltasize[2] /= numdeltas | deltasize[2] /= numdeltas | ||||
| with repo.transaction('add-obsolescence-marker') as tr: | with repo.transaction('add-obsolescence-marker') as tr: | ||||
| markerargs = [] | markerargs = [] | ||||
| for rel in relations: | for rel in relations: | ||||
| predecessors = rel[0] | predecessors = rel[0] | ||||
| if not isinstance(predecessors, tuple): | if not isinstance(predecessors, tuple): | ||||
| # preserve compat with old API until all caller are migrated | # preserve compat with old API until all caller are migrated | ||||
| predecessors = (predecessors,) | predecessors = (predecessors,) | ||||
| if 1 < len(predecessors) and len(rel[1]) != 1: | if len(predecessors) > 1 and len(rel[1]) != 1: | ||||
| msg = 'Fold markers can only have 1 successors, not %d' | msg = 'Fold markers can only have 1 successors, not %d' | ||||
| raise error.ProgrammingError(msg % len(rel[1])) | raise error.ProgrammingError(msg % len(rel[1])) | ||||
| for prec in predecessors: | for prec in predecessors: | ||||
| sucs = rel[1] | sucs = rel[1] | ||||
| localmetadata = metadata.copy() | localmetadata = metadata.copy() | ||||
| if 2 < len(rel): | if len(rel) > 2: | ||||
| localmetadata.update(rel[2]) | localmetadata.update(rel[2]) | ||||
| if not prec.mutable(): | if not prec.mutable(): | ||||
| raise error.Abort(_("cannot obsolete public changeset: %s") | raise error.Abort(_("cannot obsolete public changeset: %s") | ||||
| % prec, | % prec, | ||||
| hint="see 'hg help phases' for details") | hint="see 'hg help phases' for details") | ||||
| nprec = prec.node() | nprec = prec.node() | ||||
| nsucs = tuple(s.node() for s in sucs) | nsucs = tuple(s.node() for s in sucs) | ||||
| def findparas(): | def findparas(): | ||||
| start = 0 | start = 0 | ||||
| while True: | while True: | ||||
| m = para_re.search(text, start) | m = para_re.search(text, start) | ||||
| if not m: | if not m: | ||||
| uctext = encoding.unifromlocal(text[start:]) | uctext = encoding.unifromlocal(text[start:]) | ||||
| w = len(uctext) | w = len(uctext) | ||||
| while 0 < w and uctext[w - 1].isspace(): | while w > 0 and uctext[w - 1].isspace(): | ||||
| w -= 1 | w -= 1 | ||||
| yield (encoding.unitolocal(uctext[:w]), | yield (encoding.unitolocal(uctext[:w]), | ||||
| encoding.unitolocal(uctext[w:])) | encoding.unitolocal(uctext[w:])) | ||||
| break | break | ||||
| yield text[start:m.start(0)], m.group(1) | yield text[start:m.start(0)], m.group(1) | ||||
| start = m.end(1) | start = m.end(1) | ||||
| return "".join([stringutil.wrap(space_re.sub(' ', | return "".join([stringutil.wrap(space_re.sub(' ', | ||||
| return self._frombuffer(size) | return self._frombuffer(size) | ||||
| def unbufferedread(self, size): | def unbufferedread(self, size): | ||||
| if not self._eof and self._lenbuf == 0: | if not self._eof and self._lenbuf == 0: | ||||
| self._fillbuffer(max(size, _chunksize)) | self._fillbuffer(max(size, _chunksize)) | ||||
| return self._frombuffer(min(self._lenbuf, size)) | return self._frombuffer(min(self._lenbuf, size)) | ||||
| def readline(self, *args, **kwargs): | def readline(self, *args, **kwargs): | ||||
| if 1 < len(self._buffer): | if len(self._buffer) > 1: | ||||
| # this should not happen because both read and readline end with a | # this should not happen because both read and readline end with a | ||||
| # _frombuffer call that collapse it. | # _frombuffer call that collapse it. | ||||
| self._buffer = [''.join(self._buffer)] | self._buffer = [''.join(self._buffer)] | ||||
| self._lenbuf = len(self._buffer[0]) | self._lenbuf = len(self._buffer[0]) | ||||
| lfi = -1 | lfi = -1 | ||||
| if self._buffer: | if self._buffer: | ||||
| lfi = self._buffer[-1].find('\n') | lfi = self._buffer[-1].find('\n') | ||||
| while (not self._eof) and lfi < 0: | while (not self._eof) and lfi < 0: | ||||
| self._fillbuffer() | self._fillbuffer() | ||||
| if self._buffer: | if self._buffer: | ||||
| lfi = self._buffer[-1].find('\n') | lfi = self._buffer[-1].find('\n') | ||||
| size = lfi + 1 | size = lfi + 1 | ||||
| if lfi < 0: # end of file | if lfi < 0: # end of file | ||||
| size = self._lenbuf | size = self._lenbuf | ||||
| elif 1 < len(self._buffer): | elif len(self._buffer) > 1: | ||||
| # we need to take previous chunks into account | # we need to take previous chunks into account | ||||
| size += self._lenbuf - len(self._buffer[-1]) | size += self._lenbuf - len(self._buffer[-1]) | ||||
| return self._frombuffer(size) | return self._frombuffer(size) | ||||
| def _frombuffer(self, size): | def _frombuffer(self, size): | ||||
| """return at most 'size' data from the buffer | """return at most 'size' data from the buffer | ||||
| The data are removed from the buffer.""" | The data are removed from the buffer.""" | ||||
| if size == 0 or not self._buffer: | if size == 0 or not self._buffer: | ||||
| return '' | return '' | ||||
| buf = self._buffer[0] | buf = self._buffer[0] | ||||
| if 1 < len(self._buffer): | if len(self._buffer) > 1: | ||||
| buf = ''.join(self._buffer) | buf = ''.join(self._buffer) | ||||
| data = buf[:size] | data = buf[:size] | ||||
| buf = buf[len(data):] | buf = buf[len(data):] | ||||
| if buf: | if buf: | ||||
| self._buffer = [buf] | self._buffer = [buf] | ||||
| self._lenbuf = len(buf) | self._lenbuf = len(buf) | ||||
| else: | else: | ||||