Mercurial > hg

changeset 41226:0f2b8d51bfdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: include journal.narrowspec in transaction journal We had missed this file before, which led to it lying around after the transaction completed. Differential Revision: https://phab.mercurial-scm.org/D5556
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 10 Jan 2019 13:36:25 -0800
parents 44914de4e915
children b74481038438
files mercurial/localrepo.py tests/test-narrow-clone-stream.t
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Jan 08 09:50:40 2019 -0800
+++ b/mercurial/localrepo.py	Thu Jan 10 13:36:25 2019 -0800
@@ -1912,6 +1912,7 @@
 
     def _journalfiles(self):
         return ((self.svfs, 'journal'),
+                (self.svfs, 'journal.narrowspec'),
                 (self.vfs, 'journal.dirstate'),
                 (self.vfs, 'journal.branch'),
                 (self.vfs, 'journal.desc'),
--- a/tests/test-narrow-clone-stream.t	Tue Jan 08 09:50:40 2019 -0800
+++ b/tests/test-narrow-clone-stream.t	Thu Jan 10 13:36:25 2019 -0800
@@ -77,11 +77,11 @@
   00manifest.i
   data (tree flat-fncache !)
   fncache (tree flat-fncache !)
-  journal.narrowspec
   meta (tree !)
   narrowspec
   undo
   undo.backupfiles
+  undo.narrowspec
   undo.phaseroots
 
 Checking that repository has all the required data and not broken