diff options
| author | Dan Nicolaescu | 2008-06-24 02:41:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-06-24 02:41:04 +0000 |
| commit | f8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f (patch) | |
| tree | 15bbe0c81b90924ddb26d3bd7a23e154875aad7e | |
| parent | f245f2c6109b9700d614937eb3a19cc24026fa15 (diff) | |
| download | emacs-f8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f.tar.gz emacs-f8bd9ac6ef4de2c88b90a6ada0f1d036d974ea5f.zip | |
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
* vc-rcs.el (vc-annotate-convert-time):
* vc-mtn.el (vc-annotate-convert-time):
* vc-git.el (vc-annotate-convert-time):
* vc-cvs.el (vc-annotate-convert-time):
* vc-bzr.el (vc-annotate-convert-time): Declare as functions.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 2 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 2 | ||||
| -rw-r--r-- | lisp/vc-git.el | 2 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 3 | ||||
| -rw-r--r-- | lisp/vc-mtn.el | 2 | ||||
| -rw-r--r-- | lisp/vc-rcs.el | 2 |
7 files changed, 22 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a54f4b3461b..f0a40eca019 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2008-06-24 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer): | ||
| 4 | * vc-rcs.el (vc-annotate-convert-time): | ||
| 5 | * vc-mtn.el (vc-annotate-convert-time): | ||
| 6 | * vc-git.el (vc-annotate-convert-time): | ||
| 7 | * vc-cvs.el (vc-annotate-convert-time): | ||
| 8 | * vc-bzr.el (vc-annotate-convert-time): Declare as functions. | ||
| 9 | |||
| 1 | 2008-06-23 Dan Nicolaescu <dann@ics.uci.edu> | 10 | 2008-06-23 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 11 | ||
| 3 | * vc-annotate.el (vc-annotate-mode): Derive from special-mode | 12 | * vc-annotate.el (vc-annotate-mode): Derive from special-mode |
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 70704dc4d5e..64cc8ade8aa 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| @@ -536,6 +536,8 @@ property containing author and date information." | |||
| 536 | (replace-match "") | 536 | (replace-match "") |
| 537 | (insert tag " |"))))) | 537 | (insert tag " |"))))) |
| 538 | 538 | ||
| 539 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 540 | |||
| 539 | (defun vc-bzr-annotate-time () | 541 | (defun vc-bzr-annotate-time () |
| 540 | (when (re-search-forward "^ *[0-9.]+ +|" nil t) | 542 | (when (re-search-forward "^ *[0-9.]+ +|" nil t) |
| 541 | (let ((prop (get-text-property (line-beginning-position) 'help-echo))) | 543 | (let ((prop (get-text-property (line-beginning-position) 'help-echo))) |
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 88d0b717653..eeb4ef08e1a 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -570,6 +570,8 @@ Optional arg REVISION is a revision to annotate from." | |||
| 570 | (re-search-forward vc-cvs-annotate-first-line-re) | 570 | (re-search-forward vc-cvs-annotate-first-line-re) |
| 571 | (delete-region (point-min) (1- (point))))))) | 571 | (delete-region (point-min) (1- (point))))))) |
| 572 | 572 | ||
| 573 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 574 | |||
| 573 | (defun vc-cvs-annotate-current-time () | 575 | (defun vc-cvs-annotate-current-time () |
| 574 | "Return the current time, based at midnight of the current day, and | 576 | "Return the current time, based at midnight of the current day, and |
| 575 | encoded as fractional days." | 577 | encoded as fractional days." |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 4a5b7ab8403..2293f275910 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -542,6 +542,8 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 542 | (let ((name (file-relative-name file))) | 542 | (let ((name (file-relative-name file))) |
| 543 | (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) | 543 | (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) |
| 544 | 544 | ||
| 545 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 546 | |||
| 545 | (defun vc-git-annotate-time () | 547 | (defun vc-git-annotate-time () |
| 546 | (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) | 548 | (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) |
| 547 | (vc-annotate-convert-time | 549 | (vc-annotate-convert-time |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 663609d39b3..2f738303a19 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -289,6 +289,7 @@ Optional arg REVISION is a revision to annotate from." | |||
| 289 | (re-search-forward "^[ \t]*[0-9]") | 289 | (re-search-forward "^[ \t]*[0-9]") |
| 290 | (delete-region (point-min) (match-beginning 0)))) | 290 | (delete-region (point-min) (match-beginning 0)))) |
| 291 | 291 | ||
| 292 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 292 | 293 | ||
| 293 | ;; The format for one line output by "hg annotate -d -n" looks like this: | 294 | ;; The format for one line output by "hg annotate -d -n" looks like this: |
| 294 | ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS | 295 | ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS |
| @@ -425,6 +426,8 @@ REV is the revision to check out into WORKFILE." | |||
| 425 | rename-state ;; rename or copy state | 426 | rename-state ;; rename or copy state |
| 426 | extra-name) ;; original name for copies and rename targets, new name for | 427 | extra-name) ;; original name for copies and rename targets, new name for |
| 427 | 428 | ||
| 429 | (declare-function vc-default-status-printer "vc-dir" (backend fileentry)) | ||
| 430 | |||
| 428 | (defun vc-hg-status-printer (info) | 431 | (defun vc-hg-status-printer (info) |
| 429 | "Pretty-printer for the vc-dir-fileinfo structure." | 432 | "Pretty-printer for the vc-dir-fileinfo structure." |
| 430 | (let ((extra (vc-dir-fileinfo->extra info))) | 433 | (let ((extra (vc-dir-fileinfo->extra info))) |
diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el index b20b1db48d0..42defb6f233 100644 --- a/lisp/vc-mtn.el +++ b/lisp/vc-mtn.el | |||
| @@ -190,6 +190,8 @@ | |||
| 190 | (apply 'vc-mtn-command buf 0 file "annotate" | 190 | (apply 'vc-mtn-command buf 0 file "annotate" |
| 191 | (if rev (list "-r" rev)))) | 191 | (if rev (list "-r" rev)))) |
| 192 | 192 | ||
| 193 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 194 | |||
| 193 | (defconst vc-mtn-annotate-full-re | 195 | (defconst vc-mtn-annotate-full-re |
| 194 | "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ") | 196 | "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ") |
| 195 | (defconst vc-mtn-annotate-any-re | 197 | (defconst vc-mtn-annotate-any-re |
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 9d0550880ce..06e06c503f3 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el | |||
| @@ -769,6 +769,8 @@ Optional arg REVISION is a revision to annotate from." | |||
| 769 | (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) | 769 | (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) |
| 770 | (forward-line 1)))) | 770 | (forward-line 1)))) |
| 771 | 771 | ||
| 772 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) | ||
| 773 | |||
| 772 | (defun vc-rcs-annotate-current-time () | 774 | (defun vc-rcs-annotate-current-time () |
| 773 | "Return the current time, based at midnight of the current day, and | 775 | "Return the current time, based at midnight of the current day, and |
| 774 | encoded as fractional days." | 776 | encoded as fractional days." |