Commits

ZyX_I committed f0e7e72

@%aurum/drivers/{subversion,bazaar,git}: Made them all use s:_r.utils.pyeval for rf-a* functions

  • Participants
  • Parent commits 22700a0

Comments (0)

Files changed (5)

File aurum-addon-info.txt

         "plugin/aurum/cache.vim",
         "python/aurum/__init__.py",
         "python/aurum/aumercurial.py",
+        "python/aurum/auutils.py",
         "python/aurum/rcdriverfuncs.py",
         "python/aurum/repeatedcmd.py",
         "python/aurum/utils.py",

File autoload/aurum/drivers/bazaar.vim

 scriptencoding utf-8
 execute frawor#Setup('0.0', {'@%aurum/drivers/common/hypsites': '0.0',
             \                                   '@%aurum/repo': '5.0',
-            \                   '@%aurum/drivers/common/utils': '1.0',
+            \                   '@%aurum/drivers/common/utils': '1.1',
             \                                           '@/os': '0.1',
             \                                      '@/options': '0.0',})
 let s:_messages={
                         \type(a:3)!=type([]) || len(a:3)!=1
                 call s:_f.throw('aconimp')
             endif
-            return pyeval('aurum.repeatedcmd.new('.string(a:interval).', '.
+            return s:_r.utils.pyeval('aurum.repeatedcmd.new('.
+                        \        string(a:interval).', '.
                         \       'aurum.rcdriverfuncs.bzr_status, '.
-                        \       'vim.eval("a:repo.path"), '.
-                        \       'vim.eval("a:3[0]"))')
+                        \        s:_r.utils.pystring(a:repo.path).', '.
+                        \        s:_r.utils.pystring(a:3[0]).')')
         endfunction
         function s:bzr.agetrepoprop(repo, interval, prop)
             if a:prop isnot# 'branch'
                 call s:_f.throw('anbnimp')
             endif
-            return pyeval('aurum.repeatedcmd.new('.string(a:interval).', '.
+            return s:_r.utils.pyeval('aurum.repeatedcmd.new('.
+                        \        string(a:interval).', '.
                         \       'aurum.rcdriverfuncs.bzr_branch, '.
-                        \       'vim.eval("a:repo.path"))')
+                        \        s:_r.utils.pystring(a:repo.path).')')
         endfunction
     endif
 endif

File autoload/aurum/drivers/git.vim

 scriptencoding utf-8
 execute frawor#Setup('0.1', {'@%aurum/drivers/common/hypsites': '0.0',
             \                                   '@%aurum/repo': '5.0',
-            \                   '@%aurum/drivers/common/utils': '1.0',
+            \                   '@%aurum/drivers/common/utils': '1.1',
             \                                           '@/os': '0.1',
             \                                      '@/options': '0.0',})
 let s:_messages={
                         \type(a:3)!=type([]) || len(a:3)!=1
                 call s:_f.throw('aconimp')
             endif
-            return pyeval('aurum.repeatedcmd.new('.string(a:interval).', '.
+            return s:_r.utils.pyeval('aurum.repeatedcmd.new('.
+                        \        string(a:interval).', '.
                         \       'aurum.rcdriverfuncs.git_status, '.
-                        \       'vim.eval("a:repo.path"), '.
-                        \       'vim.eval("a:3[0]"))')
+                        \        s:_r.utils.pystring(a:repo.path).', '.
+                        \        s:_r.utils.pystring(a:3[0]).')')
         endfunction
         function s:git.agetrepoprop(repo, interval, prop)
             if a:prop isnot# 'branch'
                 call s:_f.throw('anbnimp')
             endif
-            return pyeval('aurum.repeatedcmd.new('.string(a:interval).', '.
+            return s:_r.utils.pyeval('aurum.repeatedcmd.new('.
+                        \        string(a:interval).', '.
                         \       'aurum.rcdriverfuncs.git_branch, '.
-                        \       'vim.eval("a:repo.path"))')
+                        \        s:_r.utils.pystring(a:repo.path).')')
         endfunction
     endif
 endif

File autoload/aurum/drivers/mercurial.vim

     let s:pp='aurum.aumercurial'
     let s:pya=s:py.' '.s:pp.'.'
     try
-        " execute s:py "try:\n".
-                    " \"    if type(aurum).__name__=='module':\n".
-                    " \"        reload(aurum)\n".
-                    " \"except NameError:\n".
-                    " \"    pass"
         execute s:py 'import '.s:pp
         let s:usepythondriver=1
     catch

File autoload/aurum/drivers/subversion.vim

 scriptencoding utf-8
 execute frawor#Setup('0.1', {'@%aurum/drivers/common/hypsites': '0.0',
             \                                   '@%aurum/repo': '5.0',
-            \                   '@%aurum/drivers/common/utils': '1.0',
+            \                   '@%aurum/drivers/common/utils': '1.1',
             \                     '@%aurum/drivers/common/xml': '0.0',
             \                                           '@/os': '0.0',})
 let s:_messages={
                         \type(a:3)!=type([]) || len(a:3)!=1
                 call s:_f.throw('aconimp')
             endif
-            return pyeval('aurum.repeatedcmd.new('.string(a:interval).', '.
+            return s:_r.utils.pyeval('aurum.repeatedcmd.new('.
+                        \        string(a:interval).', '.
                         \       'aurum.rcdriverfuncs.svn_status, '.
-                        \       'vim.eval("a:repo.path"), '.
-                        \       'vim.eval("a:3[0]"))')
+                        \        s:_r.utils.pystring(a:repo.path).', '.
+                        \        s:_r.utils.pystring(a:3[0]).')')
         endfunction
     endif
 endif