Bazaar Fast Import

Merge lp://staging/~jelmer/bzr-fastimport/split into lp://staging/bzr-fastimport

  1. split
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 279
Proposed branch: lp://staging/~jelmer/bzr-fastimport/split
Merge into: lp://staging/bzr-fastimport
Diff against target: 6112 lines (+359/-4645)
29 files modified
README.txt (+2/-0)
__init__.py (+32/-12)
branch_updater.py (+7/-4)
bzr_commit_handler.py (+46/-11)
bzr_exporter.py (+11/-7)
cache_manager.py (+72/-100)
commands.py (+0/-444)
dates.py (+0/-79)
errors.py (+0/-176)
helpers.py (+0/-217)
idmapfile.py (+0/-65)
parser.py (+0/-626)
processor.py (+0/-257)
processors/filter_processor.py (+0/-298)
processors/generic_processor.py (+70/-12)
processors/info_processor.py (+0/-282)
processors/query_processor.py (+0/-97)
revision_store.py (+7/-4)
setup.py (+1/-1)
tests/__init__.py (+20/-7)
tests/test_branch_mapper.py (+6/-0)
tests/test_commands.py (+0/-341)
tests/test_errors.py (+0/-78)
tests/test_filter_processor.py (+0/-877)
tests/test_generic_processor.py (+77/-50)
tests/test_head_tracking.py (+0/-257)
tests/test_helpers.py (+0/-56)
tests/test_parser.py (+0/-284)
tests/test_revision_store.py (+8/-3)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-fastimport/split
Reviewer Review Type Date Requested Status
Martin Pool (community) Approve
Bazaar Developers code Pending
Review via email: mp+36687@code.staging.launchpad.net

Commit message

Rely on system python-fastimport.

Description of the change

This branch splits a "fastimport" Python package out of bzr-fastimport. bzr-fastimport already had a reasonably clear distinction between generic fastimport and bzr-specific code.

Sverre on the vcs-fastimport mailing list (a Git hacker) is currently using a fork of bzr-fastimport with the bzr specific code removed in a hackish manner. He is interested in a common upstream project that can be used by anybody interested in using fastimport/fastexport from Python.

Dulwich currently has its own hackish fastimport/fastexport implementation. It would be nice if it could use the existing code in bzr-fastimport without relying on bzr.

the "fastimport" python package lives at lp:python-fastimport . I am planning to package it for Debian and Ubuntu for Natty/Squeeze+1.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

I haven't read in detail what I presume are mostly mechanical changes, but it looks ok. +1

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks for the review.

I'm going to wait a bit before landing this, until python-fastimport lands in natty and sid so that people who run bleeding edge have a chance of getting it from there.

lp://staging/~jelmer/bzr-fastimport/split updated
287. By Jelmer Vernooij

Merge trunk.

288. By Jelmer Vernooij

Mention fastimport in README.

289. By Jelmer Vernooij

Add FastimportFeature.

290. By Jelmer Vernooij

Check for availability of fastimport before running tests.

291. By Jelmer Vernooij

Simplify imports in case fastimport is not installed.

292. By Jelmer Vernooij

Fix some more bugs found by ad-hoc testing.

293. By Jelmer Vernooij

Support get_file_text in _TreeShim.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches