##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r27618:5a988b3c default
r38829:6c8e3c84 default
Show More
lsprofcalltree.py
86 lines | 2.7 KiB | text/x-python | PythonLexer
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 """
lsprofcalltree.py - lsprof output which is readable by kcachegrind
Authors:
* David Allouche <david <at> allouche.net>
* Jp Calderone & Itamar Shtull-Trauring
* Johan Dahlin
This software may be used and distributed according to the terms
of the GNU General Public License, incorporated herein by reference.
"""
Gregory Szorc
lsprofcalltree: use print function...
r27618 from __future__ import absolute_import, print_function
Gregory Szorc
lsprofcalltree: use absolute_import
r27505
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 def label(code):
if isinstance(code, str):
return '~' + code # built-in functions ('~' sorts at the end)
else:
return '%s %s:%d' % (code.co_name,
code.co_filename,
code.co_firstlineno)
class KCacheGrind(object):
def __init__(self, profiler):
self.data = profiler.getstats()
self.out_file = None
def output(self, out_file):
self.out_file = out_file
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('events: Ticks', file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 self._print_summary()
for entry in self.data:
self._entry(entry)
def _print_summary(self):
max_cost = 0
for entry in self.data:
totaltime = int(entry.totaltime * 1000)
max_cost = max(max_cost, totaltime)
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('summary: %d' % max_cost, file=self.out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024
def _entry(self, entry):
out_file = self.out_file
code = entry.code
if isinstance(code, str):
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('fi=~', file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 else:
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('fi=%s' % code.co_filename, file=out_file)
print('fn=%s' % label(code), file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024
inlinetime = int(entry.inlinetime * 1000)
if isinstance(code, str):
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('0 ', inlinetime, file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 else:
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('%d %d' % (code.co_firstlineno, inlinetime), file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024
# recursive calls are counted in entry.calls
if entry.calls:
calls = entry.calls
else:
calls = []
if isinstance(code, str):
lineno = 0
else:
lineno = code.co_firstlineno
for subentry in calls:
self._subentry(lineno, subentry)
Gregory Szorc
lsprofcalltree: use print function...
r27618 print(file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024
def _subentry(self, lineno, subentry):
out_file = self.out_file
code = subentry.code
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('cfn=%s' % label(code), file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 if isinstance(code, str):
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('cfi=~', file=out_file)
print('calls=%d 0' % subentry.callcount, file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024 else:
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('cfi=%s' % code.co_filename, file=out_file)
print('calls=%d %d' % (
subentry.callcount, code.co_firstlineno), file=out_file)
Nicolas Dumazet
profiling: Adding support for kcachegrind output format, using lsprofcalltree
r8024
totaltime = int(subentry.totaltime * 1000)
Gregory Szorc
lsprofcalltree: use print function...
r27618 print('%d %d' % (lineno, totaltime), file=out_file)