6f573af6f3f4 — Oben Sonne 10 years ago
Show when in a merge situation

Fixes issue 2
1 files changed, 4 insertions(+), 1 deletions(-)

M compass.py
M compass.py +4 -1
@@ 379,7 379,10 @@ def compass(ui, repo, **opts):
 
     ### current location ###
     
-    if ni.rev in ri.head_revs:
+    wcparents = repo[None].parents()
+    if len(wcparents) > 1:
+        location = "in a merge (with revision %s)" % wcparents[1].rev()
+    elif ni.rev in ri.head_revs:
         location = "at a head"
     elif ni.rev in ri.bh_revs_ia:
         location = "at an inactive branch head"