[RFC] Conflicts handling in status command
Guillermo Gonzalez
guillo.gonzo at gmail.com
Sun Jul 22 22:57:01 BST 2007
Hi,
While working in bzr-eclipse I found two issues related to the status
command and how it handle conflicts. Both have a bug report: #123472 and
#127606
#123472 is about a more compact/condensed output for conflicts.
My suggestion is something like this:
CM COPYING - Text conflict
instead of:
M COPYING
C Text conflict in COPYING
(for #123472 in bzr-eclipse I have a workaround in bzr-xmloutput, but would
be nice that bzr handle this)
the solution I came across is to modify TreeDelta.show and
TreeDelta.show.show_list so it search in the conflicts for each file before
print it to to_file. (don't known how this affect performance)
#127606 is about the behavior of status when specific_files is used (one or
more files as argumento to 'bzr status').
'bzr status a.file' always show the conflicts, also if they are not realted
to the specific_files
I think this isn't quite right, if I tell bzr i want to known the status of
a.file, I don't care about conflicts not related to a.file (but I can be
wrong :))
I wrote a quick fix for #127606 but lack of test (I'm on it ;))
http://launchpadlibrarian.net/8545424/status.py.patch
I'm still trying to undertand bzrlib and how to use it, so I can implement
this (It would be nice to have this in 0.19).
Waiting your comments on this
Regars,
--
Guillermo Gonzalez
JID: ggonzalez -AT- jabber -DOT- org
Linux User #385261
More information about the bazaar
mailing list