diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-29 01:09:45 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-29 01:09:45 +0000 |
| commit | 769087cead629d7ad1fd5cfc15ce75625a78e6b3 (patch) | |
| tree | 67d0ca721590ed57b25d078bb38bcaf037367a98 /lisp/vc-bzr.el | |
| parent | c6ea7ec62cc3d693865fd3756c7b13caf326d25b (diff) | |
| download | emacs-769087cead629d7ad1fd5cfc15ce75625a78e6b3.tar.gz | |
(vc-bzr-state-heuristic): Fix last change for when there are conflicts.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index f90ead85c19..cda9c65c110 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -167,28 +167,30 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and "\0" (regexp-quote (file-name-nondirectory relfile)) "\0" - "[^\0]*\0" ;id? - "\\([^\0]*\\)\0" ;"a/f/d", a=removed? - "\\([^\0]*\\)\0" ;sha1? - "\\([^\0]*\\)\0" ;size? - "[^\0]*\0" ;"y/n", executable? - "[^\0]*\0" ;? - "\\([^\0]*\\)\0" ;"a/f/d" a=added? - "[^\0]*\0" ;sha1 again? - "[^\0]*\0" ;size again? - "[^\0]*\0" ;"y/n", executable again? - "[^\0]*\0$") ;last revid? + "[^\0]*\0" ;id? + "\\([^\0]*\\)\0" ;"a/f/d", a=removed? + "[^\0]*\0" ;sha1 (empty if conflicted)? + "\\([^\0]*\\)\0" ;size? + "[^\0]*\0" ;"y/n", executable? + "[^\0]*\0" ;? + "\\([^\0]*\\)\0" ;"a/f/d" a=added? + "\\([^\0]*\\)\0" ;sha1 again? + "[^\0]*\0" ;size again? + "[^\0]*\0" ;"y/n", executable again? + "[^\0]*\0" ;last revid? + ;; There are more fields when merges are pending. + ) nil t) - ;; FIXME: figure out which of the first or the second - ;; "size" and "sha1" we should use. They seem to always - ;; be equal, but there's probably a good reason why - ;; there are 2 entries. + ;; Apparently the second sha1 is the one we want: when + ;; there's a conflict, the first sha1 is absent (and the + ;; first size seems to correspond to the file with + ;; conflict markers). (cond - ((eq (char-after (match-beginning 4)) ?a) 'removed) + ((eq (char-after (match-beginning 1)) ?a) 'removed) ((eq (char-after (match-beginning 3)) ?a) 'added) - ((and (eq (string-to-number (match-string 3)) + ((and (eq (string-to-number (match-string 2)) (nth 7 (file-attributes file))) - (equal (match-string 2) + (equal (match-string 4) (vc-bzr-sha1 file))) 'up-to-date) (t 'edited)) |