images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-09-20 12:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2660 from vsajip/fix-2659

Browse Source 
Fix #2659: Use get_hg_branch() to get Mercurial branch information.
This commit is contained in:
Dax T Games 2022-02-03 17:48:26 -05:00 committed by GitHub
commit 0616ff0a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/clink.lua vendored
View File

@ -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
@ -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