match: optimize visitdir() for patterns matching only root directory Because _rootsanddirs() returns a list of directories to visit recursively and a list of directories to visit non-recursively. For patterns such as 'rootfilesin:foo/bar', we clearly need to visit the directory foo/bar, but we also need to visit its parents. The method therefore uses util.dirs() to find the parent directories of 'foo/bar'. That method does not include the root directory, but since we obviously need to visit the root directory, we always added '.' to the set of directories to visit non-recursively. The visitdir() method had special handling to consider set(['.']) to mean that no includes had been specified and would thus visit all directories. However, when the pattern is 'rootfilesin:.', set(['.']) is actually the real set of directories to visit and the special handling of that set meant that all directories got visited instead of just the root directory. The fix is simple: add '.' to the set of parent directories in _rootsanddirs() and stop treating set(['.']) specially. This makes hg files -r . -I rootfilesin:. in a treemanifest version of the Firefox repo go from 1.5s to 0.26s on warm disk (and a *much* bigger improvement on cold disk). Note that the -I is necessary for no good reason. We just haven't optimized visitdir() for regular (non-include, non-exclude) patterns yet.

     1

#require svn svn-bindings

     2

     3

  $ cat >> $HGRCPATH <<EOF

     4

  > [extensions]

     5

  > convert =

     6

  > EOF

     7

     8

  $ svnadmin create svn-repo

     9

  $ svnadmin load -q svn-repo < "$TESTDIR/svn/tags.svndump"

    10

    11

Convert

    12

  $ hg convert --datesort svn-repo A-hg

    13

  initializing destination A-hg repository

    14

  scanning source...

    15

  sorting...

    16

  converting...

    17

  5 init projA

    18

  4 adda

    19

  3 changea

    20

  2 changea2

    21

  1 changea3

    22

  0 changea

    23

  updating tags

    24

    25

  $ cd A-hg

    26

  $ hg log -G --template '{rev} {desc|firstline} tags: {tags}\n'

    27

  o  6 update tags tags: tip

    28

  |

    29

  o  5 changea tags: trunk.goodtag

    30

  |

    31

  o  4 changea3 tags:

    32

  |

    33

  o  3 changea2 tags: trunk.v1

    34

  |

    35

  o  2 changea tags:

    36

  |

    37

  o  1 adda tags:

    38

  |

    39

  o  0 init projA tags:

    40

    41

    42

  $ hg tags -q

    43

  tip

    44

  trunk.goodtag

    45

  trunk.v1

    46

    47

  $ cd ..

    48

    49

Convert without tags

    50

    51

  $ hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg

    52

  initializing destination A-notags-hg repository

    53

  scanning source...

    54

  sorting...

    55

  converting...

    56

  5 init projA

    57

  4 adda

    58

  3 changea

    59

  2 changea2

    60

  1 changea3

    61

  0 changea

    62

    63

  $ hg -R A-notags-hg tags -q

    64

  tip

    65