lib/braid/commands/push.rb @@ -107,39 +107,41 @@ Main { } } - mode(:setup) { + mode(:diff) { description <<-TXT - Set up git or git-svn remote for a mirror. - All commands that need a remote run setup internally. - - Defaults to setting up remotes for all mirrors if none is specified. + Show diff of local changes to mirror. TXT - examples <<-TXT - . braid setup local/dir + mixin :argument_path, :option_verbose + + run { + Braid::Command.run(:diff, path) + } + } + + mode(:push) { + description <<-TXT + Push local mirror changes to remote. TXT - mixin :optional_path, :option_verbose + mixin :argument_path, :option_verbose run { Braid.verbose = verbose - Braid::Command.run(:setup, path) + Braid::Command.run(:push, path) } } - mode(:diff) { + mode(:setup) { description <<-TXT - Show diff of local changes to mirror. + Set up git and git-svn remotes. TXT - examples <<-TXT - . braid diff local/dir - TXT - - mixin :argument_path, :option_verbose + mixin :optional_path, :option_verbose run { - Braid::Command.run(:diff, path) + Braid.verbose = verbose + Braid::Command.run(:setup, path) } } bin/braid @@ -59,7 +59,7 @@ module Braid begin if mirror.squashed? local_hash = git.rev_parse("HEAD") - if diff + if !diff.empty? base_hash = generate_tree_hash(mirror, base_revision) else base_hash = local_hash lib/braid/commands/update.rb @@ -86,7 +86,7 @@ module Braid def diff remote_hash = git.rev_parse("#{base_revision}:") local_hash = git.tree_hash(path) - remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash, path) : "" + remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : "" end def fetch lib/braid/mirror.rb @@ -139,12 +139,16 @@ module Braid class Git < Proxy def commit(message, *args) - - commit_message_file = Tempfile.new("braid_commit", ".") - commit_message_file.print("Braid: " + message) - commit_message_file.flush - status, out, err = exec("git commit -F #{commit_message_file.path} --no-verify #{args.join(' ')}") - commit_message_file.unlink + cmd = "git commit --no-verify" + if message # allow nil + message_file = Tempfile.new("braid_commit") + message_file.print(message) + message_file.flush + cmd << " -F #{message_file.path}" + end + cmd << " #{args.join(' ')}" unless args.empty? + status, out, err = exec(cmd) + message_file.unlink if message_file if status == 0 true @@ -155,10 +159,10 @@ module Braid end end - def fetch(remote = nil) - args = remote && "-n #{remote}" + def fetch(remote = nil, *args) + args.unshift "-n #{remote}" if remote # open4 messes with the pipes of index-pack - sh("git fetch #{args} 2>&1 >/dev/null") + sh("git fetch #{args.join(' ')} 2>&1 >/dev/null") end def checkout(treeish) lib/braid/operations.rb 1b35d9964005d810e48644078844414a3bdd8c82 Norbert Crombach norbert.crombach@primetheory.org http://github.com/norbert/braid/commit/a2e1320da49f661e8f3eaca25eb0e3a11da9d42d a2e1320da49f661e8f3eaca25eb0e3a11da9d42d 2009-03-07T23:28:14-08:00 2008-11-13T14:22:58-08:00 Oh snap, push works 79fc6391cad8547e009eb7c0b5da4c60fcf2a573 Norbert Crombach norbert.crombach@primetheory.org