Patchwork D10662: changelogv2: `copies-side-data` now implies `changelogv2`

login
register
mail settings
Submitter phabricator
Date May 4, 2021, 2:20 p.m.
Message ID <differential-rev-PHID-DREV-isvuo4pgq6tu3rssmepq-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48982/
State Superseded
Headers show

Comments

phabricator - May 4, 2021, 2:20 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10662

AFFECTED FILES
  mercurial/localrepo.py
  tests/test-copies-chain-merge.t
  tests/test-copies-in-changeset.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-copies-in-changeset.t b/tests/test-copies-in-changeset.t
--- a/tests/test-copies-in-changeset.t
+++ b/tests/test-copies-in-changeset.t
@@ -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 !)
diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t
+++ b/tests/test-copies-chain-merge.t
@@ -1660,8 +1660,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
@@ -1670,8 +1670,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
@@ -1700,8 +1699,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
@@ -1710,8 +1709,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 --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -3523,8 +3523,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)