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
701d018c
Commit
701d018c
authored
Jul 07, 2008
by
Dan Nicolaescu
Browse files
(vc-bzr-after-dir-status): Deal with execute bit changes.
parent
dfe66c5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+11
-9
No files found.
lisp/ChangeLog
View file @
701d018c
2008-07-07 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Deal with execute bit changes.
2008-07-06 John Paul Wallington <jpw@pobox.com>
* kermit.el (kermit-esc-char, kermit-clean-off): Doc fixes.
...
...
lisp/vc-bzr.el
View file @
701d018c
...
...
@@ -576,17 +576,19 @@ stream. Standard error output is discarded."
;; else fall back to default vc.el representation
(vc-default-prettify-state-info 'Bzr file)))
;;
XXX
: this needs testing, it's probably incomplete.
;;
FIXME
: this needs testing, it's probably incomplete.
(defun vc-bzr-after-dir-status (update-function)
(let ((status-str nil)
(translation '(("
+N
" . added)
("
-D
" . removed)
("
M
" . edited)
;; XXX: what about ignored files?
("
D
" . missing)
(translation '(("
+N
" . added)
("
-D
" . removed)
("
M
" . edited) ;; file text modified
("
*
" . edited) ;; execute bit changed
("
M*
" . edited) ;; text modified + execute bit changed
;; FIXME: what about ignored files?
("
D
" . missing)
;; For conflicts, should we list the .THIS/.BASE/.OTHER?
("
C
" . conflict)
("
?
" . unregistered)
("
C
" . conflict)
("
?
" . unregistered)
;; Ignore "
P
" and "
P.
" for pending patches.
))
(translated nil)
...
...
@@ -594,7 +596,7 @@ stream. Standard error output is discarded."
(goto-char (point-min))
(while (not (eobp))
(setq status-str
(buffer-substring-no-properties (point) (+ (point)
2
)))
(buffer-substring-no-properties (point) (+ (point)
3
)))
(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
...
...
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