statprof: separate functions and "line", assume 4 digit line numbers Previously, the profile output looked like this (I've removed many lines that are mostly inconsequential): ``` | 100.0% 0.02s hg: <module> line 43: dispatch.run() | 100.0% 0.02s dispatch.py: run line 115: status = dispatch(req) | 100.0% 0.02s dispatch.py: _runcatchfunc line 432: return _dispatch(req) \ 50.0% 0.01s dispatch.py: _dispatch line 1228: return runcommand( | 50.0% 0.01s dispatch.py: runcommand line 883: ret = _runcommand(ui, optio... | 50.0% 0.01s dispatch.py: _runcommand line 1240: return cmdfunc() | 50.0% 0.01s localrepo.py: __getitem__ line 1670: quick_access = self._quick_... | 50.0% 0.01s localrepo.py: _quick_access_changeidline 1650: return self._quick_access_c... | 50.0% 0.01s localrepo.py: __get__ line 179: return getattr(unfi, self.n... | 50.0% 0.01s util.py: __get__ line 1747: result = self.func(obj) | 50.0% 0.01s localrepo.py: _quick_access_changeid_wcline 1611: cl = self.unfiltered().chan... | 50.0% 0.01s localrepo.py: __get__ line 110: return super(_basefilecache... | 50.0% 0.01s util.py: __getattribute__line 245: self.__spec__.loader.exec_m... | 50.0% 0.01s <frozen importlib._bootstrap_external>: exec_moduleline 783: | 50.0% 0.01s <frozen importlib._bootstrap>: _call_with_frames_removedline 219: | 50.0% 0.01s changelog.py: <module> line 376: class changelog(revlog.revl... | 50.0% 0.01s util.py: __getattribute__line 245: self.__spec__.loader.exec_m... | 50.0% 0.01s <frozen importlib._bootstrap_external>: exec_moduleline 779: | 50.0% 0.01s <frozen importlib._bootstrap_external>: get_codeline 868: | 50.0% 0.01s <frozen importlib._bootstrap_external>: path_statsline 1012: | 50.0% 0.01s <frozen importlib._bootstrap_external>: _path_statline 87: ``` This has a few problems, though I'm only addressing some of them. 1. If the stuff before "line ###" is long, there's no separation between the function name and the "line" string. 2. If the stuff before "line ###" is really long, there's excessive separation between the "line" string and the line number. 3. We frequently have 4-digit line numbers, the code on the right wasn't dynamically indented and ended up quite messy looking. To solve these problems, I've added a ", " prefix before "line" iff it would otherwise not have any separation such as spaces. I've added a 'max' so that we never use a negative width (which is the cause of problem #2 above), and I've added a default assumption of 4 digit line numbers (but again using a 'max' so this shouldn't cause problems if we go beyond that. With these changes, it now looks like this: ``` | 100.0% 0.02s hg: <module> line 43: dispatch.run() | 100.0% 0.02s dispatch.py: run line 115: status = dispatch(req) | 100.0% 0.02s dispatch.py: _runcatchfunc line 432: return _dispatch(req) \ 50.0% 0.01s dispatch.py: _dispatch line 1228: return runcommand( | 50.0% 0.01s dispatch.py: runcommand line 883: ret = _runcommand(ui, optio... | 50.0% 0.01s dispatch.py: _runcommand line 1240: return cmdfunc() | 50.0% 0.01s localrepo.py: __getitem__ line 1670: quick_access = self._quick_... | 50.0% 0.01s localrepo.py: _quick_access_changeid, line 1650: return self._quick_access_c... | 50.0% 0.01s localrepo.py: __get__ line 179: return getattr(unfi, self.n... | 50.0% 0.01s util.py: __get__ line 1747: result = self.func(obj) | 50.0% 0.01s localrepo.py: _quick_access_changeid_wc, line 1611: cl = self.unfiltered().chan... | 50.0% 0.01s localrepo.py: __get__ line 110: return super(_basefilecache... | 50.0% 0.01s util.py: __getattribute__, line 245: self.__spec__.loader.exec_m... | 50.0% 0.01s <frozen importlib._bootstrap_external>: exec_module, line 783: | 50.0% 0.01s <frozen importlib._bootstrap>: _call_with_frames_removed, line 219: | 50.0% 0.01s changelog.py: <module> line 376: class changelog(revlog.revl... | 50.0% 0.01s util.py: __getattribute__, line 245: self.__spec__.loader.exec_m... | 50.0% 0.01s <frozen importlib._bootstrap_external>: exec_module, line 779: | 50.0% 0.01s <frozen importlib._bootstrap_external>: get_code, line 868: | 50.0% 0.01s <frozen importlib._bootstrap_external>: path_stats, line 1012: | 50.0% 0.01s <frozen importlib._bootstrap_external>: _path_stat, line 87: ``` Differential Revision: https://phab.mercurial-scm.org/D9511

     1

  $ hg init test

     2

  $ cd test

     3

  $ hg debugbuilddag '+2'

     4

  $ hg phase --public 0

     5

     6

  $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

     7

  $ cat hg.pid >> $DAEMON_PIDS

     8

  $ cd ..

     9

  $ hg init test2

    10

  $ cd test2

    11

  $ hg incoming http://foo:xyzzy@localhost:$HGPORT/

    12

  comparing with http://foo:***@localhost:$HGPORT/

    13

  changeset:   0:1ea73414a91b

    14

  user:        debugbuilddag

    15

  date:        Thu Jan 01 00:00:00 1970 +0000

    16

  summary:     r0

    17

    18

  changeset:   1:66f7d451a68b

    19

  tag:         tip

    20

  user:        debugbuilddag

    21

  date:        Thu Jan 01 00:00:01 1970 +0000

    22

  summary:     r1

    23

    24

  $ killdaemons.py

    25

    26

  $ cd ..

    27

  $ hg -R test --config server.view=immutable serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

    28

  $ cat hg.pid >> $DAEMON_PIDS

    29

  $ hg -R test2 incoming http://foo:xyzzy@localhost:$HGPORT/

    30

  comparing with http://foo:***@localhost:$HGPORT/

    31

  changeset:   0:1ea73414a91b

    32

  tag:         tip

    33

  user:        debugbuilddag

    34

  date:        Thu Jan 01 00:00:00 1970 +0000

    35

  summary:     r0

    36

    37

    38

Check same result using `experimental.extra-filter-revs`

    39

    40

  $ hg -R test --config experimental.extra-filter-revs='not public()' serve -p $HGPORT1 -d --pid-file=hg2.pid -E errors.log

    41

  $ cat hg2.pid >> $DAEMON_PIDS

    42

  $ hg -R test2 incoming http://foo:xyzzy@localhost:$HGPORT1/

    43

  comparing with http://foo:***@localhost:$HGPORT1/

    44

  changeset:   0:1ea73414a91b

    45

  tag:         tip

    46

  user:        debugbuilddag

    47

  date:        Thu Jan 01 00:00:00 1970 +0000

    48

  summary:     r0

    49

    50

  $ hg -R test --config experimental.extra-filter-revs='not public()' debugupdatecache

    51

  $ ls -1 test/.hg/cache/

    52

  branch2-base%89c45d2fa07e

    53

  branch2-immutable%89c45d2fa07e

    54

  branch2-served

    55

  branch2-served%89c45d2fa07e

    56

  branch2-served.hidden%89c45d2fa07e

    57

  branch2-visible%89c45d2fa07e

    58

  branch2-visible-hidden%89c45d2fa07e

    59

  hgtagsfnodes1

    60

  rbc-names-v1

    61

  rbc-revs-v1

    62

  tags2

    63

  tags2-served%89c45d2fa07e

    64

    65

cleanup

    66

    67

  $ cat errors.log

    68

  $ killdaemons.py