rpms/subversion/devel subversion-1.2.3.tar.gz.asc, NONE, 1.1 psvn.el, 1.2, 1.3 subversion.spec, 1.56, 1.57 subversion-1.2.0.tar.gz.asc, 1.1, NONE subversion-1.2.1.tar.gz.asc, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 8 15:51:46 UTC 2005
- Previous message (by thread): rpms/subversion/devel filter-requires.sh, 1.2, 1.3 mirrors, 1.2, 1.3 sources, 1.18, 1.19 subversion.conf, 1.6, 1.7 subversion.spec, 1.55, 1.56 upstream, 1.8, 1.9
- Next message (by thread): rpms/e2fsprogs/devel e2fsprogs-1.38-close-on-error.patch, NONE, 1.1 e2fsprogs-1.38-man_no_ext2resize.patch, NONE, 1.1 e2fsprogs-1.38-resize-inode.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 e2fsprogs.spec, 1.36, 1.37 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/dist/rpms/subversion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26222
Modified Files:
psvn.el subversion.spec
Added Files:
subversion-1.2.3.tar.gz.asc
Removed Files:
subversion-1.2.0.tar.gz.asc subversion-1.2.1.tar.gz.asc
Log Message:
- update to psvn.el r16070 from Stefan Reichoer
- synch up gpg sigs
--- NEW FILE subversion-1.2.3.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQBDBjqxckGFa2QeNYsRAkcNAJ42WB3iOwIUTw1D1qe16EF+VdY38gCfULIa
EXMYm9B/8vzHiA291RzPD9o=
=PBvR
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQBDCOB51sYklxbYtBwRApZXAJ0Rli0pftoFmtPxyK4dZhtEqtRHmgCfc9Sa
uriPXYfLCL7vLVtAyWT+ZUE=
=dYMw
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
iD8DBQBDC3aUU0gaaOxrUVYRAsXFAKCdijywtRr8FgumIVZ86sWGeAPzoACgwMrM
c3fljLhDhoFh5Bvm4LnXbAI=
=TjD2
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.3.92 (GNU/Linux)
iD8DBQBDC4uavJ27E9sAokgRAjDJAJ9GUvTiB9k0CrwQM6vlBrbkK0rGmgCgvXn3
NynhJTPGuZQ9VjuZjq2Qt5M=
=Og+R
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)
iD8DBQBDC5xyFqlkleIiZ5URAuBrAKChTMg+tMXLGc5Rn1v6o0A/SO61YQCeP4+y
BHB+uSULB1YAuYBKOuClEpg=
=A+8t
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQBDC55m+9nuM9mwoJkRAnkcAJ9euivOvwFk04qkCg3QkzUAdaZQfgCfTTXb
GCAJ0/7ub2iAftioEqQVBhw=
=QhrS
-----END PGP SIGNATURE-----
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 psvn.el
Index: psvn.el
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/psvn.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- psvn.el 23 Sep 2004 08:34:44 -0000 1.2
+++ psvn.el 8 Sep 2005 15:51:44 -0000 1.3
@@ -1,5 +1,5 @@
;;; psvn.el --- Subversion interface for emacs
-;; Copyright (C) 2002-2004 by Stefan Reichoer
+;; Copyright (C) 2002-2005 by Stefan Reichoer
;; Author: Stefan Reichoer, <stefan at xsteve.at>
;; $Id$
@@ -22,24 +22,27 @@
;;; Commentary
;; psvn.el is tested with GNU Emacs 21.3 on windows, debian linux,
-;; freebsd5 with svn 1.05
+;; freebsd5, red hat el3 with svn 1.1.1
;; psvn.el is an interface for the revision control tool subversion
;; (see http://subversion.tigris.org)
;; psvn.el provides a similar interface for subversion as pcl-cvs for cvs.
;; At the moment the following commands are implemented:
;; M-x svn-status: run 'svn -status -v'
-;; and show the result in the *svn-status* buffer. This buffer uses
-;; svn-status mode in which the following keys are defined:
+;; and show the result in the svn-status-buffer-name buffer (normally: *svn-status*).
+;; If svn-status-verbose is set to nil, only "svn status" without "-v"
+;; is run. Currently you have to toggle this variable manually.
+;; This buffer uses svn-status mode in which the following keys are defined:
;; g - svn-status-update: run 'svn status -v'
+;; M-s - svn-status-update: run 'svn status -v'
;; C-u g - svn-status-update: run 'svn status -vu'
;; = - svn-status-show-svn-diff run 'svn diff'
;; l - svn-status-show-svn-log run 'svn log'
;; i - svn-status-info run 'svn info'
;; r - svn-status-revert run 'svn revert'
-;; V - svn-status-resolved run 'svn resolved'
+;; X v - svn-status-resolved run 'svn resolved'
;; U - svn-status-update-cmd run 'svn update'
-;; c - svn-status-commit-file run 'svn commit'
+;; c - svn-status-commit run 'svn commit'
;; a - svn-status-add-file run 'svn add --non-recursive'
;; A - svn-status-add-file-recursively run 'svn add'
;; + - svn-status-make-directory run 'svn mkdir'
@@ -51,6 +54,7 @@
;; ^ - svn-status-examine-parent
;; ~ - svn-status-get-specific-revision
;; E - svn-status-ediff-with-revision
+;; X X - svn-status-resolve-conflicts
;; s - svn-status-show-process-buffer
;; e - svn-status-toggle-edit-cmd-flag
;; ? - svn-status-toggle-hide-unknown
@@ -58,16 +62,20 @@
;; m - svn-status-set-user-mark
;; u - svn-status-unset-user-mark
;; $ - svn-status-toggle-elide
+;; w - svn-status-copy-filename-as-kill
;; DEL - svn-status-unset-user-mark-backwards
;; * ! - svn-status-unset-all-usermarks
;; * ? - svn-status-mark-unknown
;; * A - svn-status-mark-added
;; * M - svn-status-mark-modified
+;; * D - svn-status-mark-deleted
+;; * * - svn-status-mark-changed
;; . - svn-status-goto-root-or-return
;; f - svn-status-find-file
;; o - svn-status-find-file-other-window
;; v - svn-status-view-file-other-window
;; I - svn-status-parse-info
+;; V - svn-status-svnversion
;; P l - svn-status-property-list
;; P s - svn-status-property-set
;; P d - svn-status-property-delete
@@ -77,9 +85,26 @@
;; P C-i - svn-status-property-edit-svn-ignore
;; P k - svn-status-property-set-keyword-list
;; P y - svn-status-property-set-eol-style
+;; P x - svn-status-property-set-executable
;; h - svn-status-use-history
;; q - svn-status-bury-buffer
+;; C-x C-j - svn-status-dired-jump
+
+;; The output in the buffer contains this header to ease reading
+;; of svn output:
+;; FPH BASE CMTD Author em File
+;; F = Filemark
+;; P = Property mark
+;; H = History mark
+;; BASE = local base revision
+;; CMTD = last committed revision
+;; Author = author of change
+;; em = "**" or "(Update Available)" [see `svn-status-short-mod-flag-p']
+;; if file can be updated
+;; File = path/filename
+;;
+
;; To use psvn.el put the following line in your .emacs:
;; (require 'psvn)
;; Start the svn interface with M-x svn-status
@@ -100,9 +125,6 @@
;; unfortunately `read-directory-name' doesn't exist in Emacs 21.3
;; * Add repository browser
;; * Improve support for svn blame
-;; * Support for editing the log file entries, e.g.:
-;; svn propedit --revprop -r9821 svn:log
-;; * Better logview mode (allow to show the changeset for a given entry)
;; Overview over the implemented/not (yet) implemented svn sub-commands:
;; * add implemented
@@ -142,13 +164,20 @@
;;; Code:
+(require 'easymenu)
+
;;; user setable variables
+(defvar svn-status-verbose t "*Add '-v' to svn status call.")
(defvar svn-log-edit-file-name "++svn-log++" "*Name of a saved log file.")
(defvar svn-log-edit-insert-files-to-commit t "*Insert the filelist to commit in the *svn-log* buffer")
-(defvar svn-status-hide-unknown nil "*Hide unknown files in *svn-status* buffer.")
-(defvar svn-status-hide-unmodified nil "*Hide unmodified files in *svn-status* buffer.")
-(defvar svn-status-directory-history nil "*List of visited svn working directories.")
-(defvar svn-status-sort-status-buffer t "Sort the *svn-status* buffer.
+(defvar svn-log-edit-use-log-edit-mode (and (condition-case nil (require 'log-edit) (error nil)) t) "*Use log-edit-mode as base for svn-log-edit-mode")
+(defvar svn-status-hide-unknown nil
+ "*Hide unknown files in `svn-status-buffer-name' buffer.
+This can be toggled with \[svn-status-toggle-hide-unknown].")
+(defvar svn-status-hide-unmodified nil
+ "*Hide unmodified files in `svn-status-buffer-name' buffer.
+This can be toggled with \[svn-status-toggle-hide-unmodified].")
+(defvar svn-status-sort-status-buffer t "Sort the `svn-status-buffer-name' buffer.
Setting this variable to nil speeds up M-x svn-status.
However, it is possible, that the sorting is wrong in this case.")
@@ -156,18 +185,100 @@
"*List of operations after which all user marks will be removed.
Possible values are: commit, revert.")
+(defvar svn-status-negate-meaning-of-arg-commands nil
+ "*List of operations that should use a negated meaning of the prefix argument.
+The supported functions are `svn-status' and `svn-status-set-user-mark'.")
+
+(defvar svn-status-svn-executable "svn" "*The name of the svn executable.")
+
+;; TODO: bind `process-environment' instead of running env?
+;; That would probably work more reliably in Windows.
+(defvar svn-status-svn-environment-var-list nil
+ "*A list of environment variables that should be set for that svn process.
+If you set that variable, svn is called with that environment variables set.
+That is done via the env program.
+
+You could set it for example to '(\"LANG=C\")")
+
+(defvar svn-browse-url-function nil
+ ;; If the user hasn't changed `svn-browse-url-function', then changing
+ ;; `browse-url-browser-function' should affect psvn even after it has
+ ;; been loaded.
+ "Function to display a Subversion related WWW page in a browser.
+So far, this is used only for \"trac\" issue tracker integration.
+By default, this is nil, which means use `browse-url-browser-function'.
+Any non-nil value overrides that variable, with the same syntax.")
+
+(defvar svn-status-window-alist
+ '((diff "*svn-diff*") (log "*svn-log*") (info t) (blame t) (proplist t) (update t))
+ "An alist to specify which windows should be used for svn command outputs.
+The following keys are supported: diff, log, info, blame, proplist, update.
+The following values can be given:
+nil ... show in *svn-process* buffer
+t ... show in dedicated *svn-info* buffer
+invisible ... don't show the buffer (eventually useful for update)
+a string ... show in a buffer named string")
+
+(defvar svn-status-short-mod-flag-p t
+ "*Whether the mark for out of date files is short or long.
+
+If this variable is is t, and a file is out of date (i.e., there is a newer
+version in the repository than the working copy), then the file will
+be marked by \"**\"
+
+If this variable is nil, and the file is out of date then the longer phrase
+\"(Update Available)\" is used.
+
+In either case the mark gets the face
+`svn-status-update-available-face', and will only be visible if
+`\\[svn-status-update]' is run with a prefix argument")
+
+(defvar svn-status-debug-level 0 "The psvn.el debugging verbosity level.
+The higher the number, the more debug messages are shown.
+
+See `svn-status-message' for the meaning of values for that variable.")
+
+(defvar svn-status-buffer-name "*svn-status*" "Name for the svn status buffer")
+
+(defvar svn-status-use-header-line t
+ "*Whether a header line should be used.
[...2344 lines suppressed...]
(setq svn-status-sort-status-buffer
- (nth 1 (assoc "sort-status-buffer" svn-status-options))))
- (error "%s is not readable." file))
- (message "Loaded %s" file)))
+ (nth 1 (assoc "sort-status-buffer" svn-status-options)))
+ (setq svn-trac-project-root
+ (nth 1 (assoc "svn-trac-project-root" svn-status-options)))
+ (setq svn-status-elided-list
+ (nth 1 (assoc "elide-list" svn-status-options)))
+ (setq svn-status-module-name
+ (nth 1 (assoc "module-name" svn-status-options)))
+ (when (and (interactive-p) svn-status-elided-list (svn-status-apply-elide-list)))
+ (message "psvn.el: loaded %s" file))
+ (unless no-error (error "psvn.el: %s is not readable." file)))))
(defun svn-status-toggle-sort-status-buffer ()
"If you turn off sorting, you can speed up M-x svn-status.
@@ -2358,9 +3265,179 @@
display routine for svn-status is available."
(interactive)
(setq svn-status-sort-status-buffer (not svn-status-sort-status-buffer))
- (message (concat "The *svn-status* buffer will be"
- (if svn-status-sort-status-buffer "" " not")
- " sorted.")))
+ (message "The %s buffer will be%s sorted." svn-status-buffer-name
+ (if svn-status-sort-status-buffer "" " not")))
+
+(defun svn-status-toggle-display-full-path ()
+ "Toggle displaying the full path in the `svn-status-buffer-name' buffer"
+ (interactive)
+ (setq svn-status-display-full-path (not svn-status-display-full-path))
+ (message "The %s buffer will%s use full path names." svn-status-buffer-name
+ (if svn-status-display-full-path "" " not"))
+ (svn-status-update))
+
+(defun svn-status-set-trac-project-root ()
+ (interactive)
+ (setq svn-trac-project-root
+ (read-string "Trac project root (e.g.: http://projects.edgewall.com/trac/): "
+ svn-trac-project-root))
+ (when (yes-or-no-p "Save the new setting for svn-trac-project-root to disk? ")
+ (svn-status-save-state)))
+
+(defun svn-status-set-module-name ()
+ "Interactively set svn-status-module-name."
+ (interactive)
+ (setq svn-status-module-name
+ (read-string "Short Unit Name (e.g.: MyProject): "
+ svn-status-module-name))
+ (when (yes-or-no-p "Save the new setting for svn-status-module-name to disk? ")
+ (svn-status-save-state)))
+
+(defun svn-browse-url (url)
+ "Call `browse-url', using `svn-browse-url-function'."
+ (let ((browse-url-browser-function (or svn-browse-url-function
+ browse-url-browser-function)))
+ (browse-url url)))
+
+;; --------------------------------------------------------------------------------
+;; svn status trac integration
+;; --------------------------------------------------------------------------------
+(defun svn-trac-browse-timeline ()
+ "Open the trac timeline view for the current svn repository."
+ (interactive)
+ (unless svn-trac-project-root
+ (svn-status-set-trac-project-root))
+ (svn-browse-url (concat svn-trac-project-root "timeline")))
+
+(defun svn-trac-browse-changeset (changeset-nr)
+ "Show a changeset in the trac issue tracker."
+ (interactive (list (read-number "Browse changeset number: " (number-at-point))))
+ (unless svn-trac-project-root
+ (svn-status-set-trac-project-root))
+ (svn-browse-url (concat svn-trac-project-root "changeset/" (number-to-string changeset-nr))))
+
+(defun svn-trac-browse-ticket (ticket-nr)
+ "Show a ticket in the trac issue tracker."
+ (interactive (list (read-number "Browse ticket number: " (number-at-point))))
+ (unless svn-trac-project-root
+ (svn-status-set-trac-project-root))
+ (svn-browse-url (concat svn-trac-project-root "ticket/" (number-to-string ticket-nr))))
+
+;;;------------------------------------------------------------
+;;; resolve conflicts using ediff
+;;;------------------------------------------------------------
+(defun svn-resolve-conflicts-ediff (&optional name-A name-B)
+ "Invoke ediff to resolve conflicts in the current buffer.
+The conflicts must be marked with rcsmerge conflict markers."
+ (interactive)
+ (let* ((found nil)
+ (file-name (file-name-nondirectory buffer-file-name))
+ (your-buffer (generate-new-buffer
+ (concat "*" file-name
+ " " (or name-A "WORKFILE") "*")))
+ (other-buffer (generate-new-buffer
+ (concat "*" file-name
+ " " (or name-B "CHECKED-IN") "*")))
+ (result-buffer (current-buffer)))
+ (save-excursion
+ (set-buffer your-buffer)
+ (erase-buffer)
+ (insert-buffer result-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward "^<<<<<<< .mine\n" nil t)
+ (setq found t)
+ (replace-match "")
+ (if (not (re-search-forward "^=======\n" nil t))
+ (error "Malformed conflict marker"))
+ (replace-match "")
+ (let ((start (point)))
+ (if (not (re-search-forward "^>>>>>>> .r[0-9]+\n" nil t))
+ (error "Malformed conflict marker"))
+ (delete-region start (point))))
+ (if (not found)
+ (progn
+ (kill-buffer your-buffer)
+ (kill-buffer other-buffer)
+ (error "No conflict markers found")))
+ (set-buffer other-buffer)
+ (erase-buffer)
+ (insert-buffer result-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward "^<<<<<<< .mine\n" nil t)
+ (let ((start (match-beginning 0)))
+ (if (not (re-search-forward "^=======\n" nil t))
+ (error "Malformed conflict marker"))
+ (delete-region start (point))
+ (if (not (re-search-forward "^>>>>>>> .r[0-9]+\n" nil t))
+ (error "Malformed conflict marker"))
+ (replace-match "")))
+ (let ((config (current-window-configuration))
+ (ediff-default-variant 'default-B))
+
+ ;; Fire up ediff.
+
+ (set-buffer (ediff-merge-buffers your-buffer other-buffer))
+
+ ;; Ediff is now set up, and we are in the control buffer.
+ ;; Do a few further adjustments and take precautions for exit.
+
+ (make-local-variable 'svn-ediff-windows)
+ (setq svn-ediff-windows config)
+ (make-local-variable 'svn-ediff-result)
+ (setq svn-ediff-result result-buffer)
+ (make-local-variable 'ediff-quit-hook)
+ (setq ediff-quit-hook
+ (lambda ()
+ (let ((buffer-A ediff-buffer-A)
+ (buffer-B ediff-buffer-B)
+ (buffer-C ediff-buffer-C)
+ (result svn-ediff-result)
+ (windows svn-ediff-windows))
+ (ediff-cleanup-mess)
+ (set-buffer result)
+ (erase-buffer)
+ (insert-buffer buffer-C)
+ (kill-buffer buffer-A)
+ (kill-buffer buffer-B)
+ (kill-buffer buffer-C)
+ (set-window-configuration windows)
+ (message "Conflict resolution finished; you may save the buffer"))))
+ (message "Please resolve conflicts now; exit ediff when done")
+ nil))))
+
+(defun svn-resolve-conflicts (filename)
+ (let ((buff (find-file-noselect filename)))
+ (if buff
+ (progn (switch-to-buffer buff)
+ (svn-resolve-conflicts-ediff))
+ (error "can not open file %s" filename))))
+
+(defun svn-status-resolve-conflicts ()
+ "Resolve conflict in the selected file"
+ (interactive)
+ (let ((file-info (svn-status-get-line-information)))
+ (or (and file-info
+ (= ?C (svn-status-line-info->filemark file-info))
+ (svn-resolve-conflicts
+ (svn-status-line-info->full-path file-info)))
+ (error "can not resolve conflicts at this point"))))
+
+;; --------------------------------------------------------------------------------
+;; svn status profiling
+;; --------------------------------------------------------------------------------
+;;; Note about profiling psvn:
+;; (load-library "elp")
+;; M-x elp-reset-all
+;; (elp-instrument-package "svn-")
+;; M-x svn-status
+;; M-x elp-results
+
+(defun svn-status-elp-init ()
+ (interactive)
+ (require 'elp)
+ (elp-reset-all)
+ (elp-instrument-package "svn-")
+ (message "Run the desired svn command (e.g. M-x svn-status), then use M-x elp-results."))
(provide 'psvn)
Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- subversion.spec 8 Sep 2005 15:49:25 -0000 1.56
+++ subversion.spec 8 Sep 2005 15:51:44 -0000 1.57
@@ -252,6 +252,7 @@
%changelog
* Thu Sep 8 2005 Joe Orton <jorton at redhat.com> 1.2.3-3
- update to 1.2.3
+- update to psvn.el r16070 from Stefan Reichoer
- merge subversion.conf changes from RHEL4
- merge filter-requires.sh changes from FC4 updates
--- subversion-1.2.0.tar.gz.asc DELETED ---
--- subversion-1.2.1.tar.gz.asc DELETED ---
- Previous message (by thread): rpms/subversion/devel filter-requires.sh, 1.2, 1.3 mirrors, 1.2, 1.3 sources, 1.18, 1.19 subversion.conf, 1.6, 1.7 subversion.spec, 1.55, 1.56 upstream, 1.8, 1.9
- Next message (by thread): rpms/e2fsprogs/devel e2fsprogs-1.38-close-on-error.patch, NONE, 1.1 e2fsprogs-1.38-man_no_ext2resize.patch, NONE, 1.1 e2fsprogs-1.38-resize-inode.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 e2fsprogs.spec, 1.36, 1.37 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list