view tests/test-revset-legacy-lookup.t @ 42619:20d0e59be79b

tests: show the files fields of changelogs for many merges

I don't think there's coverage for many of the subtle cases, and I
found it hard to understand what the code is doing by reading it.  The
test takes 40s to run on a laptop, or 9s with --chg.

I have yet to find a description of what the files field is supposed
to be for merges. I thought it could be one of:
1. the files added/modified/removed relative to p1 (wouldn't seem
  useful, but `hg diff -c -r mergerev` has this behavior)
2. the files with filelog nodes not in either parent (i.e., what is
needed to create a bundle out of a commit)
3. the files added/removed/modified files by merge itself [1]

It's clearly not 1, because file contents merges are symmetric. It's
clearly not 2 because removed files and exec bit changes are
listed. It's also not 3 but I think it's intended to be 3 and the
differences are bugs.

Assuming 3, the test shows that, for merges, the list of files both
overapproximates and underapproximates. All the cases involve file
changes not in the filelog but in the manifest (existence of file
at revision, exec bit and file vs symlink).

I didn't look at all underapproximations, but they looked minor. The
two overapproximations are problematic though because they both cause
potentially long lists of files when merging cleanly.


[1] even what it means for the merge commit itself to change a file is
not completely trivial. A file in the merge being the same as in one
of the parent is too lax as it would consider that merges change
nothing when they revert all the changes done on one side. The
criteria used in the test and in the next commit for "merge didn't
touch a file" is:
- the parents and the merge all have the same file
- or, one parent didn't touch the file and the other parent contains
  the same file as the merge

Differential Revision: https://phab.mercurial-scm.org/D6612

  $ 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]