# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1620090352 -7200
# Node ID a07381751dc9219b3478d7b52f01dfb1b9348ab7
# Parent  60668fce06d07d40034d56442baa787023e4872c
changelogv2: `copies-side-data` now implies `changelogv2`

To store information about file changes and copies only requires sidedata
support for the changelog. So we only enables `changelogv2`. This is less
impactful and should help us to ship the changeset centric copy tracing sooner.

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

diff -r 60668fce06d0 -r a07381751dc9 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue May 04 04:32:09 2021 +0200
+++ b/mercurial/localrepo.py	Tue May 04 03:05:52 2021 +0200
@@ -3529,8 +3529,7 @@
 
     # experimental config: format.exp-use-copies-side-data-changeset
     if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
-        requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
-        requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
+        requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
         requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
     if ui.configbool(b'experimental', b'treemanifest'):
         requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
diff -r 60668fce06d0 -r a07381751dc9 tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t	Tue May 04 04:32:09 2021 +0200
+++ b/tests/test-copies-chain-merge.t	Tue May 04 03:05:52 2021 +0200
@@ -1659,8 +1659,8 @@
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no    yes      no
-  revlog-v2:           no    yes      no
-  changelog-v2:        no     no      no
+  revlog-v2:           no     no      no
+  changelog-v2:        no    yes      no
   plain-cl-delta:     yes    yes     yes
   compression:        * (glob)
   compression-level:  default default default
@@ -1669,8 +1669,7 @@
   
   requirements
      preserved: * (glob)
-     removed: revlogv1
-     added: exp-copies-sidedata-changeset, exp-revlogv2.2
+     added: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - all-filelogs
@@ -1699,8 +1698,8 @@
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:          no    yes      no
-  revlog-v2:           no    yes      no
-  changelog-v2:        no     no      no
+  revlog-v2:           no     no      no
+  changelog-v2:        no    yes      no
   plain-cl-delta:     yes    yes     yes
   compression:        * (glob)
   compression-level:  default default default
@@ -1709,8 +1708,7 @@
   
   requirements
      preserved: * (glob)
-     removed: revlogv1
-     added: exp-copies-sidedata-changeset, exp-revlogv2.2
+     added: exp-changelog-v2, exp-copies-sidedata-changeset
   
   processed revlogs:
     - all-filelogs
diff -r 60668fce06d0 -r a07381751dc9 tests/test-copies-in-changeset.t
--- a/tests/test-copies-in-changeset.t	Tue May 04 04:32:09 2021 +0200
+++ b/tests/test-copies-in-changeset.t	Tue May 04 03:05:52 2021 +0200
@@ -42,8 +42,8 @@
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:         yes    yes      no
-  revlog-v2:          yes    yes      no
-  changelog-v2:        no     no      no
+  revlog-v2:           no     no      no
+  changelog-v2:       yes    yes      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
@@ -433,8 +433,8 @@
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:         yes    yes      no
-  revlog-v2:          yes    yes      no
-  changelog-v2:        no     no      no
+  revlog-v2:           no     no      no
+  changelog-v2:       yes    yes      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)
@@ -490,8 +490,8 @@
   persistent-nodemap:  no     no      no (no-rust !)
   persistent-nodemap: yes    yes      no (rust !)
   copies-sdc:         yes    yes      no
-  revlog-v2:          yes    yes      no
-  changelog-v2:        no     no      no
+  revlog-v2:           no     no      no
+  changelog-v2:       yes    yes      no
   plain-cl-delta:     yes    yes     yes
   compression:        zlib   zlib    zlib (no-zstd !)
   compression:        zstd   zstd    zstd (zstd !)