CVS update by scop packages/unsupported/scop/vc ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/08/18 17:33:33

  Modified:    packages/unsupported/scop/vc ChangeLog Makefile mercurial.el
Log:
Sync mercurial.el with upstream, new-vc 0.94.

Revision  Changes    Path
1.91      +1 -1      XEmacs/packages/unsupported/scop/STATUS

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- STATUS	2007/07/16 18:33:48	1.90
+++ STATUS	2007/08/18 15:33:25	1.91
@@ -18,6 +18,6 @@ generic-modes: generic.el and generic-x.
 
 vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
 - Up to date with GNU Emacs 22.1 + some cherry picked bits from CVS HEAD,
-  hg, git upstream as of 2007-07-16.
+  hg, git upstream as of 2007-08-18.
 - Almost ready for general consumption, TODO list:
   - Check/make necessary changes to pcl-cvs, prog-modes, tramp and vc-cc.



1.86      +6 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ChangeLog	2007/07/16 18:33:54	1.85
+++ ChangeLog	2007/08/18 15:33:30	1.86
@@ -1,3 +1,9 @@
+2007-08-18  Ville Skyttä  <scop at xemacs.org>
+
+	* Makefile (VERSION): 0.94.
+
+	* mercurial.el: Sync with upstream.
+
 2007-07-16  Ville Skyttä  <scop at xemacs.org>
 
 	* mercurial.el: Sync with upstream.



1.19      +1 -1      XEmacs/packages/unsupported/scop/vc/Makefile

Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Makefile	2007/07/08 16:16:34	1.18
+++ Makefile	2007/08/18 15:33:30	1.19
@@ -17,7 +17,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 0.93
+VERSION = 0.94
 AUTHOR_VERSION =
 MAINTAINER = Ville Skyttä <scop at xemacs.org>
 PACKAGE = vc



1.4       +8 -8      XEmacs/packages/unsupported/scop/vc/mercurial.el

Index: mercurial.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/mercurial.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mercurial.el	2007/07/16 18:33:54	1.3
+++ mercurial.el	2007/08/18 15:33:30	1.4
@@ -426,7 +426,7 @@ Handle frickin' frackin' gratuitous even
     (if (or (not default) current-prefix-arg)
         (string-to-number
          (eval (list* 'read-string
-                      (or prompt "") 
+                      (or prompt "")
                       (if default (cons (format "%d" default) nil) nil))))
       default)))
 
@@ -565,7 +565,7 @@ directory names from the file system.  W
 	  (when buf
 	    (set-buffer buf)
 	    (hg-mode-line-internal status parents)))))))
-  
+
 
 ;;; View mode bits.
 
@@ -588,7 +588,7 @@ current frame."
   (setq hg-view-mode t)
   (setq truncate-lines t)
   (when file-name
-    (setq hg-view-file-name 
+    (setq hg-view-file-name
 	  (hg-abbrev-file-name file-name))))
 
 (defun hg-file-status (file)
@@ -703,7 +703,7 @@ Always returns a valid, hopefully sane, 
 						 (added . "a")
 						 (deleted . "!")
 						 (modified . "m"))))))))
-  
+
 (defun hg-mode-line (&optional force)
   "Update the modeline with the current status of a file.
 An update occurs if optional argument FORCE is non-nil,
@@ -1000,7 +1000,7 @@ With a prefix argument, prompt for all o
         ;; none revision is specified explicitly
         (none (and (not rev1) (not rev2)))
         ;; only one revision is specified explicitly
-        (one (or (and (or (equal rev1 rev2) (not rev2)) rev1) 
+        (one (or (and (or (equal rev1 rev2) (not rev2)) rev1)
                  (and (not rev1) rev2)))
 	diff)
     (hg-view-output ((cond
@@ -1012,7 +1012,7 @@ With a prefix argument, prompt for all o
 		       (format "Mercurial: Diff from rev %s to %s of %s"
 			       rev1 rev2 a-path))))
       (cond
-       (none 
+       (none
         (call-process (hg-binary) nil t nil "diff" path))
        (one
         (call-process (hg-binary) nil t nil "diff" "-r" one path))
@@ -1100,7 +1100,7 @@ With a prefix argument, prompt for each 
         (limit (format "%d" (or log-limit hg-log-limit))))
     (hg-view-output ((if (equal r1 r2)
                          (format "Mercurial: Log of rev %s of %s" rev1 a-path)
-                       (format 
+                       (format
                         "Mercurial: at most %s log(s) from rev %s to %s of %s"
                         limit r1 r2 a-path)))
       (eval (list* 'call-process (hg-binary) nil t nil
@@ -1123,7 +1123,7 @@ With a prefix argument, prompt for each 
   (interactive (list (hg-read-file-name " to log")
                      (hg-read-rev " to start with"
                                   "tip")
-                     (hg-read-rev " to end with" 
+                     (hg-read-rev " to end with"
 				  "0")
                      (hg-read-number "Output limited to: "
                                      hg-log-limit)))