merged
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 17 Oct 2014 22:36:00 +0300
changeset 1165 51cebd6ff0ac
parent 1163 e7728b2522b2 (diff)
parent 1164 ca644074aac4 (current diff)
child 1166 ea9a6964c811
merged
.emacs-my
--- a/.emacs-my	Tue Oct 14 23:47:08 2014 +0300
+++ b/.emacs-my	Fri Oct 17 22:36:00 2014 +0300
@@ -2110,6 +2110,26 @@
 ;; (setq vc-git-diff-switches "-b")
 ;; (setq vc-diff-switches "-b")
 
+(defun my-vc-root-diff (prefix)
+  "Same as `vc-root-diff' but for Hg with C-u show latest MQ patch and
+with C-u C-u show MQ patch and local changes."
+  (interactive "P")
+  (when (eq 'non-hg-mq
+            (catch 'break
+              (unless (and prefix (eq (vc-deduce-backend) 'Hg))
+                (throw 'break 'non-hg-mq))
+              (let* ( (rootdir (vc-call-backend 'Hg 'root default-directory)) (default-directory rootdir) )
+                (unless (eq (vc-hg-command nil t rootdir "log" "-r" "qtip") 0)
+                  (throw 'break 'non-hg-mq))
+                (cond
+                 ((equal prefix '(4))
+                  (vc-diff-internal t (list 'Hg (list rootdir)) "qparent" "qtip"))
+                 ((equal prefix '(16))
+                  (vc-diff-internal t (list 'Hg (list rootdir)) "qparent" nil)) ))))
+    (call-interactively 'vc-root-diff nil) ))
+
+(global-set-key (kbd "C-x v D") 'my-vc-root-diff)
+
 (when (equal window-system 'w32)
   (modify-coding-system-alist 'process "cvs" '(cp1251-dos . cp1251-dos))
   (modify-coding-system-alist 'process "svn" '(cp1251 . cp1251))
--- a/maven-central.el	Tue Oct 14 23:47:08 2014 +0300
+++ b/maven-central.el	Fri Oct 17 22:36:00 2014 +0300
@@ -134,6 +134,7 @@
 
 (defvar maven.help-buffer-name "*Maven Help*")
 
+;;;###autoload
 (defun maven.help ()
   "Run help:describe for plugin at point."
   (interactive)