[PING] Request: please add to 0.8 release --no-prefix option to diff command

[Goffredo Baroncelli]

On Wednesday 26 April 2006 16:11, John Arbash Meinel wrote:
> Jan Hudec wrote:
> > On Wed, Apr 26, 2006 at 10:19:53 +0300, Alexander Belchenko wrote:
> >> New behaviour of diff command (with a/ - b/ prefixes) breaks
> >> compatibility of bzr with some tools. In particular with my favorite FTE
> >> editor that has built-in support of SVN that I extend to support bzr.
> >>
> >> Please inclide to 0.8 release --no-prefix options to bzr diff.
> >> I think I saw the patch in the mailing list.
> > 
> > In fact given how a/ and b/ look (ugly IMHO), I'd even prefer
> > --prefix=<old>,<new>, defaulting to both being empty...
> > 
> 
> I would second this preference. I would even write the patch if it was
> decided it would be included.


I suggest to rename the --prefix option to a less generic --diff-prefix 
option; morover if you add an entry in the [ALIAS] section of 
the .bazaar/bazaar.conf file you can add a new command which generate the 
desiderated output; also I dislike the a/,b/ prefix: if it is possible I 
prefer to return to the old behaviour.

$ grep gdiff ~/.bazaar/bazaar.conf
gdiff=diff --diff-prefix=:

$ ./bzr gdiff | head
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -997,12 +997,22 @@
     # TODO: This probably handles non-Unix newlines poorly.

     takes_args = ['file*']
[...]

BTW I replaced the ',' (comma) with a ':' (colon) because otherwise bzr 
generates an error processing the ALIAS section...

As side note, we can add some prefix which are replaced by the revision-id ( o 
revision-number )... as git does.

Goffredo

-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack at inwind.it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff.diff
Type: text/x-diff
Size: 5015 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060426/0e8a97ed/attachment.bin