Merge lp:~jelmer/brz/marks-export into lp:brz/3.1

[Jelmer Vernooij]

Fix marks file handling on Python 3.

Fix marks file handling on Python 3.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/182/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/183/

=== modified file 'breezy/plugins/fastimport/exporter.py'
--- breezy/plugins/fastimport/exporter.py	2020-01-26 04:41:46 +0000
+++ breezy/plugins/fastimport/exporter.py	2020-07-01 23:30:53 +0000
@@ -353,7 +353,7 @@
     def emit_baseline(self, revobj, ref):
         # Emit a full source tree of the first commit's parent
         mark = 1
-        self.revid_to_mark[revobj.revision_id] = mark
+        self.revid_to_mark[revobj.revision_id] = b"%d" % mark
         tree_old = self.branch.repository.revision_tree(
             breezy.revision.NULL_REVISION)
         [tree_new] = list(self._get_revision_trees([revobj.revision_id]))
@@ -362,12 +362,12 @@
         self.print_cmd(self._get_commit_command(ref, mark, revobj, file_cmds))
 
     def preprocess_commit(self, revid, revobj, ref):
-        if revid in self.revid_to_mark or revid in self.excluded_revisions:
-            return
+        if self.revid_to_mark.get(revid) or revid in self.excluded_revisions:
+            return []
         if revobj is None:
             # This is a ghost revision. Mark it as not found and next!
-            self.revid_to_mark[revid] = -1
-            return
+            self.revid_to_mark[revid] = None
+            return []
         # Get the primary parent
         # TODO: Consider the excluded revisions when deciding the parents.
         # Currently, a commit with parents that are excluded ought to be
@@ -379,9 +379,8 @@
             parent = revobj.parent_ids[0]
 
         # Print the commit
-        mark = len(self.revid_to_mark) + 1
-        self.revid_to_mark[revobj.revision_id] = mark
-
+        self.revid_to_mark[revobj.revision_id] = b"%d" % (
+            len(self.revid_to_mark) + 1)
         return [parent, revobj.revision_id]
 
     def emit_commit(self, revobj, ref, tree_old, tree_new):
@@ -449,7 +448,7 @@
                 continue
             try:
                 parent_mark = self.revid_to_mark[p]
-                non_ghost_parents.append(b":%d" % parent_mark)
+                non_ghost_parents.append(b":%s" % parent_mark)
             except KeyError:
                 # ghost - ignore
                 continue
@@ -669,4 +668,4 @@
                         self.warning('not creating tag %r as its name would not be '
                                      'valid in git.', git_ref)
                         continue
-                self.print_cmd(commands.ResetCommand(git_ref, b":%d" % mark))
+                self.print_cmd(commands.ResetCommand(git_ref, b":%s" % mark))
 
=== modified file 'breezy/plugins/fastimport/marks_file.py'
--- breezy/plugins/fastimport/marks_file.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/marks_file.py	2020-07-01 23:30:53 +0000
@@ -29,7 +29,7 @@
     """
     # Check that the file is readable and in the right format
     try:
-        f = open(filename, 'r')
+        f = open(filename, 'rb')
     except IOError:
         warning("Could not import marks file %s - not importing marks",
                 filename)
@@ -40,22 +40,22 @@
         revision_ids = {}
 
         line = f.readline()
-        if line == 'format=1\n':
+        if line == b'format=1\n':
             # Cope with old-style marks files
             # Read the branch info
             branch_names = {}
-            for string in f.readline().rstrip('\n').split('\0'):
+            for string in f.readline().rstrip(b'\n').split(b'\0'):
                 if not string:
                     continue
-                name, integer = string.rsplit('.', 1)
+                name, integer = string.rsplit(b'.', 1)
                 branch_names[name] = int(integer)
             line = f.readline()
 
         while line:
-            line = line.rstrip('\n')
-            mark, revid = line.split(' ', 1)
-            mark = mark.lstrip(':')
-            revision_ids[mark] = revid.encode('utf-8')
+            line = line.rstrip(b'\n')
+            mark, revid = line.split(b' ', 1)
+            mark = mark.lstrip(b':')
+            revision_ids[mark] = revid
             line = f.readline()
     finally:
         f.close()
@@ -69,7 +69,7 @@
     :param revision_ids: dictionary mapping marks -> bzr revision-ids
     """
     try:
-        f = open(filename, 'w')
+        f = open(filename, 'wb')
     except IOError:
         warning("Could not open export-marks file %s - not exporting marks",
                 filename)
@@ -77,8 +77,7 @@
 
     try:
         # Write the revision info
-        for mark in revision_ids:
-            f.write(':%s %s\n' % (mark.lstrip(b':').decode('utf-8'),
-                                  revision_ids[mark].decode('utf-8')))
+        for mark, revid in sorted(revision_ids.items()):
+            f.write(b':%s %s\n' % (mark.lstrip(b':'), revid))
     finally:
         f.close()
 
=== modified file 'breezy/plugins/fastimport/tests/__init__.py'
--- breezy/plugins/fastimport/tests/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/tests/__init__.py	2020-07-01 23:30:53 +0000
@@ -46,6 +46,7 @@
         'test_exporter',
         'test_branch_mapper',
         'test_generic_processor',
+        'test_marks_file',
         'test_revision_store',
         ]]
     loader = TestLoader()
 
=== added file 'breezy/plugins/fastimport/tests/test_marks_file.py'
--- breezy/plugins/fastimport/tests/test_marks_file.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/fastimport/tests/test_marks_file.py	2020-07-01 23:30:53 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) 2020 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the marks file methods."""
+
+from __future__ import absolute_import
+
+from .... import tests
+
+from .. import marks_file
+
+
+class TestMarksFile(tests.TestCaseWithTransport):
+
+    def test_read(self):
+        self.build_tree_contents([('marks', """\
+:1 jelmer@jelmer-rev1
+:2 [e-mail]-rev2
+""")])
+        self.assertEqual({
+            b'1': b'jelmer@jelmer-rev1',
+            b'2': b'[e-mail]-rev2',
+            }, marks_file.import_marks('marks'))
+
+    def test_write(self):
+        marks_file.export_marks('marks', {
+            b'1': b'jelmer@jelmer-rev1',
+            b'2': b'[e-mail]-rev2',
+            })
+        self.assertFileEqual("""\
+:1 jelmer@jelmer-rev1
+:2 [e-mail]-rev2
+""", 'marks')