# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 1242598681 14400
# Node ID 1cf21a8c274b7b5bbef7b57893c5c3787432d0e1
# Parent  7ff36dc9f0b1e180d76fedd78835a8e9b5497d09
Adapt to upstream changes in pyfastimport.
- use parse(), not iter_commands()
- changeset hashes differ for streams with inline file contents

diff -r 7ff36dc9f0b1 -r 1cf21a8c274b hgfastimport/hgimport.py
--- a/hgfastimport/hgimport.py	Sat May 16 12:57:22 2009 -0400
+++ b/hgfastimport/hgimport.py	Sun May 17 18:18:01 2009 -0400
@@ -113,7 +113,7 @@
             self.ui.debug("reading fastimport source: %s\n" % source)
             f = open(source)
             p = parser.ImportParser(f)
-            self.processor.process(p.iter_commands)
+            self.processor.process(p.parse)
             f.close()
 
         self.parsed = True
diff -r 7ff36dc9f0b1 -r 1cf21a8c274b tests/test-fastimport-anonbranch.out
--- a/tests/test-fastimport-anonbranch.out	Sat May 16 12:57:22 2009 -0400
+++ b/tests/test-fastimport-anonbranch.out	Sun May 17 18:18:01 2009 -0400
@@ -11,25 +11,25 @@
 0 merge
 Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ...
 % log
-o    6:ca2d9acb975f
+o    6:0d34157f0c2f
 |\   merge
 | |
-| o  5:426c5bd79694
+| o  5:b1437926634f
 | |  modify foo
 | |
-o |  4:32f018ede0f8
+o |  4:3f6a069667a2
 | |  remove oog
 | |
-| o  3:7c78b201cf49
+| o  3:6c4eac9a38c2
 | |  modify bla
 | |
-o |  2:b4dd3ea3dee1
+o |  2:26171fc4359c
 |/   add oog
 |
-o  1:60da203876bc
+o  1:eda61aa1eb80
 |  modify foo, add bla
 |
-o  0:2eab317db71a
+o  0:984734388051
    initial revision
 
 % manifest at rev 0
@@ -52,14 +52,14 @@
 % contents of bla at rev 6
 blah blah
 % diff merge with first parent (rev 4:6)
-diff -r 32f018ede0f8 -r ca2d9acb975f bla
+diff -r 3f6a069667a2 -r 0d34157f0c2f bla
 --- a/bla	Thu Jan 10 21:23:00 2008 +0000
 +++ b/bla	Thu Jan 10 21:24:00 2008 +0000
 @@ -1,1 +1,1 @@
 -bla
 +blah blah
 % diff merge with second parent (rev 5:6)
-diff -r 426c5bd79694 -r ca2d9acb975f foo
+diff -r b1437926634f -r 0d34157f0c2f foo
 --- a/foo	Thu Jan 10 21:23:30 2008 +0000
 +++ b/foo	Thu Jan 10 21:24:00 2008 +0000
 @@ -1,1 +1,1 @@
diff -r 7ff36dc9f0b1 -r 1cf21a8c274b tests/test-fastimport-simple.out
--- a/tests/test-fastimport-simple.out	Sat May 16 12:57:22 2009 -0400
+++ b/tests/test-fastimport-simple.out	Sun May 17 18:18:01 2009 -0400
@@ -6,13 +6,13 @@
 0 add a line
 Removing blob dir 'HGTMP/test-fastimport-simple/simple/.hg/blobs' ...
 % hg log
-changeset:   1:777dd8cf7297
+changeset:   1:ec2bd7ac5b27
 tag:         tip
 user:        Example <example@example.org>
 date:        Thu Jan 10 21:20:01 2008 +0000
 summary:     add a line
 
-changeset:   0:1e4114af38f1
+changeset:   0:b7a8255f9622
 user:        Example <example@example.org>
 date:        Thu Jan 10 21:20:00 2008 +0000
 summary:     initial revision