Rev 1830: (robey) updates for lsprof in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Jul 2 01:49:16 BST 2006
------------------------------------------------------------
revno: 1830
revision-id: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
parent: pqm at pqm.ubuntu.com-20060701184616-b0b6979d6f86a5a1
parent: robey at lag.net-20060701190333-f58465aec4bd3412
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-07-02 01:49:15 +0100
message:
(robey) updates for lsprof
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
merged: robey at lag.net-20060701190333-f58465aec4bd3412
parent: robey at lag.net-20060630063602-32b5927790ea757f
parent: pqm at pqm.ubuntu.com-20060701184616-b0b6979d6f86a5a1
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Sat 2006-07-01 12:03:33 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060630063602-32b5927790ea757f
parent: robey at lag.net-20060620175656-f6938f2267ccc2fe
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Thu 2006-06-29 23:36:02 -0700
message:
pull over some changes from the original lsprof
------------------------------------------------------------
merged: robey at lag.net-20060620175656-f6938f2267ccc2fe
parent: robey at lag.net-20060618235722-9e31e12dadff52a8
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Tue 2006-06-20 10:56:56 -0700
message:
when giving --lsprof-file, assume --lsprof
------------------------------------------------------------
merged: robey at lag.net-20060618235722-9e31e12dadff52a8
parent: robey at lag.net-20060618184203-f09b11e7466bab4e
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Sun 2006-06-18 16:57:22 -0700
message:
jam points out this import is superfluous
------------------------------------------------------------
merged: robey at lag.net-20060618184203-f09b11e7466bab4e
parent: robey at lag.net-20060612052416-52c92cf7ec9630cf
parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Sun 2006-06-18 11:42:03 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060612052416-52c92cf7ec9630cf
parent: robey at lag.net-20060518063731-f348648fe7bbedd7
parent: pqm at pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Sun 2006-06-11 22:24:16 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060518063731-f348648fe7bbedd7
parent: robey at lag.net-20060513210803-76618c4740588804
parent: pqm at pqm.ubuntu.com-20060518035414-0eeb99fb74b5436d
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Wed 2006-05-17 23:37:31 -0700
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at lag.net-20060513210803-76618c4740588804
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
parent: robey at lag.net-20060222173242-9756df7e2fa21eca
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Sat 2006-05-13 14:08:03 -0700
message:
merge patches from pre-knit branch
------------------------------------------------------------
merged: robey at lag.net-20060222173242-9756df7e2fa21eca
parent: robey at master-shake.local-20060203181820-6732bb55895a5c7d
parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.dev.lsprof
timestamp: Wed 2006-02-22 09:32:42 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at master-shake.local-20060203181820-6732bb55895a5c7d
parent: robey at dhcp-192-168-1-88.danger.com-20060202014206-bf6c5b6d352b93dd
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.lsprof
timestamp: Fri 2006-02-03 10:18:20 -0800
message:
patch from ddaa to add kcachegrind output-format support to lsprof
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060202014206-bf6c5b6d352b93dd
parent: robey at dhcp-192-168-1-88.danger.com-20060202012032-470e0c5616813e44
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.lsprof
timestamp: Wed 2006-02-01 17:42:06 -0800
message:
add threading support -- each thread created during an lsprof session gets its own profile object, and the Stats objects are attached to a 'threads' member of the final Stats object
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060202012032-470e0c5616813e44
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.lsprof
timestamp: Wed 2006-02-01 17:20:32 -0800
message:
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal)
More information about the bazaar-commits
mailing list