diff options
| author | Stefan Monnier | 2009-10-28 02:05:46 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-10-28 02:05:46 +0000 |
| commit | cc63d28f93ad7a2da75d9368d61e7fcd758f3eb3 (patch) | |
| tree | 40147e0810e8a5f6d941cda0fa7372fcec4daa0d | |
| parent | 3064457307967db23a5c2636100901fee37cf7ef (diff) | |
| download | emacs-cc63d28f93ad7a2da75d9368d61e7fcd758f3eb3.tar.gz emacs-cc63d28f93ad7a2da75d9368d61e7fcd758f3eb3.zip | |
(vc-hg-state, vc-hg-working-revision): Use process-file so
it works on remote files.
(vc-hg-diff): Don't pass any `--cwd' argument.
| -rw-r--r-- | lisp/ChangeLog | 41 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 15 |
2 files changed, 30 insertions, 26 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 254fcb2832f..e079bac7440 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,13 @@ | |||
| 1 | 2009-10-28 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc-hg.el (vc-hg-state, vc-hg-working-revision): Use process-file so | ||
| 4 | it works on remote files. | ||
| 5 | (vc-hg-diff): Don't pass any `--cwd' argument. | ||
| 6 | |||
| 1 | 2009-10-27 Kevin Ryde <user42@zip.com.au> | 7 | 2009-10-27 Kevin Ryde <user42@zip.com.au> |
| 2 | 8 | ||
| 3 | * emacs-lisp/checkdoc.el (checkdoc-proper-noun-region-engine): Use | 9 | * emacs-lisp/checkdoc.el (checkdoc-proper-noun-region-engine): |
| 4 | help-xref-info-regexp and help-xref-url-regexp to identify links. | 10 | Use help-xref-info-regexp and help-xref-url-regexp to identify links. |
| 5 | (Further to Bug#3921). | 11 | (Further to Bug#3921). |
| 6 | 12 | ||
| 7 | 2009-10-27 Michael Albinus <michael.albinus@gmx.de> | 13 | 2009-10-27 Michael Albinus <michael.albinus@gmx.de> |
| @@ -24,22 +30,19 @@ | |||
| 24 | 30 | ||
| 25 | 2009-10-26 Michael Albinus <michael.albinus@gmx.de> | 31 | 2009-10-26 Michael Albinus <michael.albinus@gmx.de> |
| 26 | 32 | ||
| 27 | * net/tramp.el (tramp-perl-file-truename): New defconst. Perl | 33 | * net/tramp.el (tramp-perl-file-truename): New defconst. |
| 28 | code contributed by yary <not.com@gmail.com> (tiny change). | 34 | Perl code contributed by yary <not.com@gmail.com> (tiny change). |
| 29 | (tramp-handle-file-truename, tramp-get-remote-perl): Use it. | 35 | (tramp-handle-file-truename, tramp-get-remote-perl): Use it. |
| 30 | Check also for "perl-file-spec" and "perl-cwd-realpath" | 36 | Check also for "perl-file-spec" and "perl-cwd-realpath" properties. |
| 31 | properties. | 37 | (tramp-handle-write-region): In case of APPEND, reuse the tmpfile name. |
| 32 | (tramp-handle-write-region): In case of APPEND, reuse the tmpfile | ||
| 33 | name. | ||
| 34 | 38 | ||
| 35 | * net/tramp-imap.el (tramp-imap-file-name-handler-alist): Ignore | 39 | * net/tramp-imap.el (tramp-imap-file-name-handler-alist): |
| 36 | `dired-call-process'. | 40 | Ignore `dired-call-process'. |
| 37 | (tramp-imap-make-iht): Use `user' and `ssl' with `imap-hash-make'. | 41 | (tramp-imap-make-iht): Use `user' and `ssl' with `imap-hash-make'. |
| 38 | 42 | ||
| 39 | 2009-10-26 Julian Scheid <julians37@gmail.com> | 43 | 2009-10-26 Julian Scheid <julians37@gmail.com> |
| 40 | 44 | ||
| 41 | * net/tramp.el (tramp-perl-file-name-all-completions): New | 45 | * net/tramp.el (tramp-perl-file-name-all-completions): New defconst. |
| 42 | defconst. | ||
| 43 | (tramp-get-remote-readlink): New defun. | 46 | (tramp-get-remote-readlink): New defun. |
| 44 | (tramp-handle-file-truename): Use it. | 47 | (tramp-handle-file-truename): Use it. |
| 45 | (tramp-handle-file-exists-p): Check file-attributes cache, assume | 48 | (tramp-handle-file-exists-p): Check file-attributes cache, assume |
| @@ -57,8 +60,8 @@ | |||
| 57 | remote `cd' or Perl code for local tramp-error. | 60 | remote `cd' or Perl code for local tramp-error. |
| 58 | (tramp-do-copy-or-rename-file-directly): Avoid separate | 61 | (tramp-do-copy-or-rename-file-directly): Avoid separate |
| 59 | tramp-send-command-and-check call. | 62 | tramp-send-command-and-check call. |
| 60 | (tramp-handle-process-file): Merge three remote ops into one. Do | 63 | (tramp-handle-process-file): Merge three remote ops into one. |
| 61 | not flush all caches when `process-file-side-effects' is set. | 64 | Do not flush all caches when `process-file-side-effects' is set. |
| 62 | (tramp-handle-write-region): Avoid tramp-set-file-uid-gid if | 65 | (tramp-handle-write-region): Avoid tramp-set-file-uid-gid if |
| 63 | file-attributes shows uid/gid to be set already. | 66 | file-attributes shows uid/gid to be set already. |
| 64 | 67 | ||
| @@ -93,8 +96,7 @@ | |||
| 93 | (rmail-secondary-file-regexp): | 96 | (rmail-secondary-file-regexp): |
| 94 | * files.el (null-device, file-name-invalid-regexp) | 97 | * files.el (null-device, file-name-invalid-regexp) |
| 95 | (locate-dominating-stop-dir-regexp) | 98 | (locate-dominating-stop-dir-regexp) |
| 96 | (inhibit-first-line-modes-regexps): Purecopy initialization | 99 | (inhibit-first-line-modes-regexps): Purecopy initialization strings. |
| 97 | strings. | ||
| 98 | (interpreter-mode-alist): Use mapcar instead of mapc. | 100 | (interpreter-mode-alist): Use mapcar instead of mapc. |
| 99 | 101 | ||
| 100 | * buff-menu.el (Buffer-menu-mode-map): Purecopy name. | 102 | * buff-menu.el (Buffer-menu-mode-map): Purecopy name. |
| @@ -195,7 +197,8 @@ | |||
| 195 | * vc.el (vc-backend-for-registration): Rename from | 197 | * vc.el (vc-backend-for-registration): Rename from |
| 196 | vc-get-backend-for-registration. Update callers. | 198 | vc-get-backend-for-registration. Update callers. |
| 197 | 199 | ||
| 198 | * international/mule-cmds.el (set-language-info-alist): Purecopy lang-env. | 200 | * international/mule-cmds.el (set-language-info-alist): |
| 201 | Purecopy lang-env. | ||
| 199 | (leim-list-header, leim-list-entry-regexp): Change defvars to defconst. | 202 | (leim-list-header, leim-list-entry-regexp): Change defvars to defconst. |
| 200 | (charset): Purecopy the name. | 203 | (charset): Purecopy the name. |
| 201 | (define-char-code-property): Purecopy string arguments. | 204 | (define-char-code-property): Purecopy string arguments. |
| @@ -219,8 +222,8 @@ | |||
| 219 | (file-cache-choose-completion): Handle an optional event argument. | 222 | (file-cache-choose-completion): Handle an optional event argument. |
| 220 | (file-cache-mouse-choose-completion): Make it an obsolete alias. | 223 | (file-cache-mouse-choose-completion): Make it an obsolete alias. |
| 221 | 224 | ||
| 222 | * progmodes/octave-mod.el (octave-complete-symbol): Use | 225 | * progmodes/octave-mod.el (octave-complete-symbol): |
| 223 | choose-completion if mouse-choose-completion is ever removed. | 226 | Use choose-completion if mouse-choose-completion is ever removed. |
| 224 | 227 | ||
| 225 | * textmodes/sgml-mode.el (sgml-looking-back-at): Move definition before | 228 | * textmodes/sgml-mode.el (sgml-looking-back-at): Move definition before |
| 226 | use. | 229 | use. |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 8443257efa2..b5c55d783f6 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -159,6 +159,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 159 | "Hg-specific version of `vc-state'." | 159 | "Hg-specific version of `vc-state'." |
| 160 | (let* | 160 | (let* |
| 161 | ((status nil) | 161 | ((status nil) |
| 162 | (default-directory (file-name-directory file)) | ||
| 162 | (out | 163 | (out |
| 163 | (with-output-to-string | 164 | (with-output-to-string |
| 164 | (with-current-buffer | 165 | (with-current-buffer |
| @@ -166,9 +167,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 166 | (setq status | 167 | (setq status |
| 167 | (condition-case nil | 168 | (condition-case nil |
| 168 | ;; Ignore all errors. | 169 | ;; Ignore all errors. |
| 169 | (call-process | 170 | (process-file |
| 170 | "hg" nil t nil "--cwd" (file-name-directory file) | 171 | "hg" nil t nil |
| 171 | "status" "-A" (file-name-nondirectory file)) | 172 | "status" "-A" (file-relative-name file)) |
| 172 | ;; Some problem happened. E.g. We can't find an `hg' | 173 | ;; Some problem happened. E.g. We can't find an `hg' |
| 173 | ;; executable. | 174 | ;; executable. |
| 174 | (error nil))))))) | 175 | (error nil))))))) |
| @@ -190,6 +191,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 190 | "Hg-specific version of `vc-working-revision'." | 191 | "Hg-specific version of `vc-working-revision'." |
| 191 | (let* | 192 | (let* |
| 192 | ((status nil) | 193 | ((status nil) |
| 194 | (default-directory (file-name-directory file)) | ||
| 193 | (out | 195 | (out |
| 194 | (with-output-to-string | 196 | (with-output-to-string |
| 195 | (with-current-buffer | 197 | (with-current-buffer |
| @@ -197,9 +199,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 197 | (setq status | 199 | (setq status |
| 198 | (condition-case nil | 200 | (condition-case nil |
| 199 | ;; Ignore all errors. | 201 | ;; Ignore all errors. |
| 200 | (call-process | 202 | (process-file |
| 201 | "hg" nil t nil "--cwd" (file-name-directory file) | 203 | "hg" nil t nil |
| 202 | "log" "-l1" (file-name-nondirectory file)) | 204 | "log" "-l1" (file-relative-name file)) |
| 203 | ;; Some problem happened. E.g. We can't find an `hg' | 205 | ;; Some problem happened. E.g. We can't find an `hg' |
| 204 | ;; executable. | 206 | ;; executable. |
| 205 | (error nil))))))) | 207 | (error nil))))))) |
| @@ -286,7 +288,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 286 | (setq oldvers working)) | 288 | (setq oldvers working)) |
| 287 | (apply #'vc-hg-command (or buffer "*vc-diff*") nil | 289 | (apply #'vc-hg-command (or buffer "*vc-diff*") nil |
| 288 | (mapcar (lambda (file) (file-relative-name file cwd)) files) | 290 | (mapcar (lambda (file) (file-relative-name file cwd)) files) |
| 289 | "--cwd" cwd | ||
| 290 | "diff" | 291 | "diff" |
| 291 | (append | 292 | (append |
| 292 | (vc-switches 'hg 'diff) | 293 | (vc-switches 'hg 'diff) |