* lisp/xgit.el (xgit-parse-status-sort): Add 'conflict, which sorts
before the rest.
(xgit-parse-status): If a file is "unmerged", treat it as 'conflict.
---
Committed revision 6897c6d67ff958763388f66dee817a3476d8b213
to <git://git.hcoop.net/git/mwolson/emacs/dvc.git>.
lisp/xgit.el | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/xgit.el b/lisp/xgit.el
index b8401e6..2849c93 100644
--- a/lisp/xgit.el
+++ b/lisp/xgit.el
@@ -164,8 +164,9 @@ new file.")
(defun xgit-parse-status-sort (status-list)
"Sort STATUS-LIST according to :status in the order
-added, modified, renamed, copied, deleted, unknown."
- (let ((order '((added . 1) (modified . 2)
+conflict, added, modified, renamed, copied, deleted, unknown."
+ (let ((order '((conflict . 0)
+ (added . 1) (modified . 2)
(rename-source . 3) (rename-target . 3)
(copy-source . 4) (copy-target . 4)
(deleted . 5) (unknown . 6)))
@@ -253,6 +254,8 @@ added, modified, renamed, copied, deleted, unknown."
(cons (list :file orig :dir nil
:status 'copy-source :indexed t)
status-list))))))
+ ((string= status-string "unmerged")
+ (setq status 'conflict))
(t
(setq status nil)))
(when status
--
1.5.4.3
--
| Michael Olson | FSF Associate Member #652 |
| http://mwolson.org/ | Hobbies: Lisp, HCoop |
| Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
`-------------------------------------------------------'
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
