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

#testcases tree flat-fncache flat-nofncache

     2

     3

Tests narrow stream clones

     4

     5

  $ . "$TESTDIR/narrow-library.sh"

     6

     7

#if tree

     8

  $ cat << EOF >> $HGRCPATH

     9

  > [experimental]

    10

  > treemanifest = 1

    11

  > EOF

    12

#endif

    13

    14

#if flat-nofncache

    15

  $ cat << EOF >> $HGRCPATH

    16

  > [format]

    17

  > usefncache = 0

    18

  > EOF

    19

#endif

    20

    21

Server setup

    22

    23

  $ hg init master

    24

  $ cd master

    25

  $ mkdir dir

    26

  $ mkdir dir/src

    27

  $ cd dir/src

    28

  $ for x in `$TESTDIR/seq.py 20`; do echo $x > "F$x"; hg add "F$x"; hg commit -m "Commit src $x"; done

    29

    30

  $ cd ..

    31

  $ mkdir tests

    32

  $ cd tests

    33

  $ for x in `$TESTDIR/seq.py 20`; do echo $x > "F$x"; hg add "F$x"; hg commit -m "Commit src $x"; done

    34

  $ cd ../../..

    35

    36

Trying to stream clone when the server does not support it

    37

    38

  $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/F10" --stream

    39

  streaming all changes

    40

  remote: abort: server does not support narrow stream clones

    41

  abort: pull failed on remote

    42

  [255]

    43

    44

Enable stream clone on the server

    45

    46

  $ echo "[experimental]" >> master/.hg/hgrc

    47

  $ echo "server.stream-narrow-clones=True" >> master/.hg/hgrc

    48

    49

Cloning a specific file when stream clone is supported

    50

    51

  $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/F10" --stream

    52

  streaming all changes

    53

  * files to transfer, * KB of data (glob)

    54

  transferred * KB in * seconds (* */sec) (glob)

    55

    56

  $ cd narrow

    57

  $ ls -A

    58

  .hg

    59

  $ hg tracked

    60

  I path:dir/src/F10

    61

    62

Making sure we have the correct set of requirements

    63

    64

  $ cat .hg/requires

    65

  dotencode (tree !)

    66

  dotencode (flat-fncache !)

    67

  fncache (tree !)

    68

  fncache (flat-fncache !)

    69

  generaldelta

    70

  narrowhg-experimental

    71

  revlogv1

    72

  sparserevlog

    73

  store

    74

  treemanifest (tree !)

    75

    76

Making sure store has the required files

    77

    78

  $ ls .hg/store/

    79

  00changelog.i

    80

  00manifest.i

    81

  data

    82

  fncache (tree !)

    83

  fncache (flat-fncache !)

    84

  meta (tree !)

    85

  narrowspec

    86

  undo

    87

  undo.backupfiles

    88

  undo.narrowspec

    89

  undo.phaseroots

    90

    91

Checking that repository has all the required data and not broken

    92

    93

  $ hg verify

    94

  checking changesets

    95

  checking manifests

    96

  checking directory manifests (tree !)

    97

  crosschecking files in changesets and manifests

    98

  checking files

    99

  checked 40 changesets with 1 changes to 1 files