Merge lp:~jelmer/brz/mark-0 into lp:brz

[Jelmer Vernooij]

Support the '0' marker in fastimport.

[Martin Packman (gz)]

Sure, seems simple enough.

review: Approve

=== modified file 'breezy/plugins/fastimport/cache_manager.py'
--- breezy/plugins/fastimport/cache_manager.py	2017-06-05 20:48:31 +0000
+++ breezy/plugins/fastimport/cache_manager.py	2018-01-22 02:35:45 +0000
@@ -124,7 +124,9 @@
 
     def add_mark(self, mark, commit_id):
         assert mark[0] != ':'
+        is_new = (mark in self.marks)
         self.marks[mark] = commit_id
+        return is_new
 
     def lookup_committish(self, committish):
         """Resolve a 'committish' to a revision id.

=== modified file 'breezy/plugins/fastimport/processors/generic_processor.py'
--- breezy/plugins/fastimport/processors/generic_processor.py	2017-06-10 16:40:42 +0000
+++ breezy/plugins/fastimport/processors/generic_processor.py	2018-01-22 02:35:45 +0000
@@ -25,6 +25,7 @@
     errors,
     osutils,
     progress,
+    revision as _mod_revision,
     )
 from ....bzr.knitpack_repo import KnitPackRepository
 from ....trace import (
@@ -466,7 +467,7 @@
 
     def _init_id_map(self):
         """Load the id-map and check it matches the repository.
-        
+
         :return: the number of entries in the map
         """
         # Currently, we just check the size. In the future, we might
@@ -474,6 +475,9 @@
         # are identical as well.
         self.cache_mgr.marks, known = idmapfile.load_id_map(
             self.id_map_path)
+        if self.cache_mgr.add_mark('0', _mod_revision.NULL_REVISION):
+            known += 1
+
         existing_count = len(self.repo.all_revision_ids())
         if existing_count < known:
             raise plugin_errors.BadRepositorySize(known, existing_count)

=== modified file 'breezy/plugins/fastimport/tests/test_generic_processor.py'
--- breezy/plugins/fastimport/tests/test_generic_processor.py	2017-11-12 20:07:32 +0000
+++ breezy/plugins/fastimport/tests/test_generic_processor.py	2018-01-22 02:35:45 +0000
@@ -231,6 +231,16 @@
         handler.process(self.file_command_iter(path))
 
 
+class TestImportZeroMarker(TestCaseForGenericProcessor):
+
+    def test_tag(self):
+        handler, branch = self.get_handler()
+        def command_list():
+            committer = ['', '[e-mail]', time.time(), time.timezone]
+            yield commands.TagCommand('tag1', ':0', committer, "tag 1")
+        handler.process(command_list)
+
+
 class TestImportToPackModify(TestCaseForGenericProcessor):
 
     def file_command_iter(self, path, kind='file', content='aaa',

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-01-14 05:14:06 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-01-22 02:35:45 +0000
@@ -155,6 +155,8 @@
 * It is now possible to version files with backslashes in their name
   on platforms that support it. (Jelmer Vernooij, #81844)
 
+* Support '0' markers in fastimport plugin. (Jelmer Vernooij, #1744615)
+
 Documentation
 *************