Merge lp://staging/~jelmer/bzr-gtk/vertical-layout into lp://staging/bzr-gtk/gtk2

Proposed by Jelmer Vernooij
Status: Superseded
Proposed branch: lp://staging/~jelmer/bzr-gtk/vertical-layout
Merge into: lp://staging/bzr-gtk/gtk2
Diff against target: 161 lines (+56/-13)
3 files modified
NEWS (+5/-0)
branchview/treeview.py (+4/-4)
viz/branchwin.py (+47/-9)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-gtk/vertical-layout
Reviewer Review Type Date Requested Status
John A Meinel Needs Information
Review via email: mp+50302@code.staging.launchpad.net

Description of the change

Patch from Ximin Luo to allow using bzr viz in "widescreen mode" where the
revision details are shown next to the graph.

https://bugs.launchpad.net/bzr-gtk/+bug/649273/+attachment/1645811/+files/bzr-gtk_vertical.png

To post a comment you must log in.
712. By Jelmer Vernooij

Add lock dialog. (Daniel Schierbeck)

713. By Jelmer Vernooij

Remove some unused imports, fix some formatting.

Revision history for this message
John A Meinel (jameinel) wrote :

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

On 2/18/2011 5:01 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-gtk/vertical-layout into lp:bzr-gtk.
>
> Requested reviews:
> Bazaar GTK maintainers (bzr-gtk)
> Related bugs:
> #271822 bad characters in branchview/treemodel.py
> https://bugs.launchpad.net/bugs/271822
> #649273 add vertical layout option
> https://bugs.launchpad.net/bugs/649273
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-gtk/vertical-layout/+merge/50302
>
> Patch from Ximin Luo to allow using bzr viz in "widescreen mode" where the
> revision details are shown next to the graph.
>
> https://bugs.launchpad.net/bzr-gtk/+bug/649273/+attachment/1645811/+files/bzr-gtk_vertical.png

There seem to be some UTF-8 issues with the patch:

- -__copyright__ = "Copyright © 2005 Canonical Ltd."
+__copyright__ = "Copyright © 2005 Canonical Ltd."
 __author__ = "Gary van der Merwe <email address hidden>"

That looks like someone opened a UTF-8 file as iso-8859-1 and then saved
it as UTF-8 again.

This also seems to carry a lot more changes than just that. Since it
seems to be adding credits.pickle, and changes to HACKING, etc.

 review: needsinfo

John
=:_>

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

iEYEARECAAYFAk1enIoACgkQJdeBCYSNAAN1dwCgjNBs6UCnPuJAcdHu3x/Ijt23
XoMAn0pdjy5vOZDc7V/2Vu67IzwAmf+N
=68le
-----END PGP SIGNATURE-----

review: Needs Information
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Garr, this is a rebase gone wrong. Sorry.

714. By Ximin Luo

Add option to use 'bzr viz' with a vertical layout.

715. By Jelmer Vernooij

Merge trunk.

716. By Jelmer Vernooij

Merge trunk.

717. By Jelmer Vernooij

Fix some formatting.

718. By Jelmer Vernooij

Construct model early.

719. By Jelmer Vernooij

Fix signal handling.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: