Patchwork D5556: narrow: include journal.narrowspec in transaction journal

login
register
mail settings
Submitter phabricator
Date Jan. 16, 2019, 7:49 a.m.
Message ID <0794b63945793254d517262213eba7e6@localhost.localdomain>
Download mbox | patch
Permalink /patch/37776/
State Not Applicable
Headers show

Comments

phabricator - Jan. 16, 2019, 7:49 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0f2b8d51bfdf: narrow: include journal.narrowspec in transaction journal (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5556?vs=13143&id=13236

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

AFFECTED FILES
  mercurial/localrepo.py
  tests/test-narrow-clone-stream.t

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers, pulkit
Cc: mjpieters, mercurial-devel

Patch

diff --git a/tests/test-narrow-clone-stream.t b/tests/test-narrow-clone-stream.t
--- a/tests/test-narrow-clone-stream.t
+++ b/tests/test-narrow-clone-stream.t
@@ -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
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -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'),