@@ -89,18 +89,21 @@ Main { * removes metadata from .braids * removes the local directory and commits the removal - * does NOT remove the git and git svn remotes in case you still need them around + * removes the git remote by default, --keep can be used to supress that TXT examples <<-TXT . braid remove local/dir TXT - mixin :argument_path, :option_verbose + mixin :argument_path, :option_verbose, :option_keep_remote run { + options = { + :keep => keep + } Braid.verbose = verbose - Braid::Command.run(:remove, path) + Braid::Command.run(:remove, path, options) } } @@ -226,5 +229,13 @@ Main { } } + mixin(:option_keep_remote) { + option(:keep) { + optional + desc 'do not remove the remote' + attr + } + } + run { help! } } bin/braid @@ -1,7 +1,7 @@ module Braid module Commands class Remove < Command - def run(path) + def run(path, options = {}) mirror = config.get!(path) bail_on_local_changes! @@ -20,6 +20,16 @@ module Braid commit_message = "Removed mirror '#{mirror.path}'" git.commit(commit_message) msg commit_message + + if options[:keep] + msg "Not removing remote '#{mirror.remote}'" + elsif git.remote_url(mirror.remote) + msg "Removed remote '#{mirror.path}'" + git.remote_rm mirror.remote + else + msg "Remote '#{mirror.remote}' not found, nothing to cleanup" + end + end end end lib/braid/commands/remove.rb @@ -185,6 +185,11 @@ module Braid true end + def remote_rm(remote) + invoke(:remote, "rm", remote) + true + end + # Checks git and svn remotes. def remote_url(remote) key = "remote.#{remote}.url" lib/braid/operations.rb e93a41bac4a76e0224d5dec453494a6f39673d73 Piotr Banasik piotr.banasik@gmail.com http://github.com/evilchelu/braid/commit/9b36d06167449d94b0f6dc219f4f2e71f2de8825 9b36d06167449d94b0f6dc219f4f2e71f2de8825 2008-11-19T17:56:44-08:00 2008-11-19T17:56:44-08:00 added remote removal on a braid remove added an extra option to remove (--keep) to not remove the remote d18d671c1884a86498eee4b0e8771a18b04cb136 Piotr Banasik piotr.banasik@gmail.com