No subject
Tue Jan 27 15:54:36 PST 2015
Modified Paths:
--------------
users/chunyang/helm-ls-svn.el/helm-ls-svn.el
Modified: users/chunyang/helm-ls-svn.el/helm-ls-svn.el
===================================================================
--- users/chunyang/helm-ls-svn.el/helm-ls-svn.el 2015-06-13 11:53:16 UTC (rev 137510)
+++ users/chunyang/helm-ls-svn.el/helm-ls-svn.el 2015-06-13 12:14:47 UTC (rev 137511)
@@ -6,7 +6,7 @@
;; Created: Wed Jun 10 20:58:26 CST 2015
;; Version: 0.1
;; URL: https://trac.macports.org/browser/users/chunyang/helm-ls-svn.el
-;; Package-Requires: ((emacs "24.1") (helm "1.7.0"))
+;; Package-Requires: ((emacs "24.1") (helm "1.7.0") (cl-lib "0.5"))
;; Keywords: helm svn
;; This file is not part of Emacs.
@@ -32,7 +32,7 @@
;; TODO
;; ====
;;
-;; - Improve svn status source.
+;; - Implement persistent action (diff) for status source.
;; - Helm-find-files integration.
;; - Submit to melpa.
;; - Find out a suitable way to search in svn project.
@@ -40,6 +40,9 @@
;;; Code:
+(require 'cl-lib)
+(require 'vc)
+(require 'vc-svn)
(require 'helm-files)
;; Define the sources.
@@ -102,6 +105,52 @@
(expand-file-name (cadr (split-string candidate)) root)))
candidates)))
+(defun helm-ls-svn-diff (candidate)
+ (find-file candidate)
+ (call-interactively #'vc-diff))
+
+(defun helm-ls-svn-revert (_candidate)
+ (let ((marked (helm-marked-candidates)))
+ (cl-loop for f in marked do
+ (progn
+ (vc-svn-revert f)
+ (helm-aif (get-file-buffer f)
+ (with-current-buffer it
+ (revert-buffer t t)))))))
+
+(defun helm-ls-svn-status-action-transformer (actions _candidate)
+ (let ((disp (helm-get-selection nil t)))
+ (cond ((string-match "^?" disp)
+ (append actions
+ (helm-make-actions
+ "Add files(s)"
+ (lambda (candidate)
+ (let ((default-directory
+ (file-name-directory candidate))
+ (marked (helm-marked-candidates)))
+ (vc-call-backend 'SVN 'register marked)))
+ "Delete file(s)"
+ #'helm-delete-marked-files)))
+ ((string-match "^M" disp)
+ (append actions
+ (helm-make-actions
+ "Diff file" #'helm-ls-svn-diff
+ "Commit file(s)"
+ (lambda (_candidate)
+ (let* ((marked (helm-marked-candidates))
+ (default-directory
+ (file-name-directory (car marked))))
+ (vc-checkin marked 'SVN)))
+ "Revert file(s)" #'helm-ls-svn-revert
+ "Copy file(s) `C-u to follow'" #'helm-find-files-copy
+ "Rename file(s) `C-u to follow'" #'helm-find-files-rename)))
+ ((string-match "^A" disp)
+ (append actions
+ (helm-make-actions
+ "svn delete" #'vc-svn-delete-file
+ "Revert file(s)" #'helm-ls-svn-revert)))
+ (t actions))))
+
(defclass helm-ls-svn-source (helm-source-in-buffer)
((header-name :initform 'helm-ls-svn-header-name)
(init :initform 'helm-ls-svn-init)
@@ -118,6 +167,10 @@
(helm-ls-svn-status))))
(keymap :initform helm-ls-svn-map)
(filtered-candidate-transformer :initform 'helm-ls-svn-status-transformer)
+ ;; TODO: Implement persistent action
+ ;; (persistent-action :initform 'helm-ls-svn-diff)
+ ;; (persistent-help :initform "Diff")
+ (action-transformer :initform 'helm-ls-svn-status-action-transformer)
(action :initform
(helm-make-actions
"Find file" 'helm-find-many-files
--zICm0pVAdRg
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137511] users/chunyang/helm-ls-svn.el/helm-ls-svn.el</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137511">137511</a></dd>
<dt>Author</dt> <dd>chunyang at macports.org</dd>
<dt>Date</dt> <dd>2015-06-13 05:14:47 -0700 (Sat, 13 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>users/chunyang: helm-ls-svn.el: Add transformer actions to helm-ls-svn-status-source
More information about the macports-changes
mailing list