Commits

ZyX_I committed 3851f91

@aurum/status: Renamed “rev1” and “rev2” options to “rev” and “wdrev” respectively
@aurum: Removed some obsolete dependencies

  • Participants
  • Parent commits 9d17788

Comments (0)

Files changed (9)

File doc/aurum.txt

     Option  Description ~
     files   Glob. If given, only status of files that match given glob will be 
             displayed. May be specified more then once.
-    rev1    Revision. If given :AuStatus will display status not relative to 
-            working revision, but to the given one. If “rev2” is specified, 
-            then it will display status as if {rev2} was working directory 
+    rev     Revision. If given :AuStatus will display status not relative to 
+            working revision, but to the given one. If “wdrev” is specified, 
+            then it will display status as if {wdrev} was working directory 
             state and current working directory was revision from repository.
-    rev2    Revision. If given :AuStatus will display status as if {rev2} was 
+    wdrev   Revision. If given :AuStatus will display status as if {wdrev} was 
             working directory state.
     show    Either one of modified/added/removed/deleted/unknown/ignored/clean 
             or string containing capitalized first letters of mentined status 
     2.1: Added |aurum-repo.iterfuncs| support.
     2.2: Added |aurum-repo.initprops|.
 @aurum:
-    0.1: Added :AuBranch and :AuName
+    0.1: Added :AuBranch and :AuName.
 @aurum/edit:
-    1.0: Removed setlines function (moved it to @aurum/repo)
-    1.1: Added “requiresbvar” _f.newcommand option
+    1.0: Removed setlines function (moved it to @aurum/repo).
+    1.1: Added “requiresbvar” _f.newcommand option.
 @aurum/vimdiff:
     0.1: Added full, untracked, onlymodified and files options to |:AuVimDiff|
-    0.2: Added _r.vimdiff.full
+    0.2: Added _r.vimdiff.full.
 @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
+         separate graph from content using non-breaking spaces.
+    0.2: Added |:AuLog| procinput option.
+@aurum/status:
+    1.0: Renamed |:AuStatus| “rev1” and “rev2” options to “rev” and “wdrev” 
+         respectively. Same for |aurum://status| “rev1” and “rev2” options.
 
 vim: ft=help:tw=78

File plugin/aurum.vim

                 \                      '@/os': '0.1',
                 \           '@aurum/cmdutils': '0.0',
                 \                     '@/fwc': '0.2',
-                \           '@aurum/annotate': '0.0',
-                \             '@aurum/status': '0.0',
-                \                '@aurum/log': '0.0',
-                \             '@aurum/commit': '0.0',
                 \               '@aurum/repo': '2.0',
                 \               '@aurum/edit': '1.0',
-                \            '@aurum/bufvars': '0.0',
-                \            '@aurum/vimdiff': '0.0',}, 0)
+                \            '@aurum/bufvars': '0.0',}, 0)
     "▶2 Команды
     call FraworLoad('@/commands')
     call FraworLoad('@/functions')

File plugin/aurum/commit.vim

 if !exists('s:_pluginloaded')
     execute frawor#Setup('0.0', {'@/resources': '0.0',
                 \                  '@/options': '0.0',
-                \              '@aurum/status': '0.0',
+                \              '@aurum/status': '1.0',
                 \            '@aurum/cmdutils': '0.0',
                 \             '@aurum/bufvars': '0.0',
                 \                '@aurum/repo': '2.0',

File plugin/aurum/status.vim

 "▶1 
 scriptencoding utf-8
 if !exists('s:_pluginloaded')
-    execute frawor#Setup('0.0', {'@/resources': '0.0',
+    execute frawor#Setup('1.0', {'@/resources': '0.0',
                 \            '@aurum/cmdutils': '0.0',
                 \                      '@/fwc': '0.2',
                 \                '@aurum/repo': '2.0',
 "▶1 setup
 function s:F.setup(read, repo, opts)
     let opts=a:opts
-    for key in filter(['rev1', 'rev2'], 'has_key(opts, v:val)')
+    for key in filter(['rev', 'wdrev'], 'has_key(opts, v:val)')
         let opts[key]=a:repo.functions.getrevhex(a:repo, opts[key])
     endfor
     let bvar={}
-    let status=a:repo.functions.status(a:repo, get(opts, 'rev1', 0),
-                \                              get(opts, 'rev2', 0))
+    let status=a:repo.functions.status(a:repo, get(opts, 'rev',   0),
+                \                              get(opts, 'wdrev', 0))
     let bvar.status=status
     let bvar.types=[]
     let bvar.chars=[]
 let s:statfunc['@FWC']=['-onlystrings '.
             \           '['.s:_r.cmdutils.nogetrepoarg.']'.
             \           '{ *?files     (type "")'.
-            \           '   ?rev1      (type "")'.
-            \           '   ?rev2      (type "")'.
+            \           '   ?rev       (type "")'.
+            \           '   ?wdrev     (type "")'.
             \           '  *?show      (either (in [modified added removed '.
             \                                      'deleted unknown ignored '.
             \                                      'clean all] ~start, '.
             \'function': s:F.setup,
             \ 'options': {'list': ['files', 'show'],
             \             'bool': ['record'],
-            \              'str': ['rev1', 'rev2'],
+            \              'str': ['rev', 'wdrev'],
             \             'pats': ['files'],},
             \'filetype': 'aurumstatus',
             \})
 :Run! AuStatus ./gitteststatusrepo/
 :bwipeout!
 :W{{{1 Status: relative to other (1)
-:Run! AuStatus ./gitteststatusrepo/ rev1 HEAD^
+:Run! AuStatus ./gitteststatusrepo/ rev HEAD^
 :bwipeout!
 :W{{{1 Status: relative to other (2)
-:Run! AuStatus ./gitteststatusrepo/ rev2 HEAD^
+:Run! AuStatus ./gitteststatusrepo/ wdrev HEAD^
 :bwipeout!
 :W{{{1 Status: between two revisions
-:Run! AuStatus ./gittestrepo/ rev1 erevision rev2 next
+:Run! AuStatus ./gittestrepo/ rev erevision wdrev next
 :bwipeout!
 :W{{{1 Branch override fail
 :Try AuBranch next repo ./gittestrepo/

File test/stat.in

 :W{{{1 files
 :Run AuStatus files hglines.* *2* files nohglines.lst
 :bwipeout!
-:W{{{1 rev1 rev2
-:Run AuStatus rev1 1 rev2 2
+:W{{{1 rev wdrev
+:Run AuStatus rev 1 wdrev 2
 :bwipeout!
 :W{{{1 show
 :W{{{2 show all

File test/stat.ok

 {{{1 files
 ! nohglines.lst
 R hglines2.lst
-{{{1 rev1 rev2
+{{{1 rev wdrev
 M crepo.zsh
 {{{1 show
 {{{2 show all

File test/statmaps.in

 :bwipeout!
 :bwipeout!
 :W{{{1 2C
-:R AuStatus rev1 tip rev2 -2
+:R AuStatus rev tip wdrev -2
 gg2C:WTabs
 ,X:bwipeout!
 :W{{{1 gD

File test/statmaps.ok

 d: 1
 {{{1 2C
  1#1: 
- 1*2: aurum://status:%ETMPDIR%%-test%-statmapsrepo:rev1:tip,rev2:-2,
+ 1*2: aurum://status:%ETMPDIR%%-test%-statmapsrepo:rev:tip,wdrev:-2,
  2*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
  2#2: 
 *3*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file