diff options
| author | Sean Whitton | 2025-06-01 15:21:04 +0000 |
|---|---|---|
| committer | Sean Whitton | 2025-06-01 15:21:04 +0000 |
| commit | 34e03d198e19cfe065e85f2b77fc13182deada8f (patch) | |
| tree | c26bc39f3cef3f7387cb37d47ec76baad83c5882 | |
| parent | 3fa8c36f235d7a26e397f357dc7110dbf6650644 (diff) | |
| download | emacs-34e03d198e19cfe065e85f2b77fc13182deada8f.tar.gz emacs-34e03d198e19cfe065e85f2b77fc13182deada8f.zip | |
* lisp/vc/vc-bzr.el (vc-bzr-incoming-revision): New function.
| -rw-r--r-- | lisp/vc/vc-bzr.el | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 1ba4450cf5d..6af832120bf 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -818,11 +818,24 @@ If LIMIT is non-nil, show no more than this many entries." | |||
| 818 | 818 | ||
| 819 | (defun vc-bzr-log-incoming (buffer remote-location) | 819 | (defun vc-bzr-log-incoming (buffer remote-location) |
| 820 | (apply #'vc-bzr-command "missing" buffer 'async nil | 820 | (apply #'vc-bzr-command "missing" buffer 'async nil |
| 821 | (list "--theirs-only" (unless (string= remote-location "") remote-location)))) | 821 | (list "--theirs-only" (and (not (string-empty-p remote-location)) |
| 822 | remote-location)))) | ||
| 823 | |||
| 824 | (defun vc-bzr-incoming-revision (remote-location) | ||
| 825 | (let* ((output | ||
| 826 | (with-output-to-string | ||
| 827 | (vc-bzr-command "missing" standard-output 1 nil | ||
| 828 | "--log-format=long" "--show-ids" | ||
| 829 | "--theirs-only" "-r-1.." | ||
| 830 | (and (not (string-empty-p remote-location)) | ||
| 831 | remote-location))))) | ||
| 832 | (and (string-match "^revision-id: \\(.+\\)$" output) | ||
| 833 | (concat "revid:" (match-string 1 output))))) | ||
| 822 | 834 | ||
| 823 | (defun vc-bzr-log-outgoing (buffer remote-location) | 835 | (defun vc-bzr-log-outgoing (buffer remote-location) |
| 824 | (apply #'vc-bzr-command "missing" buffer 'async nil | 836 | (apply #'vc-bzr-command "missing" buffer 'async nil |
| 825 | (list "--mine-only" (unless (string= remote-location "") remote-location)))) | 837 | (list "--mine-only" (and (not (string-empty-p remote-location)) |
| 838 | remote-location)))) | ||
| 826 | 839 | ||
| 827 | (defun vc-bzr-show-log-entry (revision) | 840 | (defun vc-bzr-show-log-entry (revision) |
| 828 | "Find entry for patch name REVISION in bzr change log buffer." | 841 | "Find entry for patch name REVISION in bzr change log buffer." |