git_helpers 0.1.0

data/bin/gitstatus.rb

@@ -0,0 +1,349 @@
+#!/usr/bin/env ruby
+# Inspired by https://github.com/olivierverdier/zsh-git-prompt
+# [commit: 350be32093d0585f395413253536d891c247f538,
+#  last commit checked: 0a6c8b610e799040b612db8888945f502a2ddd9d (2016-02-14))
+#Inspired by the contrib git script
+
+require "open3"
+require "pathname"
+require "shellwords"
+require "optparse"
+require "simplecolor"
+#require "dr/git" #TODO merge the two implems
+SimpleColor.mix_in_string
+
+module GitStatus
+	module Run
+		extend(self)
+		#if we get interrupted once, we don't want to launch any more commands
+		@interrupted=false
+		def runstatus(*args)
+			if !@interrupted
+				begin
+					if Open3.respond_to?(:capture3) then
+						out, error, status=Open3.capture3(*args)
+						return out, status.success?
+					else
+						out = `#{args} 2>/dev/null`
+						status=$?
+						return out, status.success?
+					end
+				rescue Interrupt #interruption
+					@interrupted=true
+					return "", false
+				end
+			else
+				return "", false
+			end
+		end
+		def run(*args)
+			msg,_=runstatus(*args)
+			return msg
+		end
+	end
+
+	class Git
+		include GitStatus::Run
+		attr_reader :msg
+
+		def git?
+			if @git.nil?
+				_,@git=runstatus "git rev-parse"
+			end
+			return @git
+		end
+		def getgitdir
+			return Pathname.new((run "git rev-parse --git-dir").chomp)
+		end
+		def ingitdir?
+			return (run "git rev-parse --is-inside-git-dir") == "true\n"
+		end
+		def worktree?
+			return (run "git rev-parse --is-inside-work-tree") == "true\n"
+		end
+		def bare?
+			return (run "git rev-parse --is-bare-repository") == "true\n"
+		end
+
+		def cd_and_exec(*args)
+			if @path.nil? then
+				yield(*args)
+			else
+				if File.directory?(@path)
+					Dir.chdir(@path) do
+						yield(*args)
+					end
+				else
+					warn "#{@path} is not a directory"
+				end
+			end
+		end
+
+		def initialize(path=nil)
+			#a nil path means we want information on the current directory
+			if !path.nil?
+				@path=Pathname.new(path).expand_path
+			end
+			cd_and_exec {git?}
+		end
+
+		def get_msg
+			#gitst="git status --porcelain --branch"
+			#too many git are too old to mix --porcelain with --branch
+			gitm=git="git"
+			gitm="#{git} -c color.ui=always" if $opts[:color]
+			gitm="#{gitm} status --short --branch"
+			@msg=run(gitm)
+		end
+
+		def describe_detached_head
+			case $opts[:describe]
+			when "sha1"
+				describe=(run "git rev-parse --short HEAD").chomp
+			when "describe"
+				describe=(run "git describe HEAD").chomp
+			when "contains"
+				describe=(run "git describe --contains HEAD").chomp
+			when "branch"
+				describe=(run "git describe --contains --all HEAD").chomp
+			when "match"
+				describe=(run "git describe --tags --exact-match HEAD").chomp
+			when "all" #try --contains all, then --all
+				describe=(run "git describe --contains --all HEAD").chomp
+				describe=(run "git describe --all HEAD").chomp if describe.nil? or describe.empty?
+			when "magic"
+				describe1=(run "git describe --contains --all HEAD").chomp
+				describe2=(run "git describe --all HEAD").chomp
+				describe= describe1.length < describe2.length ? describe1 : describe2
+				describe=describe1 if describe2.empty?
+				describe=describe2 if describe1.empty?
+			else
+				describe=(run($opts[:describe])).chomp
+			end
+			if describe.empty?
+				describe=(run "git rev-parse --short HEAD").chomp
+			end
+			@branch=":#{describe}"
+		end
+
+		def parse_head(head)
+			@ahead=@behind=0
+			if (head =~ /## Initial commit on (\S*)/) then
+			 @branch=$1
+			 if @branch =~ /(\S*)\.\.\./
+				 @branch=$1
+			 end
+			 @branch+="…"
+			elsif (head =~ /## (\S*) \(no branch\)/) then
+				describe_detached_head
+			elsif (head =~ /## (\S*)(.*)/) then
+				branchs=$1
+				rest=$2
+				if (branchs =~ /(\S*)\.\.\.(\S*)/) then
+					@branch=$1
+					remote=$2
+				else
+					@branch=branchs
+				end
+				if (rest =~ /.*\[ahead\s+(\d*)(.*)/) then
+					@ahead=$1.to_i
+					rest=$2
+				end
+				if (rest =~ /.*behind\s+(\d*)\]/) then
+					@behind=$1.to_i
+				end
+			end
+		end
+
+		def parse_msg
+			msg=@msg
+			#find the branch name, and if we are behind/ahead of upstream
+			lines=msg.uncolor.lines.to_a
+			return if lines.empty?
+			head=lines.shift
+			parse_head(head)
+
+			#get status of files
+			@changed=@staged=@untracked=@conflicts=0
+			lines.each do |line|
+				index = line[0];
+				workdir = line[1];
+				#puts "index: #{index}, workdir: #{workdir}"
+				if index=~/[DRAMTC]/ then
+					@staged+=1
+				end
+				if workdir=~ /[DMT]/ then
+					@changed+=1
+				end
+				if workdir=='?' || index=='?' then
+					@untracked+=1
+				end
+				if workdir=='U' || index=='U' then
+					@conflicts+=1
+				end
+			end
+			@clean=true
+			@clean=false if @staged != 0 || @changed !=0 ||
+											@untracked !=0 || @conflicts !=0
+		end
+
+		def get_status
+			if worktree?
+				get_msg
+				parse_msg
+				if $opts[:sequencer] and !@msg.empty?
+					@sequencer=""
+					gitdir=getgitdir
+					if (gitdir+"rebase-merge").directory?
+						if (gitdir+"rebase-merge/interactive").file?
+							@sequencer<<" rb-i " #REBASE-i
+						else
+							@sequencer<<" rb-m " #REBASE-m
+						end
+						@sequencer<<(gitdir+"rebase-merge/head-name").read.chomp.sub(/^refs\/heads\//,"")
+					end
+					if (gitdir+"rebase-apply").directory?
+						if (gitdir+"rebase-apply/rebasing").file?
+							@sequencer<<" rb" #RB
+						elsif (gitdir+"rebase-apply/applying").file?
+							@sequencer<<" am" #AM
+						else
+							@sequencer<<" am/rb" #AM/REBASE
+						end
+					end
+					if (gitdir+"MERGE_HEAD").file?
+						@sequencer<<" mg" #MERGING
+					end
+					if (gitdir+"CHERRY_PICK_HEAD").file?
+						@sequencer<<" ch" #CHERRY-PICKING
+					end
+					if (gitdir+"BISECT_LOG").file?
+						@sequencer<<" bi" #BISECTING
+					end
+					_,stashstatus=runstatus "git rev-parse --verify refs/stash"
+					if stashstatus
+						stashs=run "git rev-list -g refs/stash"
+						@sequencer<<" $#{stashs.lines.to_a.length}" #Stash
+					end
+				end
+				return !@msg.empty?
+			else
+				if $opts[:sequencer]
+					if ingitdir?
+						if bare?
+							@branch="|bare|"
+						else
+							@branch="|.git|"
+						end
+					end
+				end
+			end
+			return false
+		end
+
+		def status
+			cd_and_exec { get_status } if git?
+		end
+
+		def prompt
+			if status
+				return "(" <<
+				 @branch.color(:magenta,:bold) <<
+				(@ahead==0 ? "" : "↑"<<@ahead.to_s ) <<
+				(@behind==0 ? "" : "↓"<<@behind.to_s ) <<
+				"|" <<
+				(@staged==0 ? "" : ("●"+@staged.to_s).color(:red) ) <<
+				(@conflicts==0 ? "" : ("✖"+@conflicts.to_s).color(:red) ) <<
+				(@changed==0 ? "" : ("✚"+@changed.to_s).color(:blue) ) <<
+				(@untracked==0 ? "" : "…" ) <<
+				(@clean ? "✔".color(:green,:bold) : "" ) <<
+				(@sequencer.empty? ? "" : @sequencer.color(:yellow) ) <<
+				")"
+			else
+				return "(" << @branch.color(:magenta,:bold) << ")" if @branch
+			end
+		end
+
+		def porcelain
+			if git?
+				return "#{@branch}\n#{@ahead}\n#{@behind}\n#{@staged}\n#{@conflicts}\n#{@changed}\n#{@untracked}\n#{@clean?1:0}\n#{@sequencer}\n"
+			else
+				return ""
+			end
+		end
+	end
+end
+
+$opts={:color => true, :indent => nil, :sequencer => true, :describe => "magic"}
+optparse = OptionParser.new do |opt|
+	opt.banner= "#{File.basename($0)} [options] git_dirs"
+	opt.on("-p", "--[no-]prompt", "To be used in shell prompt", "This ensure that color ansi sequence are escaped so that they are not counted as text by the shell") do |v|
+		$opts[:prompt]=v
+	end
+	opt.on("--[no-]porcelain", "Don't format the status but output it in a machine convenient format") do |v|
+		$opts[:porcelain]=v
+	end
+	opt.on("-s", "--[no-]status", "List file", "Print the output of git status additionally of what this program parse") do |v|
+		$opts[:status]=v
+	end
+	opt.on("-c", "--[no-]color", "Color output", "on by default") do |v|
+		$opts[:color]=v
+	end
+	opt.on("--[no-]sequencer", "Show sequencer data (and also look for bare directory)", "on by default") do |v|
+		$opts[:sequencer]=v
+	end
+	opt.on("--indent spaces", Integer, "Indent to use if showing git status", "2 by default, 0 for empty ARGV") do |v|
+		$opts[:indent]=v
+	end
+	opt.on("--describe sha1/describe/contains/branch/match/all/magic", "How to describe a detached HEAD", "'magic' by default") do |v|
+		$opts[:describe]=v
+	end
+	opt.on("--sm", "Recurse on each submodules") do |v|
+		$opts[:submodules]=v
+	end
+end
+optparse.parse!
+
+if !$opts[:color]
+	SimpleColor.enabled=false
+end
+
+def prettify_dir(dir)
+	return dir.sub(/^#{ENV['HOME']}/,"~")
+end
+
+def gs_output(dir)
+	g=GitStatus::Git.new(dir)
+	puts "#{prettify_dir(dir)+": " if dir}#{g.prompt}"
+	if $opts[:status] and g.git?
+		g.msg.lines.each do |line|
+			print " "*$opts[:indent] + line
+		end
+	end
+end
+
+if $opts[:porcelain]
+	puts GitStatus::Git.new.porcelain
+elsif $opts[:prompt]
+	SimpleColor.enabled=:shell
+	prompt=GitStatus::Git.new.prompt
+	puts prompt if prompt #in ruby1.8, puts nil output nil...
+else
+	args=ARGV
+	if args.empty?
+		$opts[:indent]=0 unless $opts[:indent]
+		args=[nil]
+	else
+		$opts[:indent]=2 unless $opts[:indent]
+	end
+	args.each do |dir|
+		gs_output(dir)
+		if $opts[:submodules]
+			Dir.chdir(dir||".") do
+				%x/git submodule status/.each_line.map { |l| l.split[1] }.each do |dir|
+					gs_output(dir)
+				end
+			end
+		end
+	end
+end

data/fixtures/git-diff.diff

@@ -0,0 +1,254 @@
+commit 74804e377d4a54d1173d4393827d4e4b27e4d5d0
+diff --cc libs/header_clean/header_clean.pl
+index e8bcd92,5970580..ae279d0
+--- a/libs/header_clean/header_clean.pl
++++ b/libs/header_clean/header_clean.pl
+@@@ -105,13 -104,21 +104,23 @@@ for (my $i = 0; $i <= $#input; $i++) 
+  	}
+  }
+  
++ # Courtesy of github.com/git/git/blob/ab5d01a/git-add--interactive.perl#L798-L805
++ sub parse_hunk_header {
++     my ($line) = @_;
++     my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
++         $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
++     $o_cnt = 1 unless defined $o_cnt;
++     $n_cnt = 1 unless defined $n_cnt;
++     return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
++ }
++ 
+  sub strip_empty_first_line {
+ -	my $foo = shift(); # Array passed in by reference
+ +	my $array = shift(); # Array passed in by reference
+  
+  	# If the first line is just whitespace remove it
+ -	if (defined($foo->[0]) && $foo->[0] =~ /^\s*$/) {
+ -		shift($foo);
+ +	if (defined($array->[0]) && $array->[0] =~ /^\s*$/) {
+ +		shift(@$array); # Throw away the first line
+  	}
+ +
+ +	return 1;
+  }
+diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js b/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
+index 4f9adf8..8c13743 100644
+--- a/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
++++ b/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
+@@ -32,7 +32,7 @@
+  * @constructor
+  * @extends {WebInspector.Widget}
+  */
+-WebInspector.Dialog = function()
++WebInspector.Dialog = function(isModalToElement)
+ {
+     WebInspector.Widget.call(this, true);
+     this.markAsRoot();
+@@ -45,6 +45,10 @@ WebInspector.Dialog = function()
+ 
+     this._wrapsContent = false;
+     this._dimmed = false;
++    this._isModalToElement = isModalToElement;
++
++    this._glassPane = new WebInspector.GlassPane(relativeToElement, isModalToElement);
++
+     /** @type {!Map<!HTMLElement, number>} */
+     this._tabIndexMap = new Map();
+ }
+@@ -62,16 +65,16 @@ WebInspector.Dialog.prototype = {
+     /**
+      * @override
+      */
+-    show: function()
++    show: function(isModalToElement)
+     {
+         if (WebInspector.Dialog._instance)
+             WebInspector.Dialog._instance.detach();
+         WebInspector.Dialog._instance = this;
+ 
+-        var document = /** @type {!Document} */ (WebInspector.Dialog._modalHostView.element.ownerDocument);
++        var document = /** @type {!Document} */ (WebInspector.Dialog._modalHostView.element.ownerDocument, isModalToElement);
+         this._disableTabIndexOnElements(document);
+ 
+-        this._glassPane = new WebInspector.GlassPane(document, this._dimmed);
++        this._glassPane = new WebInspector.GlassPane(document, isModalToElement);
+         this._glassPane.element.addEventListener("click", this._onGlassPaneClick.bind(this), false);
+         WebInspector.GlassPane.DefaultFocusedViewStack.push(this);
+ 
+commit 6e50ba922f45d810b77de941a6a848df4a9ab44a (HEAD -> master)
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:58:41 2016 +0100
+
+    Rename symlink
+
+diff --git a/d b/d
+deleted file mode 100755
+index 4bcfe98..0000000
+--- a/d
++++ /dev/null
+@@ -1 +0,0 @@
+-d
+diff --git a/d b/d
+new file mode 120000
+index 0000000..c59d9b6
+--- /dev/null
++++ b/d
+@@ -0,0 +1 @@
++d
+
+diff --git a/e b/e
+deleted file mode 120000
+index c59d9b6..0000000
+--- a/e
++++ /dev/null
+@@ -1 +0,0 @@
+-d
+
+
+commit 8b9d73ca7c9e9da18bdb0beff3ab38c49b4e5ae1
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:58:31 2016 +0100
+
+    symlink
+
+diff --git a/e b/e
+new file mode 120000
+index 0000000..c59d9b6
+--- /dev/null
++++ b/e
+@@ -0,0 +1 @@
++d
+
+
+commit 00c13fb19a63a7e753a2f06aaa214c05726c9bfb
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:58:21 2016 +0100
+
+    copy + file permission
+
+diff --git a/b2 b/c2
+similarity index 100%
+copy from b2
+copy to c2
+diff --git a/d b/d
+old mode 100644
+new mode 100755
+
+commit 8af4fb242d1040e291897a7d047da4dfbe97e9ef
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:58:02 2016 +0100
+
+    Rename
+
+diff --git a/b b/b2
+similarity index 100%
+rename from b
+rename to b2
+
+commit a1aad6c1153b923e0c5d14bc1bbbdf5e39d89591
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:57:39 2016 +0100
+
+    Adding d, new line to b
+
+diff --git a/b b/b
+index 6178079..0939735 100644
+--- a/b
++++ b/b
+@@ -1 +1,2 @@
+ b
++new line on b
+diff --git a/d b/d
+new file mode 100644
+index 0000000..4bcfe98
+--- /dev/null
++++ b/d
+@@ -0,0 +1 @@
++d
+
+commit fcf9b0274a1f034ced762c269f835e198693704a
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:57:39 2016 +0100
+
+    Adding b
+
+diff --git a/b b/b
+new file mode 100644
+index 0000000..6178079
+--- /dev/null
++++ b/b
+@@ -0,0 +1 @@
++b
+
+commit 6fa1c4ab2a8b2be408791d874155c95511ecc0ce
+Author: Damien Robert <damien.olivier.robert+git@gmail.com>
+Date:   Sun Mar 13 18:57:39 2016 +0100
+
+    Adding a
+
+diff --git a/a b/a
+new file mode 100644
+index 0000000..7898192
+--- /dev/null
++++ b/a
+@@ -0,0 +1 @@
++a
+
+Submodule ruby/gems/simplecolor contains untracked content
+Submodule ruby/gems/simplecolor contains modified content
+Submodule ruby/gems/simplecolor a5c060d..ac178d7:
+  > Concatenate ANSI escape sequences inside the \e
+  > Add possibility to copy colors
+  > Sometimes \e[m is abused for \e[0m
+  > More exceptions
+  > Merge some color regexp and raise exception on bogus colors
+  > Fix SimpleColor#uncolor!
+  > Change ANSI Regexps
+  > rake doc fails for now with Rake 11
+  > Add uncolor tests
+  > ColorWrapper: unify gestion of arg
+
+Submodule script/others/republique f4c0876...0000000 (submodule deleted)
+Submodule script/others/republique 0000000...f4c0876 (not checked out)
+Submodule plam 0000000...c43a6e4 (new submodule)
+Submodule plam c43a6e4...9215cb5 (commits not present)
+Submodule plam 9215cb5..4b41ae0 (rewind):
+  < Adding d, new line to b
+Submodule plam de44db5...d6ed7c1:
+  > Uhihih
+  < Ohoho
+
+diff --git i/a w/a
+index 7898192..442406a 100644
+--- i/a
++++ w/a
+@@ -1 +1,2 @@
+ a
++
+diff --git i/b2 w/b2
+index 0939735..d70291d 100644
+--- i/b2
++++ w/b2
+@@ -1,2 +1,2 @@
+-b
++b 
+ new line on b
+diff --git i/b w/b
+index 3cd10f0..3cc89da 100644
+--- i/b
++++ w/b
+@@ -1,5 +1,5 @@
+ b
+ new line on b
+ ohoh
+- 
++
+ bl2
+
+diff --git 1/2/umount 2/2/umount
+new file mode 100755
+index 0000000..bb9ce29
+Binary files /dev/null and 2/2/umount differ
+diff --git 1/2/umount 2/2/umount
+deleted file mode 100755
+index bb9ce29..0000000
+Binary files 1/2/umount and /dev/null differ