Bazaar

bzr diff --using should support comparing whole trees like difftools.

Bug #537270 reported by Scott James Remnant (Canonical)
48
This bug affects 4 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
High
Unassigned
Breezy
Triaged
Wishlist
Unassigned

Bug Description

"bzr diff --using meld" used to be a really useful way of comparing revisions. One of my favourited used to be "bzr diff -r :submit --using meld" to see the local changes compared to upstream.

This gave me a single meld window with all changes, including new and removed files.

Now most of the output goes to stdout as ordinary diff, and meld is instead invoked once per changed file (the output on stdout seems to be regarding the new and removed files)

Tags: diff
Martin Pool (mbp)
Changed in bzr:
importance: Undecided → High
status: New → Confirmed
Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 537270] Re: bzr diff --using meld has stopped working

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> ** Changed in: bzr
> Importance: Undecided => High
>
> ** Changed in: bzr
> Status: New => Confirmed
>

I'm pretty sure the difference is that Scott was using bzr-difftools
which has explicit meld support and provided a different 'bzr diff
- --using' implementation than just the builtin 'bzr diff --using' support.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkuf9sYACgkQJdeBCYSNAANyPQCgpNPnLJ8lPg8MzntRbmMvDPw+
ptsAn3TEChPwcupyCNf4Y/ypBX7ZVXzs
=ts9t
-----END PGP SIGNATURE-----

Revision history for this message
Scott James Remnant (Canonical) (canonical-scott) wrote :

On Tue, 2010-03-16 at 21:23 +0000, John A Meinel wrote:

> I'm pretty sure the difference is that Scott was using bzr-difftools
> which has explicit meld support and provided a different 'bzr diff
> - --using' implementation than just the builtin 'bzr diff --using' support.
>
I don't have any package installed called this, and indeed can't find
one named that in the archive.

Scott
--
Scott James Remnant
<email address hidden>

Revision history for this message
Gary van der Merwe (garyvdm) wrote :

On Sat, Apr 17, 2010 at 3:46 AM, Scott James Remnant
<email address hidden> wrote:
> I don't have any package installed called this, and indeed can't find
> one named that in the archive.

Scott: I don't think that this plugin was ever "debianized". Hence it
is likely that you manually put a copy of this plugin in
~/.bazaar/plugins. The behavior you described accurately describes the
behavior of this plugin. (https://launchpad.net/bzr-difftools)

The plugin achieves this behavior by writing the whole trees to a temp
dirs on disk. When one of the trees is the working tree, it just
passes the working tree, rather than a temp dir. This results in non
versioned, and ignored files showing up in the diff.

I intend on addressing this issue by fixing bug 490212. This will
address the usability issue of only been able to see 1 file diff at a
time. I did not realize that there is an issue with add/removed files.
I will give some thought to this.

Revision history for this message
Scott James Remnant (Canonical) (canonical-scott) wrote :

On Mon, 2010-04-19 at 21:16 +0000, Gary van der Merwe wrote:

> On Sat, Apr 17, 2010 at 3:46 AM, Scott James Remnant
> <email address hidden> wrote:
> > I don't have any package installed called this, and indeed can't find
> > one named that in the archive.
>
> Scott: I don't think that this plugin was ever "debianized". Hence it
> is likely that you manually put a copy of this plugin in
> ~/.bazaar/plugins. The behavior you described accurately describes the
> behavior of this plugin. (https://launchpad.net/bzr-difftools)
>
If I did that, it would still be there - it isn't.

Scott
--
Scott James Remnant
<email address hidden>

Gary van der Merwe (garyvdm)
summary: - bzr diff --using meld has stopped working
+ bzr diff --using should support compairing whole trees like difftools.
Changed in bzr:
assignee: nobody → Gary van der Merwe (garyvdm)
status: Confirmed → In Progress
Jelmer Vernooij (jelmer)
tags: added: diff
Revision history for this message
John A Meinel (jameinel) wrote : Re: bzr diff --using should support compairing whole trees like difftools.

Gary, can you give an update on this? I'm assuming you have stopped specifically working on it, since the last update in the associated branch is 1 year old.

Would you be able to describe where you got to?

Changed in bzr:
assignee: Gary van der Merwe (garyvdm) → nobody
status: In Progress → Confirmed
Jelmer Vernooij (jelmer)
summary: - bzr diff --using should support compairing whole trees like difftools.
+ bzr diff --using should support comparing whole trees like difftools.
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
Changed in brz:
status: New → Triaged
importance: Undecided → Wishlist
tags: removed: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.