diff options
| author | Dmitry Gutov | 2017-02-17 03:00:46 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2017-02-17 03:01:05 +0200 |
| commit | 7cc95d4d86e5a9f2df248d2aa7c8cc423c8f06e3 (patch) | |
| tree | 867ec178f4c3e8da2b629c2c24a39881b390b4c1 | |
| parent | cb70725584a754a491ddad82c42278f17c714a2f (diff) | |
| download | emacs-7cc95d4d86e5a9f2df248d2aa7c8cc423c8f06e3.tar.gz emacs-7cc95d4d86e5a9f2df248d2aa7c8cc423c8f06e3.zip | |
Fix buffers update in vc-retrieve-tag
* lisp/vc/vc.el (vc-retrieve-tag): When the granularity is
`repository', use the repository root and pass it to
vc-resynch-buffer (bug#25714).
| -rw-r--r-- | lisp/vc/vc.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index c66a0921e45..c3088560c11 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2157,7 +2157,7 @@ checked out in that new branch." | |||
| 2157 | NAME can name a branch, in which case this command will switch to the | 2157 | NAME can name a branch, in which case this command will switch to the |
| 2158 | named branch in the directory DIR. | 2158 | named branch in the directory DIR. |
| 2159 | Interactively, prompt for DIR only for VCS that works at file level; | 2159 | Interactively, prompt for DIR only for VCS that works at file level; |
| 2160 | otherwise use the default directory of the current buffer. | 2160 | otherwise use the repository root of the current buffer. |
| 2161 | If NAME is empty, it refers to the latest revisions of the current branch. | 2161 | If NAME is empty, it refers to the latest revisions of the current branch. |
| 2162 | If locking is used for the files in DIR, then there must not be any | 2162 | If locking is used for the files in DIR, then there must not be any |
| 2163 | locked files at or below DIR (but if NAME is empty, locked files are | 2163 | locked files at or below DIR (but if NAME is empty, locked files are |
| @@ -2170,7 +2170,9 @@ allowed and simply skipped)." | |||
| 2170 | (if (eq granularity 'repository) | 2170 | (if (eq granularity 'repository) |
| 2171 | ;; For VC's that do not work at file level, it's pointless | 2171 | ;; For VC's that do not work at file level, it's pointless |
| 2172 | ;; to ask for a directory, branches are created at repository level. | 2172 | ;; to ask for a directory, branches are created at repository level. |
| 2173 | default-directory | 2173 | ;; XXX: Either we call expand-file-name here, or use |
| 2174 | ;; file-in-directory-p inside vc-resynch-buffers-in-directory. | ||
| 2175 | (expand-file-name (vc-root-dir)) | ||
| 2174 | (read-directory-name "Directory: " default-directory default-directory t)) | 2176 | (read-directory-name "Directory: " default-directory default-directory t)) |
| 2175 | (read-string "Tag name to retrieve (default latest revisions): ")))) | 2177 | (read-string "Tag name to retrieve (default latest revisions): ")))) |
| 2176 | (let ((update (yes-or-no-p "Update any affected buffers? ")) | 2178 | (let ((update (yes-or-no-p "Update any affected buffers? ")) |