view tests/test-revset-legacy-lookup.t @ 40393:229d23cdb203

exchangev2: support fetching shallow files history This commit teaches the exchangev2 client code to handle fetching shallow files data. Only shallow fetching of files data is supported: shallow fetching of changeset and manifest data is explicitly not yet supported. Previously, we would fetch file revisions for changesets that were received by the current pull operation. In the new model, we calculate the set of "relevant" changesets given the pull depth and only fetch files data for those changesets. We also teach the "filesdata" command invocation to vary parameters as needed. The implementation here is far from complete or optimal. Subsequent pulls will end up re-fetching a lot of files data. But the application of this data should mostly be a no-op on the client, so it isn't a big deal. Depending on the order file revisions are fetched in, revisions could get inserted with the wrong revision number relationships. I think the best way to deal with this is to remove revision numbers from storage and to either dynamically derive them (by reconstructing a DAG from nodes/parents) or remove revision numbers from the file storage interface completely. A missing API that we'll likely want to write pretty soon is "ensure files for revision(s) are present." We can kind of cajole exchangev2.pull() to do this. But it isn't very efficient. For example, in simple cases like widening the store to obtain data for a single revision, it is probably more efficient to walk the manifest and find exactly which file revisions are missing and to make explicit requests for just their data. In more advanced cases, asking the server for all files data may be more efficient, even though it requires sending data the client already has. There is tons of room for future experimentation here. And TBH I'm not sure what the final state will be. Anyway, this commit gets us pretty close to being able to have shallow and narrow checkouts with exchangev2/sqlite storage. Close enough that a minimal extension should be able to provide fill in the gaps until the code in core stabilizes and there is a user-facing way to trigger the narrow/shallow bits from `hg clone` without also implying using of the narrow extension... Differential Revision: https://phab.mercurial-scm.org/D5169
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 19 Oct 2018 12:30:49 +0200
parents 29eb4cafeeb8
children ed84a4d48910
line wrap: on
line source


  $ cat >> $HGRCPATH << EOF
  > [ui]
  > logtemplate="{rev}:{node|short} {desc} [{tags}]\n"
  > EOF

  $ hg init legacy-lookup
  $ cd legacy-lookup
  $ echo a > a
  $ hg add a
  $ hg commit -m 'first'
  $ echo aa > a
  $ hg commit -m 'second'
  $ hg log -G
  @  1:43114e71eddd second [tip]
  |
  o  0:a87874c6ec31 first []
  

Create a tag that looks like a revset

  $ hg tag 'rev(0)'
  $ hg log -G
  @  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip]
  |
  o  1:43114e71eddd second [rev(0)]
  |
  o  0:a87874c6ec31 first []
  

See how various things are resolved
-----------------------------------

Revision numbers

  $ hg log -r '0'
  0:a87874c6ec31 first []
  $ hg log -r '1'
  1:43114e71eddd second [rev(0)]

"rev(x)" form (the one conflicting with the tags)
(resolved as a label)

  $ hg log -r 'rev(0)'
  1:43114e71eddd second [rev(0)]
  $ hg log -r 'rev(1)'
  1:43114e71eddd second [rev(0)]

same within a simple revspec
(still resolved as the label)

  $ hg log -r ':rev(0)'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  $ hg log -r 'rev(0):'
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip]

within a more advances revset
(still resolved as the label)

  $ hg log -r 'rev(0) and branch(default)'
  0:a87874c6ec31 first []

with explicit revset resolution
(still resolved as the label)

  $ hg log -r 'revset(rev(0))'
  0:a87874c6ec31 first []

some of the above with quote to force its resolution as a label

  $ hg log -r ':"rev(0)"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  $ hg log -r '"rev(0)":'
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd [tip]
  $ hg log -r '"rev(0)" and branch(default)'
  1:43114e71eddd second [rev(0)]

confusing bits within parents

  $ hg log -r '(rev(0))'
  0:a87874c6ec31 first []
  $ hg log -r '( rev(0))'
  0:a87874c6ec31 first []
  $ hg log -r '("rev(0)")'
  1:43114e71eddd second [rev(0)]

Test label with quote in them.

  $ hg tag '"foo"'

  $ hg log -r '"foo"'
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  $ hg log -r '("foo")'
  abort: unknown revision 'foo'!
  [255]
  $ hg log -r 'revset("foo")'
  abort: unknown revision 'foo'!
  [255]
  $ hg log -r '("\"foo\"")'
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  $ hg log -r 'revset("\"foo\"")'
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]

Test label with dash in them.

  $ hg tag 'foo-bar'

  $ hg log -r 'foo-bar'
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  $ hg log -r '(foo-bar)'
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  $ hg log -r '"foo-bar"'
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  $ hg log -r '("foo-bar")'
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]

Test label with + in them.

  $ hg tag 'foo+bar'

  $ hg log -r 'foo+bar'
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  $ hg log -r '(foo+bar)'
  abort: unknown revision 'foo'!
  [255]
  $ hg log -r 'revset(foo+bar)'
  abort: unknown revision 'foo'!
  [255]
  $ hg log -r '"foo+bar"'
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  $ hg log -r '("foo+bar")'
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]

Test tag with numeric version number.

  $ hg tag '1.2'

  $ hg log -r '1.2'
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r '(1.2)'
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r 'revset(1.2)'
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r '"1.2"'
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r '("1.2")'
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r '::"1.2"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  $ hg log -r '::1.2'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]

Test tag with parenthesis (but not a valid revset)

  $ hg tag 'release_4.1(candidate1)'

  $ hg log -r 'release_4.1(candidate1)'
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  $ hg log -r '(release_4.1(candidate1))'
  hg: parse error: unknown identifier: release_4.1
  [255]
  $ hg log -r 'revset(release_4.1(candidate1))'
  hg: parse error: unknown identifier: release_4.1
  [255]
  $ hg log -r '"release_4.1(candidate1)"'
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  $ hg log -r '("release_4.1(candidate1)")'
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  $ hg log -r '::"release_4.1(candidate1)"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  $ hg log -r '::release_4.1(candidate1)'
  hg: parse error: unknown identifier: release_4.1
  [255]

Test tag with parenthesis and other function like char

  $ hg tag 'release_4.1(arch=x86,arm)'

  $ hg log -r 'release_4.1(arch=x86,arm)'
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  $ hg log -r '(release_4.1(arch=x86,arm))'
  hg: parse error: unknown identifier: release_4.1
  [255]
  $ hg log -r 'revset(release_4.1(arch=x86,arm))'
  hg: parse error: unknown identifier: release_4.1
  [255]
  $ hg log -r '"release_4.1(arch=x86,arm)"'
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  $ hg log -r '("release_4.1(arch=x86,arm)")'
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  $ hg log -r '::"release_4.1(arch=x86,arm)"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  $ hg log -r '::release_4.1(arch=x86,arm)'
  hg: parse error: unknown identifier: release_4.1
  [255]

Test tag conflicting with revset function

  $ hg tag 'secret(team=foo,project=bar)'

  $ hg log -r 'secret(team=foo,project=bar)'
  8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)]
  $ hg log -r '(secret(team=foo,project=bar))'
  hg: parse error: secret takes no arguments
  [255]
  $ hg log -r 'revset(secret(team=foo,project=bar))'
  hg: parse error: secret takes no arguments
  [255]
  $ hg log -r '"secret(team=foo,project=bar)"'
  8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)]
  $ hg log -r '("secret(team=foo,project=bar)")'
  8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)]
  $ hg log -r '::"secret(team=foo,project=bar)"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)]
  $ hg log -r '::secret(team=foo,project=bar)'
  hg: parse error: secret takes no arguments
  [255]

Test tag with space

  $ hg tag 'my little version'

  $ hg log -r 'my little version'
  9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version]
  $ hg log -r '(my little version)'
  hg: parse error at 4: unexpected token: symbol
  ((my little version)
       ^ here)
  [255]
  $ hg log -r 'revset(my little version)'
  hg: parse error at 10: unexpected token: symbol
  (revset(my little version)
             ^ here)
  [255]
  $ hg log -r '"my little version"'
  9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version]
  $ hg log -r '("my little version")'
  9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version]
  $ hg log -r '::"my little version"'
  0:a87874c6ec31 first []
  1:43114e71eddd second [rev(0)]
  2:fb616635b18f Added tag rev(0) for changeset 43114e71eddd ["foo"]
  3:a50aae922707 Added tag "foo" for changeset fb616635b18f [foo-bar]
  4:bbf52b87b370 Added tag foo-bar for changeset a50aae922707 [foo+bar]
  5:ff42fde8edbb Added tag foo+bar for changeset bbf52b87b370 [1.2]
  6:db72e24fe069 Added tag 1.2 for changeset ff42fde8edbb [release_4.1(candidate1)]
  7:b29b25d7d687 Added tag release_4.1(candidate1) for changeset db72e24fe069 [release_4.1(arch=x86,arm)]
  8:6b2e2d4ea455 Added tag release_4.1(arch=x86,arm) for changeset b29b25d7d687 [secret(team=foo,project=bar)]
  9:269192bf8fc3 Added tag secret(team=foo,project=bar) for changeset 6b2e2d4ea455 [my little version]
  $ hg log -r '::my little version'
  hg: parse error at 5: invalid token
  (::my little version
        ^ here)
  [255]