Commits

ZyX_I  committed 206041c

ftplugin/aurumlog: Joined cr()/curdiff and cr()/other branches

  • Participants
  • Parent commits 3b7416b

Comments (0)

Files changed (1)

File ftplugin/aurumlog.vim

         " so no need to use getcsprop()
         let file=cs.files[str2nr(spname[4:])]
         let cmd='edit '.fnameescape(s:_r.fname('file', bvar.repo, hex, file))
-    "▶3 curdiff: view diff between changeset and current state
-    elseif spname is# 'curdiff'
-        let args=['diff', bvar.repo, '', hex]
-        if has_key(bvar.opts, 'files') && !has_key(bvar.opts.ignorefiles,'diff')
-            let fargs+=[bvar.opts.csfiles[hex]]
+    "▶3 view diff between changeset and current state or its parent
+    else
+        let args=['diff', bvar.repo]
+        if spname is# 'curdiff'
+            let args+=['', hex]
+        else
+            let args+=[hex, '']
         endif
-        let cmd='edit '.fnameescape(call(s:_r.fname, args, {}))
-    "▶3 other: view commit diff
-    else
-        let args=['diff', bvar.repo, hex, '']
         if has_key(bvar.opts, 'files') && !has_key(bvar.opts.ignorefiles,'diff')
             let args+=[bvar.opts.csfiles[hex]]
         endif