@@ -1,7 +1,9 @@ #!/usr/bin/env ruby require 'fileutils' -command = ARGV.shift +EXPORT_LOCATION = "~/.bazaar/plugins/fastimport/exporters/bzr-fast-export.py" +PYTHON = ENV["PYTHON"] || "/opt/local/bin/python2.5" +command = ARGV.shift commands = [:add, :push, :fetch, :pull] if !command || !commands.include?(command.to_sym) @@ -63,11 +65,11 @@ class BzrCommands print "There doesn't seem to be an existing refmap. " puts "Doing an initial import" FileUtils.makedirs(File.dirname(git_map)) - `(/opt/local/bin/python2.5 ~/bzr-pieter/exporters/bzr-fast-export.py --export-marks=#{bzr_map} --git-branch=bzr/#{remote} #{location}) | (git fast-import --export-marks=#{git_map})` + `(#{PYTHON} #{EXPORT_LOCATION} --export-marks=#{bzr_map} --git-branch=bzr/#{remote} #{location}) | (git fast-import --export-marks=#{git_map})` elsif File.exists?(git_map) && File.exists?(bzr_map) puts "Updating remote #{remote}" old_rev = `git rev-parse bzr/#{remote}` - `(/opt/local/bin/python2.5 ~/bzr-pieter/exporters/bzr-fast-export.py --import-marks=#{bzr_map} --export-marks=#{bzr_map} --git-branch=bzr/#{remote} #{location}) | (git fast-import --quiet --export-marks=#{git_map} --import-marks=#{git_map})` + `(#{PYTHON} #{EXPORT_LOCATION} --import-marks=#{bzr_map} --export-marks=#{bzr_map} --git-branch=bzr/#{remote} #{location}) | (git fast-import --quiet --export-marks=#{git_map} --import-marks=#{git_map})` new_rev = `git rev-parse bzr/#{remote}` puts "Changes since last update:" puts `git shortlog #{old_rev.strip}..#{new_rev.strip}` git-bzr 78da3821223284ede9faa553329ecdc123d4ba75 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/git-bzr/commit/c3617afba99ef9629d822a7faedf056391d0d441 c3617afba99ef9629d822a7faedf056391d0d441 2008-07-22T04:47:17-07:00 2008-07-22T04:47:17-07:00 Extract python and bzr-fast-export locations to location This allows you to easily change the location of the files, or update the script to your own config. cb12df57ac2d0eb9f6ce3e2b99e69ddfe55fdf23 Pieter de Bie pdebie@ai.rug.nl