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

vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base: Fix ret vals

Browse source 
* lisp/vc/vc-hg.el (vc-hg-trunk-or-topic-p)
(vc-hg-topic-outgoing-base): Fix return values.
This commit is contained in:
Sean Whitton 2026-06-11 14:23:28 +01:00
parent fe45d875a4
commit ffa25543a1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1999,9 +1999,9 @@ The return value is always a string."
"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
active bookmark, return `topic'. Otherwise return nil."
(if branch
(member branch (vc-hg--bookmarks))
(and (assq 'bookmark (vc-hg--working-branch)) 'topic)))
(and (if branch (member branch (vc-hg--bookmarks))
(assq 'bookmark (vc-hg--working-branch)))
'topic))
(defun vc-hg-topic-outgoing-base ()
"Return outgoing base for current commit considered as a topic branch.
@ -2012,7 +2012,7 @@ This is based on the following assumptions:
(i) if there is an active bookmark, it will eventually be merged into
whatever the remote head is
(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)