Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

vc-hg--checkin: Use vc-hg--active-bookmark-internal

Browse source 
* lisp/vc/vc-hg.el (vc-hg--active-bookmark-internal): Make it
work when default-directory is not the repository root.
(vc-hg--checkin): Use vc-hg--active-bookmark-internal instead of
vc-hg--working-branch.
This commit is contained in:
Sean Whitton 2026-04-17 14:39:03 -04:00
parent abde2d1ed3
commit a236442581
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/vc/vc-hg.el
View file

@ -325,13 +325,14 @@ large repositories."
(defun vc-hg--active-bookmark-internal (rev)
(when (equal rev ".")
(let* ((current-bookmarks-file ".hg/bookmarks.current"))
(when (file-exists-p current-bookmarks-file)
(ignore-errors
(with-temp-buffer
(insert-file-contents current-bookmarks-file)
(buffer-substring-no-properties
(point-min) (point-max))))))))
(let* ((current-bookmarks-file
(expand-file-name ".hg/bookmarks.current"
(vc-hg-root default-directory))))
(and (file-exists-p current-bookmarks-file)
(ignore-errors
(with-temp-buffer
(insert-file-contents current-bookmarks-file)
(buffer-substring-no-properties (point-min) (point-max))))))))
(defun vc-hg--run-log (template rev path)
(ignore-errors
@ -1305,7 +1306,7 @@ It is an error to supply both or neither."
;; need to make both of them part of the async command,
;; possibly by writing out a tiny shell script (bug#79235).
(when patch-file
(let ((bmark (alist-get 'bookmark (vc-hg--working-branch))))
(let ((bmark (vc-hg--active-bookmark-internal ".")))
(when bmark
(vc-hg-command nil 0 nil "bookmark" "-f" "-r" "tip" bmark))
(vc-hg-command nil 0 nil "update" "--merge"