Commits

ZyX_I  committed 95ad599

@aurum/log: Now using non-breaking space to distinguish between graph lines and commit information

  • Participants
  • Parent commits e5c74aa

Comments (0)

Files changed (11)

File plugin/aurum/log.vim

     let indentation_level=2*max([ncols, ncols+coldiff])
     let a:state[0]=coldiff
     let a:state[1]=idx
-    call map(lines, 'printf("%-*s ", indentation_level, join(v:val, ""))')
+    call map(lines, 'printf("%-*s ", indentation_level, join(v:val, ""))')
     let curspecial=a:text.special
     let shiftlen=len(lines[0])
     call s:F.glog.addcols(a:text.special, shiftlen)
     let collen=len(lines[-1])
     let a:text.block_r[0][1]+=collen
     let a:text.block_r[1][1]+=collen
-    let lines[-1].=get(a:text.text, 0, '')
+    let lines[-1]=lines[-1][:-2].' '.get(a:text.text, 0, '')
     let cchar=a:graph.output_commit_char()
     let bidx=stridx(lines[-1], cchar)
     if bidx!=-1
         let a:text.special.bullet=[0, bidx, cchar]
     endif
     for line in a:text.text[1:]
-        let lines+=[a:graph.next_line().line]
+        let lines+=[a:graph.next_line()[:-2].' '.line]
     endfor
     let a:text.text=lines
     return a:text
 "▶2 temp.syntax :: template, opts → [VimCommand] + :syn
 "▶3 Some globals
 let s:syncache={}
-let s:schs='%([|+\-/\\]\ *)'
 let s:noargtimereg='\v\d\d \S+ \d{4,} \d\d:\d\d'
 let s:ukntkws=['c', 'x', 'X', '+']
 let s:timekwregs={
     let r=[]
     let topgroups=[]
     "▲3
-    let r+=['syn match auLogFirstLineStart =\v^'.s:schs.'*[@o]\ *'.s:schs.'*= '.
+    let r+=['syn match auLogFirstLineStart =\v^[^ ]*[@o][^ ]* = '.
                 \'skipwhite nextgroup=']
     let i=0
     let nlgroups=[]
         let i+=1
     endfor
     if !empty(nlgroups)
-        let r+=['syn match auLogNextLineStart @\v'.s:schs.'+@ skipwhite '.
+        let r+=['syn match auLogNextLineStart @\v^[^ ]+ @ skipwhite '.
                     \' nextgroup='.join(nlgroups, ',')]
     endif
     call add(r, remove(r, 0))

File test/branch.ok

 {{{1 D
-@  Changeset 27 (branch D)
-|  Tags: tip
-|  @ Added abcfile
+@  Changeset 27 (branch D)
+|  Tags: tip
+|  @ Added abcfile
 {{{1 noforce C
-@  Changeset 28 (branch D)
-|  Tags: tip
-|  @ Added deffile
+@  Changeset 28 (branch D)
+|  Tags: tip
+|  @ Added deffile
 {{{1 force C
-@  Changeset 29 (branch C)
-|  Tags: tip
-|  @ Added ghifile
+@  Changeset 29 (branch C)
+|  Tags: tip
+|  @ Added ghifile
 {{{1 repo E
-@  Changeset 30 (branch E)
-|  Tags: tip
-|  @ Added jklfile
+@  Changeset 30 (branch E)
+|  Tags: tip
+|  @ Added jklfile
 >>> Messages:
 Frawor:plugin/aurum:bexsts:Error while creating branch C for repository %TMPDIR%/test/branchrepo: branch already exists
 <<< Messages^

File test/commit.ok

 {{{1
-@  Changeset 27
-|  Tags: tip
-|  @ Multiline
-|  @ commit
-|  @ comment
+@  Changeset 27
+|  Tags: tip
+|  @ Multiline
+|  @ commit
+|  @ comment
 {{{1 ,i mapping
-@  Changeset 28
-|  Tags: tip
-|  @ Jkl
+@  Changeset 28
+|  Tags: tip
+|  @ Jkl
 {{{1 ,X mapping
-@  Changeset 28
-|  Tags: tip
-|  @ Jkl
+@  Changeset 28
+|  Tags: tip
+|  @ Jkl
 {{{1 message
-@  Changeset 29
-|  Tags: tip
-|  @ Def ghi
+@  Changeset 29
+|  Tags: tip
+|  @ Def ghi
 {{{1 message+user+date
-@  Changeset 30
-|  Commited 11 Aug 2007 06:00 by A <a@example.com>
-|  Tags: tip
-|  @ Def ghi
+@  Changeset 30
+|  Commited 11 Авг 2007 06:00 by A <a@example.com>
+|  Tags: tip
+|  @ Def ghi
 {{{1 files
-@  Changeset 31
-|  Tags: tip
-|  @ Pqr
+@  Changeset 31
+|  Tags: tip
+|  @ Pqr
 >>> Messages: