mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(vc-bzr-state-heuristic): Make it work for lightweight

Browse Source 
checkouts.  (Bug#618)
This commit is contained in:
Dan Nicolaescu 2010-01-03 20:35:21 -08:00
parent 777013f2bf
commit 137d88ca4b
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-04 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-state-heuristic): Make it work for lightweight
checkouts. (Bug#618)
2010-01-02 Chong Yidong <cyd@stupidchicken.com> 2010-01-02 Chong Yidong <cyd@stupidchicken.com>
* net/browse-url.el (browse-url-encode-url): Don't escape commas. * net/browse-url.el (browse-url-encode-url): Don't escape commas.

21
lisp/vc-bzr.el
View File

@ -176,13 +176,13 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
"\0" "\0"
"[^\0]*\0" ;id? "[^\0]*\0" ;id?
"\\([^\0]*\\)\0" ;"a/f/d", a=removed? "\\([^\0]*\\)\0" ;"a/f/d", a=removed?
"[^\0]*\0" ;sha1 (empty if conflicted)? "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
"\\([^\0]*\\)\0" ;size? "\\([^\0]*\\)\0" ;size?p
"[^\0]*\0" ;"y/n", executable? "[^\0]*\0" ;"y/n", executable?
"[^\0]*\0" ;? "[^\0]*\0" ;?
"\\([^\0]*\\)\0" ;"a/f/d" a=added? "\\([^\0]*\\)\0" ;"a/f/d" a=added?
"\\([^\0]*\\)\0" ;sha1 again? "\\([^\0]*\\)\0" ;sha1 again?
"[^\0]*\0" ;size again? "\\([^\0]*\\)\0" ;size again?
"[^\0]*\0" ;"y/n", executable again? "[^\0]*\0" ;"y/n", executable again?
"[^\0]*\0" ;last revid? "[^\0]*\0" ;last revid?
;; There are more fields when merges are pending. ;; There are more fields when merges are pending.
@ -194,11 +194,20 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
;; conflict markers). ;; conflict markers).
(cond (cond
((eq (char-after (match-beginning 1)) ?a) 'removed) ((eq (char-after (match-beginning 1)) ?a) 'removed)
((eq (char-after (match-beginning 3)) ?a) 'added) ((eq (char-after (match-beginning 4)) ?a) 'added)
((and (eq (string-to-number (match-string 2)) ((or (and (eq (string-to-number (match-string 3))
(nth 7 (file-attributes file))) (nth 7 (file-attributes file)))
(equal (match-string 4) (equal (match-string 5)
(vc-bzr-sha1 file))) (vc-bzr-sha1 file)))
(and
;; It looks like for lightweight
;; checkouts \2 is empty and we need to
;; look for size in \6.
(eq (match-beginning 2) (match-end 2))
(eq (string-to-number (match-string 6))
(nth 7 (file-attributes file)))
(equal (match-string 5)
(vc-bzr-sha1 file))))
'up-to-date) 'up-to-date)
(t 'edited)) (t 'edited))
'unregistered)))) 'unregistered))))