Merge lp:~jelmer/brz-git/remote-helper-fixes into lp:brz-git

[Jelmer Vernooij]

Various git remote helper fixes.

Various git remote helper fixes.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'fetch.py'
--- fetch.py	2018-03-02 01:59:40 +0000
+++ fetch.py	2018-03-08 02:55:28 +0000
@@ -624,7 +624,7 @@
             wants.add(git_sha)
         return self.get_determine_wants_heads(wants, include_tags=include_tags)
 
-    def fetch_objects(self, determine_wants, mapping, limit=None):
+    def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
         """Fetch objects from a remote server.
 
         :param determine_wants: determine_wants callback
@@ -699,7 +699,7 @@
         map(all_parents.update, parent_map.itervalues())
         return set(all_revs) - all_parents
 
-    def fetch_objects(self, determine_wants, mapping, limit=None):
+    def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
         """See `InterGitNonGitRepository`."""
         store = BazaarObjectStore(self.target, mapping)
         store.lock_write()
@@ -714,7 +714,7 @@
             try:
                 objects_iter = self.source.fetch_objects(
                     wants_recorder, graph_walker, store.get_raw,
-                    progress=lambda text: report_git_progress(pb, text))
+                    progress=lambda text: report_git_progress(pb, text),)
                 trace.mutter("Importing %d new revisions",
                              len(wants_recorder.wants))
                 (pack_hint, last_rev) = import_git_objects(self.target,
@@ -744,7 +744,7 @@
     """InterRepository that copies revisions from a local Git into a non-Git
     repository."""
 
-    def fetch_objects(self, determine_wants, mapping, limit=None):
+    def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
         """See `InterGitNonGitRepository`."""
         remote_refs = self.source.controldir.get_refs_container()
         wants = determine_wants(remote_refs)
@@ -790,13 +790,15 @@
             new_refs = update_refs(old_refs)
             ref_changes.update(new_refs)
             return [sha1 for (sha1, bzr_revid) in new_refs.itervalues()]
-        self.fetch_objects(determine_wants)
+        self.fetch_objects(determine_wants, lossy=lossy)
         for k, (git_sha, bzr_revid) in ref_changes.iteritems():
             self.target._git.refs[k] = git_sha
         new_refs = self.target.controldir.get_refs_container()
         return None, old_refs, new_refs
 
-    def fetch_objects(self, determine_wants, mapping=None, limit=None):
+    def fetch_objects(self, determine_wants, mapping=None, limit=None, lossy=False):
+        if lossy:
+            raise errors.LossyPushToSameVCS(self.source, self.target)
         if limit is not None:
             raise errors.FetchLimitUnsupported(self)
         graphwalker = self.target._git.get_graph_walker()

=== modified file 'git-remote-bzr.1'
--- git-remote-bzr.1	2017-11-15 21:34:24 +0000
+++ git-remote-bzr.1	2018-03-08 02:55:28 +0000
@@ -24,10 +24,10 @@
 breezy-git and git-remote-bzr are licensed under the GNU GPL, version 2 or later.
 .SH "SEE ALSO"
 .sp
-\fBgit-remote-helpers\fR(1), \fBbzr\fR(1)
+\fBgit-remote-helpers\fR(1), \fBbreezy\fR(1)
 .SH "BAZAAR"
 .sp
-Part of the \fBbzr\fR(1) suite
+Part of the \fBbreezy\fR(1) suite
 .SH "AUTHOR"
 .sp
-breezy-git, git-remote-bzr and this manual page were written by Jelmer Vernooij.
+breezy-git, git-remote-bzr and this manual page were written by Jelmer Vernooij.

=== modified file 'git_remote_helper.py'
--- git_remote_helper.py	2018-02-27 18:14:19 +0000
+++ git_remote_helper.py	2018-03-08 02:55:28 +0000
@@ -50,10 +50,12 @@
     GitRepository,
     )
 
+from ..fastimport import exporter as fastexporter
+
 try:
-    from ..fastimport import exporter as fastexporter
+    import fastimport
 except ImportError:
-    fastexporter = None
+    pass
 else:
     CAPABILITIES.append("import")
 
@@ -137,8 +139,8 @@
         self.batchcmd = "push"
 
     def cmd_import(self, outf, argv):
-        if fastexporter is None:
-            raise Exception("install bzr-fastimport for 'import' command support")
+        if "fastimport" in CAPABILITIES:
+            raise Exception("install fastimport for 'import' command support")
         dest_branch_name = ref_to_branch_name(argv[1])
         if dest_branch_name == "master":
             dest_branch_name = None