Merge lp:~goneri/bzr-fastimport/goneri into lp:~bzr/bzr-fastimport/fastimport.dev

[Gonéri Le Bouder]

[Gonéri Le Bouder (goneri)]

Hi,

git-fast-export syntax in git 1.6 seems that have changed a bit. idrefs have now a ':' prefix. The first patch address that. The second fixes another crash I found when STDIN is empty.
With the bugs fixed by my branch. I can use git-bzr without problem with a git 1.6.

Best regards,

     Gonéri Le Bouder

[lp:~goneri/bzr-fastimport/goneri]

205. By Gonéri Le Bouder on 2009-08-15

fix the test suite

206. By Gonéri Le Bouder on 2009-08-15

drop a debug print

207. By Gonéri Le Bouder on 2009-08-15

put back the ':' in the export-marks

[Gonéri Le Bouder (goneri)]

Hi,

I updated my patch. ':' are not present internaly anymore. I think it's more clean this way since according to git-fastexport(1) the ':' is not part of the idref. I had to fix the testsuite because of that.
The testscript provided with Bug "#347729: git-bzr doesn't work" still work fine.

review: Needs Resubmitting

[lp:~goneri/bzr-fastimport/goneri]

208. By Gonéri Le Bouder on 2009-08-19

"committish" not always a :mark

[Jelmer Vernooij (jelmer)]

An alternative fix has landed, this is no longer necessary.

Unmerged revisions

208. By Gonéri Le Bouder on 2009-08-19

"committish" not always a :mark

207. By Gonéri Le Bouder on 2009-08-15

put back the ':' in the export-marks

206. By Gonéri Le Bouder on 2009-08-15

drop a debug print

205. By Gonéri Le Bouder on 2009-08-15

fix the test suite

204. By Gonéri Le Bouder on 2009-08-13

fix the compat with git fast-export

203. By Gonéri Le Bouder on 2009-08-13

avoid crash if input is empty

=== modified file 'commands.py'
--- commands.py	2009-08-07 07:55:02 +0000
+++ commands.py	2009-08-13 20:03:09 +0000
@@ -83,7 +83,7 @@
         if mark is None:
             self.id = '@%d' % lineno
         else:
-            self.id = ':' + mark
+            self.id = mark
         self._binary = ['data']
 
     def __repr__(self):
@@ -122,7 +122,7 @@
         if mark is None:
             self.id = '@%d' % lineno
         else:
-            self.id = ':%s' % mark
+            self.id = '%s' % mark
 
     def __repr__(self):
         if self.mark is None:

=== modified file 'parser.py'
--- parser.py	2009-08-07 13:19:29 +0000
+++ parser.py	2009-08-13 20:03:09 +0000
@@ -379,7 +379,7 @@
             dataref = None
             data = self._get_data('filemodify')
         else:
-            dataref = params[1]
+            dataref = params[1].lstrip(':'); # Don't take the first :
             data = None
         return commands.FileModifyCommand(path, kind, is_executable, dataref,
             data)
@@ -410,8 +410,8 @@
         line = self.next_line()
         if line is None:
             return None
-        elif line.startswith('from '):
-            return line[len('from '):]
+        elif line.startswith('from :'):
+            return line[len('from :'):]
         elif required_for:
             self.abort(errors.MissingSection, required_for, 'from')
         else:
@@ -423,8 +423,8 @@
         line = self.next_line()
         if line is None:
             return None
-        elif line.startswith('merge '):
-            return line[len('merge '):]
+        elif line.startswith('merge :'):
+            return line[len('merge :'):]
         else:
             self.push_line(line)
             return None

=== modified file 'processors/generic_processor.py'
--- processors/generic_processor.py	2009-08-07 13:17:00 +0000
+++ processors/generic_processor.py	2009-08-13 18:32:25 +0000
@@ -286,6 +286,10 @@
             marks_file.export_marks(self.params.get("export-marks"),
                 self.cache_mgr.revision_ids)
 
+        if self.cache_mgr.last_ref == None:
+            """Nothing to refresh"""
+            return
+
         # Update the branches
         self.note("Updating branch information ...")
         updater = branch_updater.BranchUpdater(self.repo, self.branch,