1707 |
(interactive |
(interactive |
1708 |
(let ((file (expand-file-name |
(let ((file (expand-file-name |
1709 |
(read-file-name (if buffer-file-name |
(read-file-name (if buffer-file-name |
1710 |
"File or dir to diff: (default visited file) " |
"File or dir to diff (default visited file): " |
1711 |
"File or dir to diff: ") |
"File or dir to diff: ") |
1712 |
default-directory buffer-file-name t))) |
default-directory buffer-file-name t))) |
1713 |
(rev1-default nil) (rev2-default nil)) |
(rev1-default nil) (rev2-default nil)) |
1728 |
;; construct argument list |
;; construct argument list |
1729 |
(list file |
(list file |
1730 |
(read-string (if rev1-default |
(read-string (if rev1-default |
1731 |
(concat "Older version: (default " |
(concat "Older version (default " |
1732 |
rev1-default ") ") |
rev1-default "): ") |
1733 |
"Older version: ") |
"Older version: ") |
1734 |
nil nil rev1-default) |
nil nil rev1-default) |
1735 |
(read-string (if rev2-default |
(read-string (if rev2-default |
1736 |
(concat "Newer version: (default " |
(concat "Newer version (default " |
1737 |
rev2-default ") ") |
rev2-default "): ") |
1738 |
"Newer version (default: current source): ") |
"Newer version (default current source): ") |
1739 |
nil nil rev2-default)))) |
nil nil rev2-default)))) |
1740 |
(if (file-directory-p file) |
(if (file-directory-p file) |
1741 |
;; recursive directory diff |
;; recursive directory diff |
1998 |
(error "Merge aborted")))) |
(error "Merge aborted")))) |
1999 |
(setq first-version |
(setq first-version |
2000 |
(read-string (concat "Branch or version to merge from " |
(read-string (concat "Branch or version to merge from " |
2001 |
"(default: news on current branch): "))) |
"(default news on current branch): "))) |
2002 |
(if (string= first-version "") |
(if (string= first-version "") |
2003 |
(if (not (vc-find-backend-function backend 'merge-news)) |
(if (not (vc-find-backend-function backend 'merge-news)) |
2004 |
(error "Sorry, merging news is not implemented for %s" backend) |
(error "Sorry, merging news is not implemented for %s" backend) |
3080 |
(bfn buffer-file-name) |
(bfn buffer-file-name) |
3081 |
(vc-annotate-version |
(vc-annotate-version |
3082 |
(if prefix (read-string |
(if prefix (read-string |
3083 |
(format "Annotate from version: (default %s) " rev) |
(format "Annotate from version (default %s): " rev) |
3084 |
nil nil rev) |
nil nil rev) |
3085 |
rev))) |
rev))) |
3086 |
(if display-mode |
(if display-mode |
3088 |
(if prefix |
(if prefix |
3089 |
(setq vc-annotate-display-mode |
(setq vc-annotate-display-mode |
3090 |
(float (string-to-number |
(float (string-to-number |
3091 |
(read-string "Annotate span days: (default 20) " |
(read-string "Annotate span days (default 20): " |
3092 |
nil nil "20")))))) |
nil nil "20")))))) |
3093 |
(setq temp-buffer-name (format "*Annotate %s (rev %s)*" |
(setq temp-buffer-name (format "*Annotate %s (rev %s)*" |
3094 |
(buffer-name) vc-annotate-version)) |
(buffer-name) vc-annotate-version)) |