fileset: add a lightweight file filtering language This patch was inspired by one that Jun Wu authored for the fb-experimental repo, to avoid using matcher for efficiency[1]. We want a way to specify what files will be converted to LFS at commit time. And per discussion, we also want to specify what files to skip, text diff, or merge in another config option. The current `lfs.threshold` config option could not satisfy complex needs. I'm putting it in a core package because Augie floated the idea of also using it for narrow and sparse. Yuya suggested farming out to fileset.parse(), which added support for more symbols. The only fileset element not supported here is 'negate'. (List isn't supported by filesets either.) I also changed the 'always' token to the 'all()' predicate for consistency, and introduced 'none()' to improve readability in a future tracked file based config. The extension operator was changed from '.' to '**', to match how recursive path globs are specified. Finally, I changed the path matcher from '/' to 'path:' at Yuya's suggestion, for consistency with matcher. Unfortunately, ':' is currently reserved in filesets, so this has to be quoted to be processed as a string instead of a symbol[2]. We should probably revisit that, because it's seriously ugly. But it's only used by an experimental extension, and I think using a file based config for LFS may drive some more tweaks, so I'm settling for this for now. I reserved all of the glob characters in fileset except '.' and '_' for the extension test because those are likely valid extension characters. Sample filter settings: all() # everything size(">20MB") # larger than 20MB !**.txt # except for .txt files **.zip | **.tar.gz | **.7z # some types of compressed files "path:bin" # files under "bin" in the project root [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-December/109387.html [2] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-January/109729.html

     1

Tests rebasing with part of the rebase set already in the

     2

destination (issue5422)

     3

     4

  $ cat >> $HGRCPATH <<EOF

     5

  > [extensions]

     6

  > rebase=

     7

  > drawdag=$TESTDIR/drawdag.py

     8

  > 

     9

  > [experimental]

    10

  > evolution.createmarkers=True

    11

  > evolution.allowunstable=True

    12

  > 

    13

  > [alias]

    14

  > tglog = log -G --template "{rev}: {node|short} {desc}"

    15

  > EOF

    16

    17

  $ rebasewithdag() {

    18

  >   N=`$PYTHON -c "print($N+1)"`

    19

  >   hg init repo$N && cd repo$N

    20

  >   hg debugdrawdag

    21

  >   hg rebase "$@" > _rebasetmp

    22

  >   r=$?

    23

  >   grep -v 'saved backup bundle' _rebasetmp

    24

  >   [ $r -eq 0 ] && hg tglog

    25

  >   cd ..

    26

  >   return $r

    27

  > }

    28

    29

Rebase two commits, of which one is already in the right place

    30

    31

  $ rebasewithdag -r C+D -d B <<EOF

    32

  > C

    33

  > |

    34

  > B D

    35

  > |/

    36

  > A

    37

  > EOF

    38

  rebasing 2:b18e25de2cf5 "D" (D)

    39

  already rebased 3:26805aba1e60 "C" (C tip)

    40

  o  4: fe3b4c6498fa D

    41

  |

    42

  | o  3: 26805aba1e60 C

    43

  |/

    44

  | x  2: b18e25de2cf5 D

    45

  | |

    46

  o |  1: 112478962961 B

    47

  |/

    48

  o  0: 426bada5c675 A

    49

    50

Can collapse commits even if one is already in the right place

    51

    52

  $ rebasewithdag --collapse -r C+D -d B <<EOF

    53

  > C

    54

  > |

    55

  > B D

    56

  > |/

    57

  > A

    58

  > EOF

    59

  rebasing 2:b18e25de2cf5 "D" (D)

    60

  rebasing 3:26805aba1e60 "C" (C tip)

    61

  o  4: a2493f4ace65 Collapsed revision

    62

  |  * D

    63

  |  * C

    64

  | x  3: 26805aba1e60 C

    65

  |/

    66

  | x  2: b18e25de2cf5 D

    67

  | |

    68

  o |  1: 112478962961 B

    69

  |/

    70

  o  0: 426bada5c675 A

    71

    72

Rebase with "holes". The commits after the hole should end up on the parent of

    73

the hole (B below), not on top of the destination (A).

    74

    75

  $ rebasewithdag -r B+D -d A <<EOF

    76

  > D

    77

  > |

    78

  > C

    79

  > |

    80

  > B

    81

  > |

    82

  > A

    83

  > EOF

    84

  already rebased 1:112478962961 "B" (B)

    85

  rebasing 3:f585351a92f8 "D" (D tip)

    86

  o  4: 1e6da8103bc7 D

    87

  |

    88

  | x  3: f585351a92f8 D

    89

  | |

    90

  | o  2: 26805aba1e60 C

    91

  |/

    92

  o  1: 112478962961 B

    93

  |

    94

  o  0: 426bada5c675 A

    95