##// END OF EJS Templates
store: exclude `undo.` nodemap's file from `walk`...
marmoute -
r48137:0b569c75 default
parent child Browse files
Show More
@@ -10,6 +10,7 b' from __future__ import absolute_import'
10 import errno
10 import errno
11 import functools
11 import functools
12 import os
12 import os
13 import re
13 import stat
14 import stat
14
15
15 from .i18n import _
16 from .i18n import _
@@ -395,6 +396,9 b" REVLOG_FILES_OTHER_EXT = (b'.d', b'.n', "
395 # deleted.
396 # deleted.
396 REVLOG_FILES_VOLATILE_EXT = (b'.n', b'.nd')
397 REVLOG_FILES_VOLATILE_EXT = (b'.n', b'.nd')
397
398
399 # some exception to the above matching
400 EXCLUDED = re.compile(b'.*undo\.[^/]+\.nd?$')
401
398
402
399 def is_revlog(f, kind, st):
403 def is_revlog(f, kind, st):
400 if kind != stat.S_IFREG:
404 if kind != stat.S_IFREG:
@@ -405,7 +409,7 b' def is_revlog(f, kind, st):'
405 def revlog_type(f):
409 def revlog_type(f):
406 if f.endswith(REVLOG_FILES_MAIN_EXT):
410 if f.endswith(REVLOG_FILES_MAIN_EXT):
407 return FILEFLAGS_REVLOG_MAIN
411 return FILEFLAGS_REVLOG_MAIN
408 elif f.endswith(REVLOG_FILES_OTHER_EXT):
412 elif f.endswith(REVLOG_FILES_OTHER_EXT) and EXCLUDED.match(f) is None:
409 t = FILETYPE_FILELOG_OTHER
413 t = FILETYPE_FILELOG_OTHER
410 if f.endswith(REVLOG_FILES_VOLATILE_EXT):
414 if f.endswith(REVLOG_FILES_VOLATILE_EXT):
411 t |= FILEFLAGS_VOLATILE
415 t |= FILEFLAGS_VOLATILE
@@ -988,8 +988,6 b' Performe the mix of clone and full refre'
988 $ touch $HG_TEST_STREAM_WALKED_FILE_2
988 $ touch $HG_TEST_STREAM_WALKED_FILE_2
989 $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
989 $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
990 $ cat clone-output-2
990 $ cat clone-output-2
991 adding [s] undo.backup.00manifest.n (70 bytes) (known-bad-output !)
992 adding [s] undo.backup.00changelog.n (70 bytes) (known-bad-output !)
993 adding [s] 00manifest.n (70 bytes)
991 adding [s] 00manifest.n (70 bytes)
994 adding [s] 00manifest-*.nd (118 KB) (glob)
992 adding [s] 00manifest-*.nd (118 KB) (glob)
995 adding [s] 00changelog.n (70 bytes)
993 adding [s] 00changelog.n (70 bytes)
General Comments 0
You need to be logged in to leave comments. Login now