Permalink
Browse files

Version 1.3.1

Fixed problem with marge branches not being diff'ed and fixed syntax highlighting to handle the branches.
  • Loading branch information...
1 parent 3b59ce3 commit 3411133a20fb86363fe628b9270636739e5689aa Peter Antoine committed with Mar 15, 2013
Showing with 14 additions and 7 deletions.
  1. +1 −1 README.md
  2. +7 −3 doc/gitlog.txt
  3. +3 −2 plugin/gitlog.vim
  4. +3 −1 syntax/gitlog.vim
View
@@ -1,7 +1,7 @@
vimgitlog
=========
-Version: 1.3.0
+Version: 1.3.1
Git log and diff plugin for vim.
View
@@ -1,4 +1,4 @@
-*gitlog.txt* For Vim version 7.0 Last change: 2012 December 14
+*gitlog.txt* For Vim version 7.3
,----. ,--. ,--. ,--. ~
@@ -10,8 +10,8 @@
Author: Peter Antoine
-Date: December 14, 2012
-Version: 1.3.0
+Date: March 8, 2013
+Version: 1.3.1
HomePage: https://github.com/PAntoine/vimgitlog
@@ -140,6 +140,10 @@ This will install GITLOG on the <f7> key.
==============================================================================
5. History *gitlog-history*
+ 1.3.1: March 8, 2013
+ PA: Fixed problem with marge branches not being diff'ed and fixed syntax
+ highlighting to handle the branches.
+
1.3.0: January 8, 2013
PA: Re-wrote the way that the files were read so it works in console mode.
View
@@ -26,7 +26,7 @@
" It is that simple.
"
" Author : peterantoine
-" version: 1.3.0
+" version: 1.3.1
" Date : 29/09/2012 14:42:03
" ---------------------------------------------------------------------------------
" Copyright (c) 2012 Peter Antoine
@@ -48,6 +48,7 @@
" 1.3.0 PA 08.01.2013 Re-wrote file opens and git commands to use the
" system rather than the redir as this works on the
" console version where redir does not.
+" 1.3.1 PA 08.03.2013 Fixed regex that was used for branch detection.
" }}}
" PUBLIC FUNCTIONS
" FUNCTION: GITLOG_GetHistory(filename) "{{{
@@ -312,7 +313,7 @@ function! s:GITLOG_GetCommitHash(required_line)
let x = getline(a:required_line)
if (stridx(x,"*") >= 0)
- let commit = substitute(x,"^.*\\*\\s\\+\\(\\x\\x\\x\\x\\x\\x\\x\\) .\\+$","\\1","")
+ let commit = substitute(x,"^[* |]\\+\\s\\+\\(\\x\\x\\x\\x\\x\\x\\x\\) .\\+$","\\1","")
else
let commit = ""
endif
View
@@ -18,10 +18,11 @@ endif
let b:current_syntax = "gl"
"highlight the branch window
-syn region glBranchLine start="^ " start="^\* " start="^> " skip=" [0-9A-Za-z\/\._\-#]\+\s\+ \x\x\x\x\x\x\x " end="$" contains=glCurrentBranchName,glSelectBranchName,glBranchHash,glLogMessage,@NoSpell keepend
+syn region glBranchLine start="^ " start="^[* |]\+ " start="^> " skip=" [0-9A-Za-z\/\._\-#]\+\s\+ \x\x\x\x\x\x\x " end="$" contains=glCruft,glCurrentBranchName,glSelectBranchName,glBranchHash,glLogMessage,@NoSpell keepend
syn match glCurrentBranchName "^\* [0-9A-Za-z\/\._\-#]\+\s\+"hs=s+2 contained containedin=glBranchLine nextgroup=glBranchHash
syn match glSelectBranchName "^> [0-9A-Za-z\/\._\-#]\+\s\+"hs=s+2 contained containedin=glBranchLine nextgroup=glBranchHash
syn match glBranchName "^ [0-9A-Za-z\/\._\-#]\+\s\+"hs=s+2 contained containedin=glBranchLine nextgroup=glBranchHash
+syn match glCruft "^[* |]\+ " contained nextgroup=glBranchHash containedin=glBranchLine
syn match glBranchHash "\x\x\x\x\x\x\x" contained contains=@NoSpell containedin=glBranchLine nextgroup=glBranchMessage
hi link glBranchHash Character
@@ -53,6 +54,7 @@ syn keyword glBranch contained branch
syn match glBranchName ": [0-9A-Za-z\/\._\-#]\+" contained containedin=glBranchHeader
hi link glLog Normal
+hi link glCruft Normal
hi link glLogHash Character
hi link glBranch Identifier
hi link glBranchName Special

0 comments on commit 3411133

Please sign in to comment.