Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2659: Use get_hg_branch() to get Mercurial branch information. #2660

Merged
merged 1 commit into from
Feb 3, 2022
Merged

Fix #2659: Use get_hg_branch() to get Mercurial branch information. #2660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions vendor/clink.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,18 @@ local function get_git_branch(git_dir)
end

---
-- Find out current branch
-- @return {false|mercurial branch name}
-- Find out current branch information
-- @return {false|mercurial branch information}
---
local function get_hg_branch()
local file = io.popen("hg branch 2>nul")
-- Return the branch information. The default is to get just the
-- branch name, but you could e.g. use the "hg-prompt" extension to
-- get more information, such as any applied mq patches. Here's an
-- example of that:
-- local cmd = "hg prompt \"{branch}{status}{|{patch}}{update}\""
local cmd = "hg branch 2>nul"
local file = io.popen(cmd)

for line in file:lines() do
local m = line:match("(.+)$")
if m then
Expand Down Expand Up @@ -521,10 +528,7 @@ local function hg_prompt_filter()
dirty = get_dirty_color(),
nostatus = get_unknown_color()
}

local pipe = io.popen("hg branch 2>&1")
local output = pipe:read('*all')
local rc = { pipe:close() }
local output = get_hg_branch()

-- strip the trailing newline from the branch name
local n = #output
Expand Down