##// END OF EJS Templates
fix: add a -s option to format a revision and its descendants...
fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287

File last commit:

r43346:2372284d default
r45064:5205b46b default
Show More
catapipe.py
121 lines | 3.6 KiB | text/x-python | PythonLexer
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 #!/usr/bin/env python3
#
# Copyright 2018 Google LLC.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""Tool read primitive events from a pipe to produce a catapult trace.
Kyle Lippincott
catapult: add a bit more documentation on how to use catapult tracing...
r40526 Usage:
Terminal 1: $ catapipe.py /tmp/mypipe /tmp/trace.json
Terminal 2: $ HGCATAPULTSERVERPIPE=/tmp/mypipe hg root
<ctrl-c catapipe.py in Terminal 1>
$ catapult/tracing/bin/trace2html /tmp/trace.json # produce /tmp/trace.html
<open trace.html in your browser of choice; the WASD keys are very useful>
(catapult is located at https://github.com/catapult-project/catapult)
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 For now the event stream supports
START $SESSIONID ...
and
END $SESSIONID ...
events. Everything after the SESSIONID (which must not contain spaces)
is used as a label for the event. Events are timestamped as of when
they arrive in this process and are then used to produce catapult
traces that can be loaded in Chrome's about:tracing utility. It's
important that the event stream *into* this process stay simple,
because we have to emit it from the shell scripts produced by
run-tests.py.
Typically you'll want to place the path to the named pipe in the
HGCATAPULTSERVERPIPE environment variable, which both run-tests and hg
Kyle Lippincott
catapult: add a bit more documentation on how to use catapult tracing...
r40526 understand. To trace *only* run-tests, use HGTESTCATAPULTSERVERPIPE instead.
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 """
from __future__ import absolute_import, print_function
import argparse
import json
import os
Boris Feld
contrib: use a monotonic timer in catapipe...
r39550 import timeit
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288
_TYPEMAP = {
'START': 'B',
'END': 'E',
Augie Fackler
catapipe: add support for COUNTER events...
r42675 'COUNTER': 'C',
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 }
_threadmap = {}
Boris Feld
contrib: use a monotonic timer in catapipe...
r39550 # Timeit already contains the whole logic about which timer to use based on
# Python version and OS
timer = timeit.default_timer
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 def main():
parser = argparse.ArgumentParser()
Augie Fackler
formatting: blacken the codebase...
r43346 parser.add_argument(
'pipe',
type=str,
nargs=1,
help='Path of named pipe to create and listen on.',
)
parser.add_argument(
'output',
default='trace.json',
type=str,
nargs='?',
help='Path of json file to create where the traces ' 'will be stored.',
)
parser.add_argument(
'--debug',
default=False,
action='store_true',
help='Print useful debug messages',
)
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 args = parser.parse_args()
fn = args.pipe[0]
os.mkfifo(fn)
try:
with open(fn) as f, open(args.output, 'w') as out:
out.write('[\n')
Boris Feld
contrib: use a monotonic timer in catapipe...
r39550 start = timer()
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 while True:
ev = f.readline().strip()
if not ev:
continue
Boris Feld
contrib: use a monotonic timer in catapipe...
r39550 now = timer()
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 if args.debug:
print(ev)
verb, session, label = ev.split(' ', 2)
if session not in _threadmap:
_threadmap[session] = len(_threadmap)
Augie Fackler
catapipe: add support for COUNTER events...
r42675 if verb == 'COUNTER':
amount, label = label.split(' ', 1)
payload_args = {'value': int(amount)}
else:
payload_args = {}
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 pid = _threadmap[session]
Augie Fackler
catapipe: fix bug introduced when switching to the timer api...
r39971 ts_micros = (now - start) * 1000000
Augie Fackler
formatting: blacken the codebase...
r43346 out.write(
json.dumps(
{
"name": label,
"cat": "misc",
"ph": _TYPEMAP[verb],
"ts": ts_micros,
"pid": pid,
"tid": 1,
"args": payload_args,
}
)
)
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 out.write(',\n')
finally:
os.unlink(fn)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
contrib: new script to read events from a named pipe and emit catapult traces...
r39288 if __name__ == '__main__':
main()