README git-addremove git-all-commits git-apply-feature git-build git-changelog git-children-of git-current git-diff-directory git-empty-branch git-erase-reflog git-external-ediff git-find git-find-blob git-find-children git-find-fetch git-flush git-full-reset git-hunt-and-seek git-maxpack git-opendiff git-publish git-publish-repo git-push-branch git-record git-remove-empty-commits git-retrack git-rm-conflicts git-sh git-signed-tag git-snapshot git-sync git-trash git-unpack git-unwip git-wip @@ -1,4 +1,2 @@ #!/bin/sh -for REMOTE in $(git remote); do - git push $REMOTE $* -done +for remote in $(git remote); do git push $remote; done git-push-all @@ -24,17 +24,15 @@ class String def obfuscate; gsub(/@/, " at the ").gsub(/\.(\w+)(>|$)/, ' dot \1s\2') end - def htmlize; gsub("&", "&").gsub("<", "<").gsub(">", ">") end end lines = {} verbose = ARGV.delete("-v") obfuscate = ARGV.delete("-o") -htmlize = ARGV.delete("-h") author = nil state = :pre_author -`git log -M -C -C -p --no-color`.each do |l| +`git log -p --no-color`.each do |l| case when (state == :pre_author || state == :post_author) && l =~ /Author: (.*)$/ author = $1 @@ -51,7 +49,6 @@ end lines.sort_by { |a, c| -c }.each do |a, c| a = a.obfuscate if obfuscate - a = a.htmlize if htmlize if verbose puts "#{a}: #{c} lines of diff" else git-rank-contributors @@ -1,223 +1,195 @@ #!/usr/bin/env ruby -## git-wtf: display the state of your repository in a readable and easy-to-scan -## format. -## -## git-wtf tries to ease the task of having many git branches. It's also useful -## for getting a summary of how tracking branches relate to a remote server. -## -## git-wtf shows you: -## - How your branch relates to the remote repo, if it's a tracking branch. -## - How your branch relates to non-feature ("version") branches, if it's a -## feature branch. -## - How your branch relates to the feature branches, if it's a version branch. -## -## For each of these relationships, git-wtf displays the commits pending on -## either side, if any. It displays checkboxes along the side for easy scanning -## of merged/non-merged branches. -## -## If you're working against a remote repo, git-wtf is best used between a 'git -## fetch' and a 'git merge' (or 'git pull' if you don't mind the redundant -## network access). -## -## Usage: git wtf [branch+] [-l|--long] [-a|--all] [--dump-config] -## -## If [branch] is not specified, git-wtf will use the current branch. With -## --long, you'll see author info and date for each commit. With --all, you'll -## see all commits, not just the first 5. With --dump-config, git-wtf will -## print out its current configuration in YAML format and exit. -## -## git-wtf uses some heuristics to determine which branches are version -## branches, and which are feature branches. (Specifically, it assumes the -## version branches are named "master", "next" and "edge".) If it guesses -## incorrectly, you will have to create a .git-wtfrc file. -## -## git-wtf looks for a .git-wtfrc file starting in the current directory, and -## recursively up to the root. The config file is a YAML file that specifies -## the version branches, any branches to ignore, and the max number of commits -## to display when --all isn't used. To start building a configuration file, -## run "git-wtf --dump-config > .git-wtfrc" and edit it. -## -## IMPORTANT NOTE: all local branches referenced in .git-wtfrc must be prefixed -## with heads/, e.g. "heads/master". Remote branches must be of the form -## remotes/<remote>/<branch>. -## -## git-wtf Copyright 2008 William Morgan <wmorgan-git-wt-add@masanjin.net>. -## This program is free software: you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by the Free -## Software Foundation, either version 3 of the License, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, but WITHOUT -## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -## more details. -## -## You can find the GNU General Public License at: http://www.gnu.org/licenses/ - +$debug = false require 'yaml' -CONFIG_FN = ".git-wtfrc" +CONFIG_FILENAME = ".git-wtf" + +begin + require 'rubygems' + require 'term/ansicolor' + HAS_COLOR=true + include Term::ANSIColor +rescue LoadError + HAS_COLOR=false +end class Numeric; def pluralize s; "#{to_s} #{s}" + (self != 1 ? "s" : "") end end -$long = ARGV.delete("--long") || ARGV.delete("-l") -$all = ARGV.delete("--all") || ARGV.delete("-a") -$dump_config = ARGV.delete("--dump-config") - -## find config file -$config = { "versions" => %w(heads/master heads/next heads/edge), "ignore" => [], "max_commits" => 5 }.merge begin - p = File.expand_path "." - fn = while true - fn = File.join p, CONFIG_FN - break fn if File.exist? fn - pp = File.expand_path File.join(p, "..") - break if p == pp - p = pp +class Hash + def leaves + children = values.select { |v| v.is_a?(Hash) } + children.length > 0 ? children.map { |c| c.leaves }.flatten : self end - - (fn && YAML::load_file(fn)) || {} # YAML turns empty files into false -end - -if $dump_config - puts $config.to_yaml - exit(0) end -## the set of commits in 'to' that aren't in 'from'. -## if empty, 'to' has been merged into 'from'. -def commits_between from, to - if $long - `git log --pretty=format:"- %s [%h] (%ae; %ar)" #{from}..#{to}` - else - `git log --pretty=format:"- %s [%h]" #{from}..#{to}` - end.split(/[\r\n]+/) +def die s + $stderr.puts "Error: #{s}" + exit(-1) end -def show_commits commits, prefix=" " - if commits.empty? - puts "#{prefix} none" +COLOR_ATTRIBUTES = { + 0 => black, + 1 => red, + 2 => green, + 3 => yellow, + 4 => blue, + 5 => magenta, + 6 => cyan, + 7 => dark, + 8 => bold, + 9 => reset +} if HAS_COLOR + +def cputs(string='') + if HAS_COLOR + COLOR_ATTRIBUTES.each { |num, color| string.gsub!("&|#{num}", color) } else - max = $all ? commits.size : $config["max_commits"] - max -= 1 if max == commits.size - 1 # never show "and 1 more" - commits[0 ... max].each { |c| puts "#{prefix}#{c}" } - puts "#{prefix}... and #{commits.size - max} more." if commits.size > max + string.gsub!(/&\|\d/, '') end + puts string end -def ahead_behind_string ahead, behind - [ahead.empty? ? nil : "#{ahead.size.pluralize 'commit'} ahead", - behind.empty? ? nil : "#{behind.size.pluralize 'commit'} behind"]. - compact.join("; ") -end +def run_command(command) + output = IO.popen(command, 'r').read -def show b, all_branches - puts "Local branch: #{b[:local_branch]}" - both = false - - if b[:remote_branch] - pushc = commits_between b[:remote_branch], b[:local_branch] - pullc = commits_between b[:local_branch], b[:remote_branch] - - both = !pushc.empty? && !pullc.empty? - if pushc.empty? - puts "[x] in sync with remote" - else - action = both ? "push after rebase / merge" : "push" - puts "[ ] NOT in sync with remote (needs #{action})" - show_commits pushc - end - - puts "\nRemote branch: #{b[:remote_branch]} (#{b[:remote_url]})" + if $debug + cputs "-- begin run_command --" + cputs "executing: #{command}" + cputs "output:" + cputs output + cputs "-- end run_command --" + end - if pullc.empty? - puts "[x] in sync with local" - else - action = pushc.empty? ? "merge" : "rebase / merge" - puts "[ ] NOT in sync with local (needs #{action})" - show_commits pullc + output +end - both = !pushc.empty? && !pullc.empty? - end +def commits_between from, to + commits = run_command(%{ git log --pretty=format:"%h-%ae-%s" #{from}..#{to} }).split(/[\r\n]+/).map do |raw_commit| + raw_commit_parts = raw_commit.split('-') + + { + :hash => raw_commit_parts.shift, + :author => raw_commit_parts.shift.split('@').first, + :message => raw_commit_parts.join('-') + } end - - vbs, fbs = all_branches.partition { |name, br| $config["versions"].include? br[:local_branch] } - if $config["versions"].include? b[:local_branch] - puts "\nFeature branches:" unless fbs.empty? - fbs.each do |name, br| - remote_ahead = b[:remote_branch] ? commits_between(b[:remote_branch], br[:local_branch]) : [] - local_ahead = commits_between b[:local_branch], br[:local_branch] - if local_ahead.empty? && remote_ahead.empty? - puts "[x] #{br[:name]} is merged in" - elsif local_ahead.empty? && b[:remote_branch] - puts "(x) #{br[:name]} merged in (only locally)" - else - behind = commits_between br[:local_branch], b[:local_branch] - puts "[ ] #{br[:name]} is NOT merged in (#{ahead_behind_string local_ahead, behind})" - show_commits local_ahead - end - end - else - puts "\nVersion branches:" unless vbs.empty? # unlikely - vbs.each do |v, br| - ahead = commits_between v, b[:local_branch] - if ahead.empty? - puts "[x] merged into #{v}" - else - #behind = commits_between b[:local_branch], v - puts "[ ] NOT merged into #{v} (#{ahead.size.pluralize 'commit'} ahead)" - show_commits ahead - end - end + + max_author_size = commits.map { |c| c[:author].length }.sort.last + + commits.map do |commit| + "[&|2%s&|9] &|8&|4%#{max_author_size}s&|9 %s" % [commit[:hash], commit[:author], commit[:message]] end +end - puts "\nWARNING: local and remote branches have diverged. A merge will occur unless you rebase." if both +begin + $config = YAML::load_file(CONFIG_FILENAME) + raise 'invalid configuration format' unless $config["version_branches"].length > 0 +rescue + # cputs <<-CONFIG.gsub(/^ /, '') + # Create a .git-wtf in your git repository directory that looks like: + # -- + # version_branches: + # - stable-2.0 + # CONFIG + # exit 1 + $config = { 'version_branches' => [] } end -branches = `git show-ref`.inject({}) do |hash, l| - sha1, ref = l.chomp.split " refs/" - next hash if $config["ignore"].member? ref - next hash unless ref =~ /^heads\/(.+)/ - name = $1 - hash[name] = { :name => name, :local_branch => ref } - hash +current_branch = File.read(File.join('.git', 'HEAD')).chomp.split('/').last + +$branches = Dir[File.join('.git', 'refs', 'heads', '*')].inject({}) do |hash, ref| + name = File.basename(ref) + rev = File.read(ref).chomp + current = (name == current_branch) + version = $config["version_branches"].include?(name) + remote = run_command("git config --get branch.#{name}.remote").chomp + merge = run_command("git config --get branch.#{name}.merge").chomp.split('/').last + + hash.update({ name => { + :name => name, + :rev => rev, + :current => current, + :version => version, + :merge => { :remote => remote, :branch => merge } + }}) end -remotes = `git config --get-regexp ^remote\.\*\.url`.inject({}) do |hash, l| - l =~ /^remote\.(.+?)\.url (.+)$/ or next hash - hash[$1] ||= $2 +$remotes = Dir[File.join('.git', 'refs', 'remotes', '*', '*')].inject({}) do |hash, ref| + ref_parts = ref.split('/') + name = ref_parts.pop + remote = ref_parts.pop + rev = File.read(ref).chomp + hash[remote] ||= {} + hash[remote][name] = { :name => name, :remote => remote, :rev => rev } hash end -`git config --get-regexp ^branch\.`.each do |l| - case l - when /branch\.(.*?)\.remote (.+)/ - branches[$1] ||= {} - branches[$1][:remote] = $2 - branches[$1][:remote_url] = remotes[$2] - when /branch\.(.*?)\.merge ((refs\/)?heads\/)?(.+)/ - branches[$1] ||= {} - branches[$1][:remote_mergepoint] = $4 +$branches.each do |name, branch| + $branches[name][:parent] = begin + merge = branch[:merge] + remote = merge[:remote] == '.' ? $branches : $remotes[merge[:remote]] + remote ? remote[merge[:branch]] : nil end end -branches.each { |k, v| v[:remote_branch] = "#{v[:remote]}/#{v[:remote_mergepoint]}" if v[:remote] && v[:remote_mergepoint] } - -show_dirty = ARGV.empty? -targets = if ARGV.empty? - [`git symbolic-ref HEAD`.chomp.sub(/^refs\/heads\//, "")] -else - ARGV -end.map { |t| branches[t] or abort "Error: can't find branch #{t.inspect}." } +repo = { + :master => ($branches.values + $remotes['origin'].values).detect { |b| b[:name] == 'master' }, + :current => $branches.values.detect { |b| b[:current] }, + :versions => $branches.values.select { |b| b[:version] }, + :features => $branches.values.select { |b| !(b[:version] || b[:name] == 'master') }, + :remotes => $remotes +} + +def branch_sync_status(local, remote, show_outgoing=true, show_incoming=true, good="in sync", bad="out of sync") + outgoing = show_outgoing ? commits_between(remote[:rev], local[:rev]) : [] + incoming = show_incoming ? commits_between(local[:rev], remote[:rev]) : [] + + sync = (incoming.length == 0 && outgoing.length == 0) + + verb = case + when incoming.length > 0 && + outgoing.length > 0 then 'merge' + when incoming.length > 0 then 'pull' + when outgoing.length > 0 then 'push' + else nil + end -targets.each { |t| show t, branches } + cputs sync ? "[x] #{good}" : "[ ] #{bad}" + incoming.each { |c| cputs " &|8&|3<&|9 #{c}" } + outgoing.each { |c| cputs " &|8&|3>&|9 #{c}" } +end -modified = show_dirty && `git ls-files -m` != "" -uncommitted = show_dirty && `git diff-index --cached HEAD` != "" +def name(branch) + if $remotes.leaves.include?(branch) + "#{branch[:remote]}/#{branch[:name]}" + else + "#{branch[:name]}" + end +end -puts if modified || uncommitted -puts "NOTE: working directory contains modified files" if modified -puts "NOTE: staging area contains staged but uncommitted files" if uncommitted +cputs "Local Branch: #{name(repo[:current])}" +branch_sync_status(repo[:current], repo[:current][:parent], true, true, "in sync with remote", "out of sync with remote (#{repo[:current][:parent][:remote]}/#{repo[:current][:parent][:name]})") if repo[:current][:parent] +cputs -# the end! +if repo[:current] == repo[:master] + if repo[:versions].length > 0 + cputs "Version branches:" + repo[:versions].each do |branch| + branch_sync_status(repo[:current], branch, false, true, "#{branch[:name]} is merged in", "#{branch[:name]} needs to be merged in") + end + cputs + end +elsif repo[:versions].include?(repo[:current]) + master = repo[:master] + cputs "Master Branch: #{name(master)}" + branch_sync_status(repo[:current], master, true, false, "in sync", "#{name(repo[:current])} needs to be merged into master") + cputs +end +if repo[:features].length > 0 + cputs "Feature branches:" + repo[:features].each do |branch| + branch_sync_status(repo[:current], branch, false, true, "#{branch[:name]} is merged in", "#{branch[:name]} needs to be merged in") + end +end \ No newline at end of file git-wtf git-branch-status git-diff b07501100370ec5813b11fe56bcac9c37fa213a4 Carlos Villela cv@lixo.org http://github.com/cv/git-utils/commit/5322b45051291dd65fd69d1b6871a6801cc2d907 5322b45051291dd65fd69d1b6871a6801cc2d907

2009-03-05T16:58:42-08:00

merged with ddollar e730981f7c1070e72dd0565029052668b3c5d094 Carlos Villela cv@lixo.org