Mercurial > hg > hg-fastimport
comparison hgfastimport/__init__.py @ 66:ae32828c68d7
Merge in Jelmer Vernooij's switch to python-fastimport over pyfastimport.
Better to use his maintained library than my dusty old forgotten one.
Incidentally, this merge deliberately leaves out efc96910ddf2 and
descendants: that change broke the tests.
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sun, 26 Jul 2015 14:32:32 -0400 |
| parents | 9275d497b7ea 76bd0ea8add3 |
| children | 6b716ecb1cf3 |
comparison
equal
deleted
inserted
replaced
| 65:b3faf593a471 | 66:ae32828c68d7 |
|---|---|
| 1 from mercurial import encoding | 1 from mercurial import encoding |
| 2 from mercurial.i18n import _ | 2 from mercurial.i18n import _ |
| 3 from hgext.convert import convcmd, hg | 3 from hgext.convert import convcmd, hg |
| 4 | 4 |
| 5 from fastimport import parser | |
| 6 from hgimport import fastimport_source | 5 from hgimport import fastimport_source |
| 7 | 6 |
| 8 def fastimport(ui, repo, *sources, **opts): | 7 def fastimport(ui, repo, *sources, **opts): |
| 9 """Convert a git fastimport dump into Mercurial changesets. | 8 """Convert a git fastimport dump into Mercurial changesets. |
| 10 | 9 |
