annotate lisp/cvs-status.el @ 108079:216b6ef76da7

Support `display' text properties and overlays. xdisp.c (pop_it): When the stack is popped after displaying from a string, bidi-iterate to exit from the text portion covered by the `display' property or overlay. (Bug#5988, bug#5920)
author Eli Zaretskii <eliz@gnu.org>
date Fri, 23 Apr 2010 18:05:23 +0300
parents 3d1b30daa7a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
1 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
74439
ddcbd2c1b70d Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 70292
diff changeset
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5
70292
2b77fa42947f Update my email address.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
42557
c450330ea833 Add keyword header `tools' to actually get listed in finder.
Pavel Janík <Pavel@Janik.cz>
parents: 42217
diff changeset
7 ;; Keywords: pcl-cvs cvs status tree tools
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
14 ;; (at your option) any later version.
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; GNU General Public License for more details.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 ;;; Commentary:
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26 ;; Todo:
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
28 ;; - Somehow allow cvs-status-tree to work on-the-fly
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30 ;;; Code:
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32 (eval-when-compile (require 'cl))
58159
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
33 (require 'pcvs-util)
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 ;;;
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37 (defgroup cvs-status nil
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
38 "Major mode for browsing `cvs status' output."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
39 :group 'pcl-cvs
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
40 :prefix "cvs-status-")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
41
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
42 (easy-mmode-defmap cvs-status-mode-map
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
43 '(("n" . next-line)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
44 ("p" . previous-line)
28249
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
45 ("N" . cvs-status-next)
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
46 ("P" . cvs-status-prev)
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
47 ("\M-n" . cvs-status-next)
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
48 ("\M-p" . cvs-status-prev)
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
49 ("t" . cvs-status-cvstrees)
56750
5ca81cc9c2de (cvs-status-checkout): New function.
Masatake YAMATO <jet@gyve.org>
parents: 55790
diff changeset
50 ("T" . cvs-status-trees)
58159
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
51 (">" . cvs-mode-checkout))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
52 "CVS-Status' keymap."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53 :group 'cvs-status
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 :inherit 'cvs-mode-map)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57 ;; "Menu for `cvs-status-mode'."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 ;; '("CVS-Status"
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 ;; ["Show Tag Trees" cvs-status-tree t]
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60 ;; ))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62 (defvar cvs-status-mode-hook nil
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63 "Hook run at the end of `cvs-status-mode'.")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 (defconst cvs-status-tags-leader-re "^ Existing Tags:$")
31972
5fbecb49e386 (cvs-status-entry-leader-re): Minor fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30887
diff changeset
66 (defconst cvs-status-entry-leader-re
5fbecb49e386 (cvs-status-entry-leader-re): Minor fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30887
diff changeset
67 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 (defconst cvs-status-dir-re "^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 (defconst cvs-status-rev-re "[0-9][.0-9]*\\.[.0-9]*[0-9]")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 (defconst cvs-status-tag-re "[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 (defconst cvs-status-font-lock-keywords
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73 `((,cvs-status-entry-leader-re
63210
2e115caaa7d2 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Miles Bader <miles@gnu.org>
parents: 58159
diff changeset
74 (1 'cvs-filename)
2e115caaa7d2 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Miles Bader <miles@gnu.org>
parents: 58159
diff changeset
75 (2 'cvs-need-action))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
76 (,cvs-status-tags-leader-re
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77 (,cvs-status-rev-re
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 (save-excursion (re-search-forward "^\n" nil 'move) (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79 (progn (re-search-backward cvs-status-tags-leader-re nil t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 (forward-line 1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 (0 font-lock-comment-face))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 (,cvs-status-tag-re
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 (save-excursion (re-search-forward "^\n" nil 'move) (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (progn (re-search-backward cvs-status-tags-leader-re nil t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 (forward-line 1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
86 (1 font-lock-function-name-face)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (defconst cvs-status-font-lock-defaults
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
88 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 42557
diff changeset
89
58159
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
90 (defvar cvs-minor-wrap-function)
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
91 (put 'cvs-status-mode 'mode-class 'special)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
92 ;;;###autoload
28250
3cfb9a01a935 (cvs-status-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28249
diff changeset
93 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
94 "Mode used for cvs status output."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
95 (set (make-local-variable 'font-lock-defaults) cvs-status-font-lock-defaults)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
96 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-status-minor-wrap))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
97
28249
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
98 ;; Define cvs-status-next and cvs-status-prev
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
99 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re "entry")
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
100
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
101 (defun cvs-status-current-file ()
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
102 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
103 (forward-line 1)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
104 (or (re-search-backward cvs-status-entry-leader-re nil t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
105 (re-search-forward cvs-status-entry-leader-re))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
106 (let* ((file (match-string 1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
107 (cvsdir (and (re-search-backward cvs-status-dir-re nil t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
108 (match-string 1)))
58159
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
109 (pcldir (and (if (boundp 'cvs-pcl-cvs-dirchange-re)
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
110 (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
111 (match-string 1)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
112 (dir ""))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
113 (let ((default-directory ""))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
114 (when pcldir (setq dir (expand-file-name pcldir dir)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
115 (when cvsdir (setq dir (expand-file-name cvsdir dir)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
116 (expand-file-name file dir)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
117
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
118 (defun cvs-status-current-tag ()
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
119 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
120 (let ((pt (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
121 (col (current-column))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
122 (start (progn (re-search-backward cvs-status-tags-leader-re nil t) (point)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123 (end (progn (re-search-forward "^$" nil t) (point))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124 (when (and (< start pt) (> end pt))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
125 (goto-char pt)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
126 (end-of-line)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127 (let ((tag nil) (dist pt) (end (point)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
128 (beginning-of-line)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
129 (while (re-search-forward cvs-status-tag-re end t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130 (let* ((cole (current-column))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 (colb (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
132 (goto-char (match-beginning 1)) (current-column)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
133 (ndist (min (abs (- cole col)) (abs (- colb col)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
134 (when (< ndist dist)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
135 (setq dist ndist)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
136 (setq tag (match-string 1)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
137 tag)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
138
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
139 (defun cvs-status-minor-wrap (buf f)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
140 (let ((data (with-current-buffer buf
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141 (cons
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
142 (cons (cvs-status-current-file)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 (cvs-status-current-tag))
28857
3ec1142abebd (cvs-status-minor-wrap): Use mark-active.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28250
diff changeset
144 (when mark-active
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
145 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
146 (goto-char (mark))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
147 (cons (cvs-status-current-file)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
148 (cvs-status-current-tag))))))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
149 (let ((cvs-branch-prefix (cdar data))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
150 (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
151 (cvs-minor-current-files
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
152 (cons (caar data)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
153 (when (and (cadr data) (not (equal (caar data) (cadr data))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
154 (list (cadr data)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
155 ;; FIXME: I need to force because the fileinfos are UNKNOWN
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
156 (cvs-force-command "/F"))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
157 (funcall f))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
158
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
159 ;;
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
160 ;; Tagelt, tag element
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
161 ;;
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
163 (defstruct (cvs-tag
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164 (:constructor nil)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165 (:constructor cvs-tag-make
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 (vlist &optional name type))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
167 (:conc-name cvs-tag->))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
168 vlist
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169 name
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
170 type)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
171
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
172 (defsubst cvs-status-vl-to-str (vl) (mapconcat 'number-to-string vl "."))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
173
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
174 (defun cvs-tag->string (tag)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
175 (if (stringp tag) tag
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
176 (let ((name (cvs-tag->name tag))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
177 (vl (cvs-tag->vlist tag)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
178 (if (null name) (cvs-status-vl-to-str vl)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
179 (let ((rev (if vl (concat " (" (cvs-status-vl-to-str vl) ")") "")))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
180 (if (consp name) (mapcar (lambda (name) (concat name rev)) name)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
181 (concat name rev)))))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
182
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
183 (defun cvs-tag-compare-1 (vl1 vl2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184 (cond
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
185 ((and (null vl1) (null vl2)) 'equal)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
186 ((null vl1) 'more2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
187 ((null vl2) 'more1)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
188 (t (let ((v1 (car vl1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
189 (v2 (car vl2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
190 (cond
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
191 ((> v1 v2) 'more1)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
192 ((< v1 v2) 'more2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
193 (t (cvs-tag-compare-1 (cdr vl1) (cdr vl2))))))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
194
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195 (defsubst cvs-tag-compare (tag1 tag2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
196 (cvs-tag-compare-1 (cvs-tag->vlist tag1) (cvs-tag->vlist tag2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
197
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
198 (defun cvs-tag-merge (tag1 tag2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
199 "Merge TAG1 and TAG2 into one."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
200 (let ((type1 (cvs-tag->type tag1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
201 (type2 (cvs-tag->type tag2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
202 (name1 (cvs-tag->name tag1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
203 (name2 (cvs-tag->name tag2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
204 (unless (equal (cvs-tag->vlist tag1) (cvs-tag->vlist tag2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
205 (setf (cvs-tag->vlist tag1) nil))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
206 (if type1
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
207 (unless (or (not type2) (equal type1 type2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
208 (setf (cvs-tag->type tag1) nil))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
209 (setf (cvs-tag->type tag1) type2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
210 (if name1
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
211 (setf (cvs-tag->name tag1) (cvs-append name1 name2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
212 (setf (cvs-tag->name tag1) name2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
213 tag1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
214
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
215 (defun cvs-tree-print (tags printer column)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216 "Print the tree of TAGS where each tag's string is given by PRINTER.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
217 PRINTER should accept both a tag (in which case it should return a string)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218 or a string (in which case it should simply return its argument).
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
219 A tag cannot be a CONS. The return value can also be a list of strings,
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 if several nodes where merged into one.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 The tree will be printed no closer than column COLUMN."
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 42557
diff changeset
222
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223 (let* ((eol (save-excursion (end-of-line) (current-column)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 (column (max (+ eol 2) column)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225 (if (null tags) column
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 ;;(move-to-column-force column)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 (let* ((rev (cvs-car tags))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 (name (funcall printer (cvs-car rev)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229 (rest (append (cvs-cdr name) (cvs-cdr tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230 (prefix
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
231 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232 (or (= (forward-line 1) 0) (insert "\n"))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
233 (cvs-tree-print rest printer column))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
234 (assert (>= prefix column))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235 (move-to-column prefix t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 (assert (eolp))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
237 (insert (cvs-car name))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
238 (dolist (br (cvs-cdr rev))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
239 (let* ((column (current-column))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240 (brrev (funcall printer (cvs-car br)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 (brlength (length (cvs-car brrev)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 (brfill (concat (make-string (/ brlength 2) ? ) "|"))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243 (prefix
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245 (insert " -- ")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 (cvs-tree-print (cvs-append brrev brfill (cvs-cdr br))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 printer (current-column)))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248 (delete-region (save-excursion (move-to-column prefix) (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
250 (insert " " (make-string (- prefix column 2) ?-) " ")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
251 (end-of-line)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252 prefix))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
253
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
254 (defun cvs-tree-merge (tree1 tree2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
255 "Merge tags trees TREE1 and TREE2 into one.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
256 BEWARE: because of stability issues, this is not a symetric operation."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
257 (assert (and (listp tree1) (listp tree2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
258 (cond
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259 ((null tree1) tree2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
260 ((null tree2) tree1)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
261 (t
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
262 (let* ((rev1 (car tree1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
263 (tag1 (cvs-car rev1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
264 (vl1 (cvs-tag->vlist tag1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
265 (l1 (length vl1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
266 (rev2 (car tree2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 (tag2 (cvs-car rev2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
268 (vl2 (cvs-tag->vlist tag2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
269 (l2 (length vl2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
270 (cond
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
271 ((= l1 l2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
272 (case (cvs-tag-compare tag1 tag2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
273 (more1 (list* rev2 (cvs-tree-merge tree1 (cdr tree2))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
274 (more2 (list* rev1 (cvs-tree-merge (cdr tree1) tree2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
275 (equal
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
276 (cons (cons (cvs-tag-merge tag1 tag2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277 (cvs-tree-merge (cvs-cdr rev1) (cvs-cdr rev2)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278 (cvs-tree-merge (cdr tree1) (cdr tree2))))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 ((> l1 l2)
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
280 (cvs-tree-merge
55790
45bf91de4d41 (cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
parents: 55076
diff changeset
281 (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282 ((< l1 l2)
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
283 (cvs-tree-merge
55790
45bf91de4d41 (cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
parents: 55076
diff changeset
284 tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
286 (defun cvs-tag-make-tag (tag)
30618
9dd1a6504bdd Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents: 28857
diff changeset
287 (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
9dd1a6504bdd Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents: 28857
diff changeset
288 (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag)))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290 (defun cvs-tags->tree (tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291 "Make a tree out of a list of TAGS."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 (let ((tags
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
293 (mapcar
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
294 (lambda (tag)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
295 (let ((tag (cvs-tag-make-tag tag)))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
296 (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
55790
45bf91de4d41 (cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
parents: 55076
diff changeset
297 (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
298 tag)))))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
299 tags)))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300 (while (cdr tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
301 (let (tl)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
302 (while tags
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
303 (push (cvs-tree-merge (pop tags) (pop tags)) tl))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
304 (setq tags (nreverse tl))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
305 (car tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
307 (defun cvs-status-get-tags ()
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 "Look for a list of tags, read them in and delete them.
42206
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 34652
diff changeset
309 Return nil if there was an empty list of tags and t if there wasn't
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
310 even a list. Else, return the list of tags where each element of
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
311 the list is a three-string list TAG, KIND, REV."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
312 (let ((tags nil))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313 (if (not (re-search-forward cvs-status-tags-leader-re nil t)) t
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 (forward-char 1)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 (let ((pt (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 (lastrev nil)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 (case-fold-search t))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
318 (or
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319 (looking-at "\\s-+no\\s-+tags")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321 (progn ; normal listing
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
323 (push (list (match-string 1) (match-string 2) (match-string 3)) tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324 (forward-line 1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 (progn ; cvstree-style listing
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
329 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
330 (and lastrev
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
331 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332 (setq lastrev (or (match-string 2) lastrev))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 (push (list (match-string 3)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 (if (equal (match-string 1) " ") "branch" "revision")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335 lastrev) tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336 (forward-line 1))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 (setq tags (nreverse tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
339
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
340 (progn ; new tree style listing
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
341 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 (re3 (concat re-lead "\\(\\.\\)?\\(" cvs-status-rev-re "\\)"))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
343 (re2 (concat re-lead cvs-status-tag-re "\\(\\)"))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344 (re1 (concat re-lead cvs-status-tag-re
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 " (\\(" cvs-status-rev-re "\\))")))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
346 (while (or (looking-at re1) (looking-at re2) (looking-at re3))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
347 (push (list (match-string 3)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
348 (if (match-string 1) "branch" "revision")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
349 (match-string 4)) tags)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350 (goto-char (match-end 0))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 (when (eolp) (forward-char 1))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353 (setq tags (nreverse tags))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355 (delete-region pt (point)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
357
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 (defvar font-lock-mode)
107893
3d1b30daa7a9 * cvs-status.el (cvs-refontify): Remove unused.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
359 ;; (defun cvs-refontify (beg end)
3d1b30daa7a9 * cvs-status.el (cvs-refontify): Remove unused.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
360 ;; (when (and (boundp 'font-lock-mode)
3d1b30daa7a9 * cvs-status.el (cvs-refontify): Remove unused.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
361 ;; font-lock-mode
3d1b30daa7a9 * cvs-status.el (cvs-refontify): Remove unused.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
362 ;; (fboundp 'font-lock-fontify-region))
3d1b30daa7a9 * cvs-status.el (cvs-refontify): Remove unused.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
363 ;; (font-lock-fontify-region (1- beg) (1+ end))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365 (defun cvs-status-trees ()
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366 "Look for a lists of tags, and replace them with trees."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
367 (interactive)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
368 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 (goto-char (point-min))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370 (let ((inhibit-read-only t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371 (tags nil))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 (while (listp (setq tags (cvs-status-get-tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
373 ;;(let ((pt (save-excursion (forward-line -1) (point))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
374 (save-restriction
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
375 (narrow-to-region (point) (point))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
376 ;;(newline)
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
377 (combine-after-change-calls
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
378 (cvs-tree-print (cvs-tags->tree tags) 'cvs-tag->string 3)))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
379 ;;(cvs-refontify pt (point))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
380 ;;(sit-for 0)
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
381 ;;)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
382 ))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
383
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
384 ;;;;
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
385 ;;;; CVSTree-style trees
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
386 ;;;;
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
387
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
388 (defvar cvs-tree-use-jisx0208 nil) ;Old compat var.
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
389 (defvar cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
390 (cond
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
391 (cvs-tree-use-jisx0208 'jisx0208)
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
392 ((char-displayable-p ?━) 'unicode)
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
393 ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
394 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
395 Otherwise, default to ASCII chars like +, - and |.")
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
397 (defconst cvs-tree-char-space
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
398 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
399 (jisx0208 (make-char 'japanese-jisx0208 33 33))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
400 (unicode " ")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
401 (t " ")))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
402 (defconst cvs-tree-char-hbar
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
403 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
404 (jisx0208 (make-char 'japanese-jisx0208 40 44))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
405 (unicode "━")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
406 (t "--")))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
407 (defconst cvs-tree-char-vbar
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
408 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
409 (jisx0208 (make-char 'japanese-jisx0208 40 45))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
410 (unicode "┃")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
411 (t "| ")))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
412 (defconst cvs-tree-char-branch
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
413 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
414 (jisx0208 (make-char 'japanese-jisx0208 40 50))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
415 (unicode "┣")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
416 (t "+-")))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
417 (defconst cvs-tree-char-eob ;end of branch
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
418 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
419 (jisx0208 (make-char 'japanese-jisx0208 40 49))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
420 (unicode "┗")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
421 (t "`-")))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
422 (defconst cvs-tree-char-bob ;beginning of branch
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
423 (case cvs-tree-use-charset
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
424 (jisx0208 (make-char 'japanese-jisx0208 40 51))
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
425 (unicode "┳")
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
426 (t "+-")))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428 (defun cvs-tag-lessp (tag1 tag2)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
429 (eq (cvs-tag-compare tag1 tag2) 'more2))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430
28249
090fad6a7bcb (cvs-status-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28088
diff changeset
431 (defvar cvs-tree-nomerge nil)
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
433 (defun cvs-status-cvstrees (&optional arg)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 "Look for a list of tags, and replace it with a tree.
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
435 Optional prefix ARG chooses between two representations."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
436 (interactive "P")
55076
913c2e3a059f (cvs-tree-use-charset): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54579
diff changeset
437 (when (and cvs-tree-use-charset
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
438 (not enable-multibyte-characters))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
439 ;; We need to convert the buffer from unibyte to multibyte
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
440 ;; since we'll use multibyte chars for the tree.
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
441 (let ((modified (buffer-modified-p))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
442 (inhibit-read-only t)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
443 (inhibit-modification-hooks t))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
444 (unwind-protect
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
445 (progn
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
446 (decode-coding-region (point-min) (point-max) 'undecided)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
447 (set-buffer-multibyte t))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
448 (restore-buffer-modified-p modified))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450 (goto-char (point-min))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
451 (let ((inhibit-read-only t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 (tags nil)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 (cvs-tree-nomerge (if arg (not cvs-tree-nomerge) cvs-tree-nomerge)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 (while (listp (setq tags (cvs-status-get-tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
455 (let ((tags (mapcar 'cvs-tag-make-tag tags))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 ;;(pt (save-excursion (forward-line -1) (point)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
457 )
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
458 (setq tags (sort tags 'cvs-tag-lessp))
30887
c4366892a814 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30618
diff changeset
459 (let* ((first (car tags))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
460 (prev (if (cvs-tag-p first)
30887
c4366892a814 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30618
diff changeset
461 (list (car (cvs-tag->vlist first))) nil)))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
462 (combine-after-change-calls
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
463 (cvs-tree-tags-insert tags prev))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
464 ;;(cvs-refontify pt (point))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
465 ;;(sit-for 0)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
466 ))))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
467
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
468 (defun cvs-tree-tags-insert (tags prev)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
469 (when tags
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
470 (let* ((tag (car tags))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
471 (vlist (cvs-tag->vlist tag))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472 (nprev ;"next prev"
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
473 (let* ((next (cvs-car (cadr tags)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
474 (nprev (if (and cvs-tree-nomerge next
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
475 (equal vlist (cvs-tag->vlist next)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
476 prev vlist)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
477 (cvs-map (lambda (v p) v) nprev prev)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
478 (after (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
479 (newline)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
480 (cvs-tree-tags-insert (cdr tags) nprev)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
481 (pe t) ;"prev equal"
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
482 (nas nil)) ;"next afters" to be returned
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
483 (insert " ")
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
484 (do* ((vs vlist (cdr vs))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
485 (ps prev (cdr ps))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
486 (as after (cdr as)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
487 ((and (null as) (null vs) (null ps))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
488 (let ((revname (cvs-status-vl-to-str vlist)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
489 (if (cvs-every 'identity (cvs-map 'equal prev vlist))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
490 (insert (make-string (+ 4 (length revname)) ? )
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
491 (or (cvs-tag->name tag) ""))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
492 (insert " " revname ": " (or (cvs-tag->name tag) "")))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
493 (let* ((eq (and pe (equal (car ps) (car vs))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
494 (next-eq (equal (cadr ps) (cadr vs))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
495 (let* ((na+char
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
496 (if (car as)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
497 (if eq
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
498 (if next-eq (cons t cvs-tree-char-vbar)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
499 (cons t cvs-tree-char-branch))
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
500 (cons nil cvs-tree-char-bob))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
501 (if eq
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
502 (if next-eq (cons nil cvs-tree-char-space)
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
503 (cons t cvs-tree-char-eob))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
504 (cons nil (if (and (eq (cvs-tag->type tag) 'branch)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
505 (cvs-every 'null as))
33231
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
506 cvs-tree-char-space
c08a986392cd (cvs-tree-merge): Use cvs-butlast (avoid CL).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31972
diff changeset
507 cvs-tree-char-hbar))))))
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
508 (insert (cdr na+char))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 (push (car na+char) nas))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 (setq pe eq)))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 (nreverse nas))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
512
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 42557
diff changeset
513 ;;;;
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
514 ;;;; Merged trees from different files
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 42557
diff changeset
515 ;;;;
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
516
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
517 (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
518 )
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
519
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
520 (defun cvs-tree-fuzzy-merge (trees tree)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
521 "Do the impossible: merge TREE into TREES."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
522 ())
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
523
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
524 (defun cvs-tree ()
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
525 "Get tags from the status output and merge tham all into a big tree."
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
526 (save-excursion
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
527 (goto-char (point-min))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
528 (let ((inhibit-read-only t)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
529 (trees (make-vector 31 0)) tree)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
530 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags))))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
531 (cvs-tree-fuzzy-merge trees tree))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
532 (erase-buffer)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
533 (let ((cvs-tag-print-rev nil))
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
534 (cvs-tree-print tree 'cvs-tag->string 3)))))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 42557
diff changeset
535
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
536
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
537 (provide 'cvs-status)
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
538
58159
4d0805441612 Reduce spurious warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56752
diff changeset
539 ;; arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
28088
b442dfc3cef0 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
540 ;;; cvs-status.el ends here