Show branch:bookmark instead of just branch. (#40)

* Show bookmark name * Update README.md
victor-torres · Feb 16, 2017 · cf9264f · cf9264f
1 parent 6d3abcb
commit cf9264f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Mercurial support for Atom text editor.
 
 - line diff in text editor
 - file diff in tree view
-- branch name in status bar
+- bookmark:branch or branch name in status bar
 
 ## How to use it
 

diff --git a/lib/hg-utils.coffee b/lib/hg-utils.coffee
@@ -104,10 +104,18 @@ class Repository
 
   getShortHead: () ->
     branchFile = @rootPath + '/.hg/branch'
-    if !fs.existsSync(branchFile)
-      return 'default'
+    bookmarkFile = @rootPath + '/.hg/bookmarks.current'
+    prompt = ''
 
-    return fs.readFileSync branchFile, 'utf8'
+    if (!fs.existsSync(branchFile))
+      prompt = 'default'
+    else
+      prompt = fs.readFileSync branchFile, 'utf8'
+
+    if (fs.existsSync(bookmarkFile))
+      prompt = prompt + ':' + fs.readFileSync bookmarkFile, 'utf8'
+
+    return prompt
 
   ###
   Section: TreeView Path Mercurial status