diff options
| author | Thien-Thi Nguyen | 2008-02-20 15:21:55 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2008-02-20 15:21:55 +0000 |
| commit | 62754d298ae2bf6fdfabcea11c389f80bac7bd1a (patch) | |
| tree | 51d95fea9732278c791e44aca7ef8225e4cda929 | |
| parent | 4ced8551f649725b523ca7b1b644cc570abddbb8 (diff) | |
| download | emacs-62754d298ae2bf6fdfabcea11c389f80bac7bd1a.tar.gz emacs-62754d298ae2bf6fdfabcea11c389f80bac7bd1a.zip | |
Kill eol whitespace; nfc.
| -rw-r--r-- | lisp/vc-hg.el | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index c3c94ea835c..86a9b34f08e 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | ;; * find-revision (file rev buffer) OK | 63 | ;; * find-revision (file rev buffer) OK |
| 64 | ;; * checkout (file &optional editable rev) OK | 64 | ;; * checkout (file &optional editable rev) OK |
| 65 | ;; * revert (file &optional contents-done) OK | 65 | ;; * revert (file &optional contents-done) OK |
| 66 | ;; - rollback (files) ?? PROBABLY NOT NEEDED | 66 | ;; - rollback (files) ?? PROBABLY NOT NEEDED |
| 67 | ;; - merge (file rev1 rev2) NEEDED | 67 | ;; - merge (file rev1 rev2) NEEDED |
| 68 | ;; - merge-news (file) NEEDED | 68 | ;; - merge-news (file) NEEDED |
| 69 | ;; - steal-lock (file &optional revision) NOT NEEDED | 69 | ;; - steal-lock (file &optional revision) NOT NEEDED |
| @@ -87,7 +87,7 @@ | |||
| 87 | ;; - retrieve-snapshot (dir name update) ?? NEEDED?? | 87 | ;; - retrieve-snapshot (dir name update) ?? NEEDED?? |
| 88 | ;; MISCELLANEOUS | 88 | ;; MISCELLANEOUS |
| 89 | ;; - make-version-backups-p (file) ?? | 89 | ;; - make-version-backups-p (file) ?? |
| 90 | ;; - repository-hostname (dirname) ?? | 90 | ;; - repository-hostname (dirname) ?? |
| 91 | ;; - previous-revision (file rev) OK | 91 | ;; - previous-revision (file rev) OK |
| 92 | ;; - next-revision (file rev) OK | 92 | ;; - next-revision (file rev) OK |
| 93 | ;; - check-headers () ?? | 93 | ;; - check-headers () ?? |
| @@ -153,7 +153,7 @@ | |||
| 153 | 153 | ||
| 154 | (defun vc-hg-state (file) | 154 | (defun vc-hg-state (file) |
| 155 | "Hg-specific version of `vc-state'." | 155 | "Hg-specific version of `vc-state'." |
| 156 | (let* | 156 | (let* |
| 157 | ((status nil) | 157 | ((status nil) |
| 158 | (out | 158 | (out |
| 159 | (with-output-to-string | 159 | (with-output-to-string |
| @@ -190,9 +190,9 @@ | |||
| 190 | (file nil)) | 190 | (file nil)) |
| 191 | (while (not (eobp)) | 191 | (while (not (eobp)) |
| 192 | (setq status-char (char-after)) | 192 | (setq status-char (char-after)) |
| 193 | (setq file | 193 | (setq file |
| 194 | (expand-file-name | 194 | (expand-file-name |
| 195 | (buffer-substring-no-properties (+ (point) 2) | 195 | (buffer-substring-no-properties (+ (point) 2) |
| 196 | (line-end-position)))) | 196 | (line-end-position)))) |
| 197 | (cond | 197 | (cond |
| 198 | ;; State flag for a clean file is now C, might change to =. | 198 | ;; State flag for a clean file is now C, might change to =. |
| @@ -230,7 +230,7 @@ | |||
| 230 | 230 | ||
| 231 | (defun vc-hg-working-revision (file) | 231 | (defun vc-hg-working-revision (file) |
| 232 | "Hg-specific version of `vc-working-revision'." | 232 | "Hg-specific version of `vc-working-revision'." |
| 233 | (let* | 233 | (let* |
| 234 | ((status nil) | 234 | ((status nil) |
| 235 | (out | 235 | (out |
| 236 | (with-output-to-string | 236 | (with-output-to-string |
| @@ -264,7 +264,7 @@ | |||
| 264 | ;; If the buffer exists from a previous invocation it might be | 264 | ;; If the buffer exists from a previous invocation it might be |
| 265 | ;; read-only. | 265 | ;; read-only. |
| 266 | (let ((inhibit-read-only t)) | 266 | (let ((inhibit-read-only t)) |
| 267 | ;; We need to loop and call "hg log" on each file separately. | 267 | ;; We need to loop and call "hg log" on each file separately. |
| 268 | ;; "hg log" with multiple file arguments mashes all the logs | 268 | ;; "hg log" with multiple file arguments mashes all the logs |
| 269 | ;; together. Ironically enough, this puts us back near CVS | 269 | ;; together. Ironically enough, this puts us back near CVS |
| 270 | ;; which can't generate proper fileset logs either. | 270 | ;; which can't generate proper fileset logs either. |
| @@ -293,8 +293,8 @@ | |||
| 293 | (1 'change-log-name) | 293 | (1 'change-log-name) |
| 294 | (2 'change-log-email)) | 294 | (2 'change-log-email)) |
| 295 | ;; Handle the cases: | 295 | ;; Handle the cases: |
| 296 | ;; user: foo@bar | 296 | ;; user: foo@bar |
| 297 | ;; and | 297 | ;; and |
| 298 | ;; user: foo | 298 | ;; user: foo |
| 299 | ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" | 299 | ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" |
| 300 | (1 'change-log-email)) | 300 | (1 'change-log-email)) |
| @@ -322,7 +322,7 @@ | |||
| 322 | (let ((default-directory (file-name-directory (car files)))) | 322 | (let ((default-directory (file-name-directory (car files)))) |
| 323 | (with-temp-buffer | 323 | (with-temp-buffer |
| 324 | (vc-hg-command t nil files "log" "--template" "{rev} ") | 324 | (vc-hg-command t nil files "log" "--template" "{rev} ") |
| 325 | (split-string | 325 | (split-string |
| 326 | (buffer-substring-no-properties (point-min) (point-max)))))) | 326 | (buffer-substring-no-properties (point-min) (point-max)))))) |
| 327 | 327 | ||
| 328 | ;; Modelled after the similar function in vc-cvs.el | 328 | ;; Modelled after the similar function in vc-cvs.el |
| @@ -366,7 +366,7 @@ Optional arg REVISION is a revision to annotate from." | |||
| 366 | 366 | ||
| 367 | (defun vc-hg-next-revision (file rev) | 367 | (defun vc-hg-next-revision (file rev) |
| 368 | (let ((newrev (1+ (string-to-number rev))) | 368 | (let ((newrev (1+ (string-to-number rev))) |
| 369 | (tip-revision | 369 | (tip-revision |
| 370 | (with-temp-buffer | 370 | (with-temp-buffer |
| 371 | (vc-hg-command t 0 nil "tip") | 371 | (vc-hg-command t 0 nil "tip") |
| 372 | (goto-char (point-min)) | 372 | (goto-char (point-min)) |
| @@ -475,7 +475,7 @@ REV is the revision to check out into WORKFILE." | |||
| 475 | 475 | ||
| 476 | (defun vc-hg-extra-menu () vc-hg-extra-menu-map) | 476 | (defun vc-hg-extra-menu () vc-hg-extra-menu-map) |
| 477 | 477 | ||
| 478 | (defun vc-hg-extra-status-menu () | 478 | (defun vc-hg-extra-status-menu () |
| 479 | '(["Show incoming" vc-hg-incoming] | 479 | '(["Show incoming" vc-hg-incoming] |
| 480 | ["Show outgoing" vc-hg-outgoing])) | 480 | ["Show outgoing" vc-hg-outgoing])) |
| 481 | 481 | ||
| @@ -500,8 +500,8 @@ REV is the revision to check out into WORKFILE." | |||
| 500 | (goto-char (point-min)) | 500 | (goto-char (point-min)) |
| 501 | (while (not (eobp)) | 501 | (while (not (eobp)) |
| 502 | (setq status-char (char-after)) | 502 | (setq status-char (char-after)) |
| 503 | (setq file | 503 | (setq file |
| 504 | (buffer-substring-no-properties (+ (point) 2) | 504 | (buffer-substring-no-properties (+ (point) 2) |
| 505 | (line-end-position))) | 505 | (line-end-position))) |
| 506 | (setq translated (assoc status-char translation)) | 506 | (setq translated (assoc status-char translation)) |
| 507 | (when (and translated (not (eq (cdr translated) 'up-to-date))) | 507 | (when (and translated (not (eq (cdr translated) 'up-to-date))) |
| @@ -517,7 +517,7 @@ REV is the revision to check out into WORKFILE." | |||
| 517 | (expand-file-name " *VC-hg* tmp status" dir)) | 517 | (expand-file-name " *VC-hg* tmp status" dir)) |
| 518 | (erase-buffer) | 518 | (erase-buffer) |
| 519 | (vc-hg-command (current-buffer) 'async dir "status") | 519 | (vc-hg-command (current-buffer) 'async dir "status") |
| 520 | (vc-exec-after | 520 | (vc-exec-after |
| 521 | `(vc-hg-after-dir-status (quote ,update-function) ,status-buffer)))) | 521 | `(vc-hg-after-dir-status (quote ,update-function) ,status-buffer)))) |
| 522 | 522 | ||
| 523 | ;; XXX this adds another top level menu, instead figure out how to | 523 | ;; XXX this adds another top level menu, instead figure out how to |
| @@ -553,7 +553,7 @@ REV is the revision to check out into WORKFILE." | |||
| 553 | (interactive) | 553 | (interactive) |
| 554 | (let ((marked-list (log-view-get-marked))) | 554 | (let ((marked-list (log-view-get-marked))) |
| 555 | (if marked-list | 555 | (if marked-list |
| 556 | (vc-hg-command | 556 | (vc-hg-command |
| 557 | nil 0 nil | 557 | nil 0 nil |
| 558 | (cons "push" | 558 | (cons "push" |
| 559 | (apply 'nconc | 559 | (apply 'nconc |
| @@ -564,7 +564,7 @@ REV is the revision to check out into WORKFILE." | |||
| 564 | (interactive) | 564 | (interactive) |
| 565 | (let ((marked-list (log-view-get-marked))) | 565 | (let ((marked-list (log-view-get-marked))) |
| 566 | (if marked-list | 566 | (if marked-list |
| 567 | (vc-hg-command | 567 | (vc-hg-command |
| 568 | nil 0 nil | 568 | nil 0 nil |
| 569 | (cons "pull" | 569 | (cons "pull" |
| 570 | (apply 'nconc | 570 | (apply 'nconc |