Bazaar

  1. Bug #317896
  2. Comment #6

Comment 6 for bug 317896

Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 317896] Re: bzr unshelve --dry-run should produce a diff

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

Guilherme Salgado wrote:
> I'm willing to try and fix this myself, but I can't seem to find a way
> to produce a diff out of the shelf's contents. Is that at all possible
> or do I need to merge the shelf's contents and get a diff afterwards?
> Or is there a better way of doing it?
>

I would assume that you can get access to a Tree like object from shelf
(PreviewTree perhaps?). And from there you would do something like
tree.changes_from(workingtree)

Which would let you find what files have changed.

Alternatively, I think there are some helpers in bzrlib.diff.* that
would generate a unidiff between 2 trees.

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

iEYEARECAAYFAksqlRoACgkQJdeBCYSNAAODWgCgmj3UO90+K4CULcJRpprU0M81
b98An2Xk3wn4Pf+vaiL+ZBxo5qt0nKZ1
=5yLT
-----END PGP SIGNATURE-----