Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
21f7bc38
Commit
21f7bc38
authored
Apr 10, 2008
by
Dan Nicolaescu
Browse files
(vc-bzr-after-dir-status): Detect the conflict state.
parent
cbee283d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+19
-6
No files found.
lisp/ChangeLog
View file @
21f7bc38
2008-04-10 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Detect the conflict state.
2008-04-10 Juanma Barranquero <lekktu@gmail.com>
* subr.el (assoc-ignore-case, assoc-ignore-representation):
...
...
lisp/vc-bzr.el
View file @
21f7bc38
...
...
@@ -657,7 +657,6 @@ Optional argument LOCALP is always ignored."
;; else fall back to default vc.el representation
(vc-default-dired-state-info 'Bzr file)))
;; XXX Experimental function for the vc-dired replacement.
;; XXX: this needs testing, it's probably incomplete.
(defun vc-bzr-after-dir-status (update-function status-buffer)
(let ((status-str nil)
...
...
@@ -667,6 +666,7 @@ Optional argument LOCALP is always ignored."
("
M
" . edited)
;; XXX: what about ignored files?
("
D
" . missing)
("
C
" . conflict)
("
?
" . unregistered)))
(translated nil)
(result nil))
...
...
@@ -674,11 +674,24 @@ Optional argument LOCALP is always ignored."
(while (not (eobp))
(setq status-str
(buffer-substring-no-properties (point) (+ (point) 2)))
(setq file
(buffer-substring-no-properties (+ (point) 4)
(line-end-position)))
(setq translated (assoc status-str translation))
(push (list file (cdr translated)) result)
(setq translated (cdr (assoc status-str translation)))
;; For conflicts the file appears twice in the listing: once
;; with the M flag and once with the C flag, so take care not
;; to add it twice to `result'. Ugly.
(if (eq translated 'conflict)
(let* ((file
(buffer-substring-no-properties
;;For files with conflicts the format is:
;;C Text conflict in FILENAME
;; Bah.
(+ (point) 21) (line-end-position)))
(entry (assoc file result)))
(when entry
(setf (nth 1 entry) 'conflict)))
(push (list (buffer-substring-no-properties
(+ (point) 4)
(line-end-position))
translated) result))
(forward-line))
(funcall update-function result status-buffer)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment