diff tests/test-treemanifest.t @ 28240:1ac8ce137377

changegroup: fix treemanifests on merges The current code for generating treemanifest revisions takes the list of files in the changeset and finds the directories from them. This does not work for merges, since a merge may pick file A from one side and file B from another and neither of them would appear in the changeset's "files" list, but the manifest would still change. Fix this by instead walking the root manifest log for all needed revisions, storing all needed file and subdirectory revisions, then recursively visiting the subdirectories. This also turns out to be faster: cloning a version of hg core converted to treemanifests went from ~28s to ~19s (timing somewhat unfair: before this patch, timed until crash; after this patch, timed until manifests complete). The new algorithm is used only on treemanifest repos. Although it works equally well on flat manifests, we leave the iteration over files in the changeset for flat manifests for now.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Feb 2016 23:09:09 -0800
parents 408446e4b10c
children 515018f64c41
line wrap: on
line diff
--- a/tests/test-treemanifest.t	Sun Dec 27 20:21:37 2015 +0900
+++ b/tests/test-treemanifest.t	Fri Feb 12 23:09:09 2016 -0800
@@ -363,6 +363,13 @@
   added 11 changesets with 15 changes to 10 files (+3 heads)
   $ grep treemanifest clone/.hg/requires
   treemanifest
+  $ hg -R clone verify
+  checking changesets
+  checking manifests
+  checking directory manifests
+  crosschecking files in changesets and manifests
+  checking files
+  10 files, 11 changesets, 15 total revisions
 
 Create deeper repo with tree manifests.