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

Merge from origin/emacs-31

Browse source 
ffa25543a1 vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base: Fix re...
fe45d875a4 ; Fix last Tramp change
This commit is contained in:
Sean Whitton 2026-06-11 16:12:15 +01:00
commit 5c85d3f59d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2000,9 +2000,9 @@ The return value is always a string."
"Return `topic' or nil for BRANCH or the currently active bookmark. "Return `topic' or nil for BRANCH or the currently active bookmark.
If BRANCH names a bookmark, or BRANCH is nil but there is a currently If BRANCH names a bookmark, or BRANCH is nil but there is a currently
active bookmark, return `topic'. Otherwise return nil." active bookmark, return `topic'. Otherwise return nil."
(if branch (and (if branch (member branch (vc-hg--bookmarks))
(member branch (vc-hg--bookmarks)) (assq 'bookmark (vc-hg--working-branch)))
(and (assq 'bookmark (vc-hg--working-branch)) 'topic))) 'topic))
(defun vc-hg-topic-outgoing-base () (defun vc-hg-topic-outgoing-base ()
"Return outgoing base for current commit considered as a topic branch. "Return outgoing base for current commit considered as a topic branch.
@ -2013,7 +2013,7 @@ This is based on the following assumptions:
(i) if there is an active bookmark, it will eventually be merged into (i) if there is an active bookmark, it will eventually be merged into
whatever the remote head is whatever the remote head is
(ii) there is only one remote head for the current branch." (ii) there is only one remote head for the current branch."
(assq 'branch (vc-hg--working-branch))) (cdr (assq 'branch (vc-hg--working-branch))))
(provide 'vc-hg) (provide 'vc-hg)

2
test/lisp/net/tramp-tests.el
View file

@ -9082,7 +9082,7 @@ process sentinels. They shall not disturb each other."
(string-equal (tramp--test-operation tramp-test-vec) (string-equal (tramp--test-operation tramp-test-vec)
(tramp--handle-test-operation tramp-test-vec))) (tramp--handle-test-operation tramp-test-vec)))
(let ((vec (copy-tramp-file-name tramp-test-vec))) (let ((vec (copy-tramp-file-name tramp-test-vec)))
(setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "sftp" "sudo")) (setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "rclone" "sudo"))
(should-not (should-not
(string-equal (tramp--test-operation vec) (string-equal (tramp--test-operation vec)
(tramp--handle-test-operation vec)))) (tramp--handle-test-operation vec))))