Hi,
It seems that dvc cannot handle the output from bzr well when I do
chmod u+x on a file controlled by bzr. Consider I did chmod u+x on
docs/CONTRIBUTORS. I got following display on *bzr-status* buffer.
modified:
docs/CONTRIBUTORS*
lisp/bzr.el
unknown:
++build/
`*' is appended to the file name.
bzr help status said:
[EMAIL PROTECTED]/dvc/bzr/dvc% /usr/bin/bzr --help status
/usr/bin/bzr --help status
usage: bzr status [FILE...]
aliases: st, stat
Display status summary.
This reports on versioned and unknown files, reporting them
grouped by state. Possible states are:
added
Versioned in the working copy but not in the previous revision.
removed
Versioned in the previous revision but removed or deleted
in the working copy.
renamed
Path of this file changed from the previous revision;
the text may also have changed. This includes files whose
parent directory was renamed.
modified
Text has changed since the previous revision.
kind changed
File kind has been changed (e.g. from file to directory).
unknown
Not versioned and not matching an ignore pattern.
To see ignored files use 'bzr ignored'. For details in the
changes to file texts, use 'bzr diff'.
--short gives a status flags for each item, similar to the SVN's status
command.
Column 1: versioning / renames
+ File versioned
- File unversioned
R File renamed
? File unknown
C File has conflicts
P Entry for a pending merge (not a file)
Column 2: Contents
N File created
D File deleted
K File kind changed
M File modified
Column 3: Execute
>>>> * The execute bit was changed
Mayby column 3 is not handled well.
I wrote following short patch. However, I think this
is no good. Because all Column 1, 2, 3 are not handled here.
More code must be needed here. Could you give me comments or suggestion?
=== modified file 'lisp/bzr.el'
--- lisp/bzr.el 2007-06-07 18:55:44 +0000
+++ lisp/bzr.el 2007-06-15 11:31:53 +0000
@@ -406,7 +406,7 @@
(list 'file newname
" " " " dir
oldname)))))
- ((looking-at " +\\(?:Text conflict in \\)?\\([^\n]*?\\)\\([/@]\\)?$")
+ ((looking-at " +\\(?:Text conflict in
\\)?\\([^\n]*?\\)\\([/@*]\\)?$")
(let ((file (match-string-no-properties 1))
(dir (match-string-no-properties 2)))
(with-current-buffer changes-buffer
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
