← Back to branch summary

~ubuntu-branches/debian/wheezy/bzr-fastimport/wheezy

« back to all changes in this revision

Viewing changes to cmds.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-08-22 18:55:41 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822185541-efqh89ead3md1c41
Tags: 0.11.0-1
https://launchpad.net/bugs/792935
https://launchpad.net/bugs/631979
* New upstream release.
 + Fixes crash in "bzr fast-import-filter". LP: #792935
 + Fixes attribute error in iter_entries_by_dir() during fast-export.
   LP: #631979

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmds.py
858
858
                              "branch name and the second group is used "
859
859
                              "to match files.",
860
860
                        ),
861
 
                    Option('branches-path', type=str, argname="STR",
862
 
                        help="Path in repo to /branches."
863
 
                        ),
864
 
                    Option('tags-path', type=str, argname="STR",
865
 
                        help="Path in repo to /tags."
866
 
                        ),
867
861
                    ]
868
862
    encoding_type = 'exact'
869
 
    def run(self, source, destination, verbose=False, trunk_path=None,
870
 
        branches_path=None, tags_path=None):
 
863
    def run(self, source, destination, verbose=False, trunk_path=None):
871
864
        load_fastimport()
872
865
        from bzrlib.plugins.fastimport.exporters import fast_export_from
873
866
        custom = []
874
867
        if trunk_path is not None:
875
868
            custom.extend(['--trunk-path', trunk_path])
876
 
        if branches_path is not None:
877
 
            custom.extend(['--branches-path', branches_path])
878
 
        if tags_path is not None:
879
 
            custom.extend(['--tags-path', tags_path])
880
869
        fast_export_from(source, destination, 'svn', verbose, custom)