Commits

ZyX_I committed 9de8bb0

@aurum/log: Incremented version number
@aurum/vimdiff: Renamed “usewin” option to “vimdiffusewin”

Comments (0)

Files changed (16)

                  Note: each pattern must contain at least one non-word 
                        character (|/\W|).
     [no]curfile  Determines whether current state of the file should be used.
-    [no]usewin   Overrides |g:aurum_usewin|. Determines whether new window 
-                 should be opened instead of using existing one. First file 
-                 will always be opened in current window unless “full” is 
+    [no]usewin   Overrides |g:aurum_vimdiffusewin|. Determines whether new 
+                 window should be opened instead of using existing one. First 
+                 file will always be opened in current window unless “full” is 
                  enabled.
     [no]full     If enabled, opens multiple tabs containing all files changed 
                  between selected revisions (revisions and working directory 
                  state if “curfile” is enabled). Overrides “file” option, 
-                 makes |g:aurum_usewin| and “usewin” options not applicable.
+                 makes |g:aurum_vimdiffusewin| and “usewin” options not 
+                 applicable.
     [no]onlymodified
                  Determines whether removed and added files should be included 
                  in the full diff (default: not included: option enabled).
     commit is done. See note under |g:AuPreviousCommitMessage|.
     Default: 1.
 
-usewin                                                        *g:aurum_usewin*
+vimdiffusewin                                          *g:aurum_vimdiffusewin*
     Bool. Determines whether |:AuVimDiff| should use existing window. Existing 
     window will be used if it is located to the left or right ('diffopt' 
     contains “vertical”) or below or above ('diffopt' does not contain 
 @aurum/vimdiff:
     0.1: Added full, untracked, onlymodified and files options to |:AuVimDiff|
     0.2: Added _r.vimdiff.full.
+    1.0: Renamed g:aurum_usewin option to |g:aurum_vimdiffusewin|.
 @aurum/log:
     0.1: Added |aurum-style-git| and |aurum-style-gitoneline| log styles, 
          added skipping of $rev if |aurum-repo.hasrevisions| is false, made it 
          separate graph from content using non-breaking spaces.
     0.2: Added |:AuLog| procinput option.
     0.3: Added @-@ and @.@ expr “variables”.
+    1.0: Added |g:aurum_loglimit| option, added ability to use “nolimit” in 
+         addition to “limit N”, renamed g:aurum_closewindow to 
+         |g:aurum_closelogwindow|.
 @aurum/status:
     1.0: Renamed |:AuStatus| “rev1” and “rev2” options to “rev” and “wdrev” 
          respectively. Same for |aurum://status| “rev1” and “rev2” options.

ftplugin/aurumannotate.vim

 setlocal nomodeline
 execute frawor#Setup('0.0', {'@aurum/repo': '3.0',
             \             '@aurum/bufvars': '0.0',
-            \             '@aurum/vimdiff': '0.2',
+            \             '@aurum/vimdiff': '1.0',
             \            '@aurum/annotate': '1.0',
             \                '@aurum/edit': '1.2',
             \                 '@/mappings': '0.0',

ftplugin/aurumlog.vim

             \                    '@aurum/repo': '3.0',
             \                    '@aurum/edit': '1.0',
             \                           '@/os': '0.0',
-            \                 '@aurum/vimdiff': '0.0',
+            \                 '@aurum/vimdiff': '1.0',
             \                     '@/mappings': '0.0',})
 let s:_messages={
             \'nocontents': 'Log is empty',

ftplugin/aurumstatus.vim

 setlocal noswapfile
 setlocal nomodeline
 execute frawor#Setup('0.0', {'@aurum/bufvars': '0.0',
-            \                '@aurum/vimdiff': '0.2',
+            \                '@aurum/vimdiff': '1.0',
             \               '@aurum/cmdutils': '1.0',
             \                   '@aurum/edit': '1.2',
             \                 '@aurum/commit': '1.0',

plugin/aurum/diff.vim

     execute frawor#Setup('0.0', {'@aurum/cmdutils': '1.0',
                 \                 '@aurum/bufvars': '0.0',
                 \               '@aurum/lineutils': '0.0',
-                \                 '@aurum/vimdiff': '0.2',
+                \                 '@aurum/vimdiff': '1.0',
                 \                    '@aurum/repo': '3.0',
                 \                    '@aurum/edit': '1.2',
                 \                           '@/os': '0.0',

plugin/aurum/file.vim

     execute frawor#Setup('0.0', {'@aurum/cmdutils': '1.0',
                 \                 '@aurum/bufvars': '0.0',
                 \               '@aurum/lineutils': '0.0',
-                \                 '@aurum/vimdiff': '0.0',
+                \                 '@aurum/vimdiff': '1.0',
                 \                    '@aurum/repo': '3.0',
                 \                    '@aurum/edit': '1.2',
                 \                           '@/os': '0.0',

plugin/aurum/log.vim

 "▶1
 scriptencoding utf-8
 if !exists('s:_pluginloaded')
-    execute frawor#Setup('0.3', {'@/table': '0.1',
+    execute frawor#Setup('1.0', {'@/table': '0.1',
                 \        '@aurum/cmdutils': '1.0',
                 \   '@aurum/log/templates': '0.0',
                 \       '@aurum/lineutils': '0.0',

plugin/aurum/vimdiff.vim

 "▶1 
 scriptencoding utf-8
 if !exists('s:_pluginloaded')
-    execute frawor#Setup('0.2', {'@/os': '0.0',
+    execute frawor#Setup('1.0', {'@/os': '0.0',
                 \     '@aurum/cmdutils': '1.0',
                 \         '@aurum/edit': '1.3',
                 \               '@/fwc': '0.0',
     finish
 endif
 let s:_options={
-            \   'usewin': {'default': 0, 'filter': 'bool'},
+            \'vimdiffusewin': {'default': 0, 'filter': 'bool'},
         \}
 let s:_messages={
             \'nodfile': 'Failed to deduce which file to diff with',
     call s:_f.mapgroup.map('AuVimDiff', buf)
     "▶2 `usewin' option support
     " Uses left/right or upper/lower window if it has similar dimensions
-    if (a:usewin==-1 ? s:_f.getoption('usewin') : a:usewin) && winnr('$')>1
+    if (a:usewin==-1 ? s:_f.getoption('vimdiffusewin') : a:usewin)
+                \&& winnr('$')>1
         diffthis
         if s:F.findwindow()
             let prevbuf=s:_r.prevbuf()
             call s:_f.throw('nodfile')
         endif
         let usewin=get(a:opts, 'usewin', -1)
-        let usewin=(usewin==-1 ? s:_f.getoption('usewin') : usewin)
+        let usewin=(usewin==-1 ? s:_f.getoption('vimdiffusewin') : usewin)
         let fbuf=s:F.openfile(usewin, hasbuf, repo, revs, file)
         if bufwinnr(fbuf)!=-1
             execute bufwinnr(fbuf).'wincmd w'

test/gentests-setuptestrepos.zsh

 
 for test in cmd-annotate-buffers cmd+maps-commit cmd-record cmd-status \
             maps-status cmd-vimdiff cmd-diff cmd-update opts-remembermsg \
-            opts-usewin cmd-vimdiff-full cmdaus
+            opts-vimdiffusewin cmd-vimdiff-full cmdaus
 do
     mkdir ${test}repo
     tar c -C hgtestrepo . | (cd ${test}repo && tar x)

test/opts-usewin.in

-:R silent edit nohglinesrev.lst
-:split
-:let g:aurum_usewin=0
-:AuVimDiff
-:WW
-:wincmd p
-:WW
-:bwipeout!
-:let g:aurum_usewin=1
-:AuVimDiff
-:WW
-:wincmd p
-:WW
-:bwipeout!
-:set diffopt+=vertical
-:vsplit
-:AuVimDiff
-:WW
-:wincmd p
-:WW
-:bwipeout!
-:source addmessages.vim

test/opts-usewin.ok

-#1: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-*2: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
- 3: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-*1: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#2: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
- 3: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-*1: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-#2: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#1: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-*2: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-*1: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-#2: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#1: %TMPDIR%/test/opts-usewinrepo/nohglinesrev.lst
-*2: aurum://file:%ETMPDIR%%-test%-opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst

test/opts-vimdiffusewin.in

+:R silent edit nohglinesrev.lst
+:split
+:let g:aurum_vimdiffusewin=0
+:AuVimDiff
+:WW
+:wincmd p
+:WW
+:bwipeout!
+:let g:aurum_vimdiffusewin=1
+:AuVimDiff
+:WW
+:wincmd p
+:WW
+:bwipeout!
+:set diffopt+=vertical
+:vsplit
+:AuVimDiff
+:WW
+:wincmd p
+:WW
+:bwipeout!
+:source addmessages.vim

test/opts-vimdiffusewin.ok

+#1: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+ 3: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+*1: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#2: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+ 3: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+*1: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+#2: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#1: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+*2: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*1: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+#2: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#1: %TMPDIR%/test/opts-vimdiffusewinrepo/nohglinesrev.lst
+*2: aurum://file:%ETMPDIR%%-test%-opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst

test/regression-vimdiff-nodiffoff.in

-:let g:aurum_usewin=1
+:let g:aurum_vimdiffusewin=1
 :set hidden
 :set splitright
 :set diffopt+=vertical

test/wine/opts-usewin.ok

-#1: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-*2: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
- 3: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-*1: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#2: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
- 3: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-*1: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-#2: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#1: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-*2: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-*1: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-#2: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
-#1: %TMPDIR%\test\opts-usewinrepo\nohglinesrev.lst
-*2: aurum:\\file:%ETMPDIR%%+test%+opts-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst

test/wine/opts-vimdiffusewin.ok

+#1: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+ 3: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+*1: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#2: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+ 3: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+*1: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+#2: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#1: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+*2: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*1: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+#2: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+#1: %TMPDIR%\test\opts-vimdiffusewinrepo\nohglinesrev.lst
+*2: aurum:\\file:%ETMPDIR%%+test%+opts-vimdiffusewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst