Mercurial > hg-git

changeset 877:be105c4dda7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git_handler.save_map: pass in the map file explicitly for easier testing
author Siddharth Agarwal <sid0@fb.com>
date Thu, 09 Apr 2015 20:24:10 -0700
parents b250e7b3ad71
children 99c42969417f
files hggit/git_handler.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py	Thu Apr 09 20:14:33 2015 -0700
+++ b/hggit/git_handler.py	Thu Apr 09 20:24:10 2015 -0700
@@ -185,8 +185,8 @@
         self._map_git_real = map_git_real
         self._map_hg_real = map_hg_real
 
-    def save_map(self):
-        file = self.repo.opener(self.map_file, 'w+', atomictemp=True)
+    def save_map(self, map_file):
+        file = self.repo.opener(map_file, 'w+', atomictemp=True)
         for hgsha, gitsha in sorted(self._map_hg.iteritems()):
             file.write("%s %s\n" % (gitsha, hgsha))
         # If this complains, atomictempfile no longer has close
@@ -232,7 +232,7 @@
         filteredrefs = self.filter_min_date(refs)
         self.import_git_objects(remote_name, filteredrefs)
         self.update_hg_bookmarks(refs)
-        self.save_map()
+        self.save_map(self.map_file)
 
     def fetch(self, remote, heads):
         refs = self.fetch_pack(remote, heads)
@@ -258,7 +258,7 @@
                 if bms:
                     bookmarks.setcurrent(self.repo, bms[0])
 
-        self.save_map()
+        self.save_map(self.map_file)
 
         if imported == 0:
             return 0
@@ -283,7 +283,7 @@
             self.export_hg_tags()
             self.update_references()
         finally:
-            self.save_map()
+            self.save_map(self.map_file)
 
     def get_refs(self, remote):
         self.export_commits()