[Pkg-bazaar-commits] ./bzr-gtk/unstable r368: Merged with mainline.
Daniel Schierbeck
daniel.schierbeck at gmail.com
Fri Apr 10 07:45:10 UTC 2009
------------------------------------------------------------
revno: 368
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: menubar
timestamp: Wed 2007-11-07 15:19:09 +0100
message:
Merged with mainline.
added:
tests/test_commit.py
modified:
NEWS
__init__.py
annotate/gannotate.py
commit.py
diff.py
olive/__init__.py
olive/menu.py
revisionview.py
setup.py
tests/__init__.py
tests/test_diff.py
viz/branchwin.py
viz/treeview.py
------------------------------------------------------------
revno: 330.3.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-11-03 16:34:44 +0100
message:
Merge adding tooltip to viz.
modified:
viz/treeview.py
------------------------------------------------------------
revno: 330.3.3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-11-03 17:27:35 +0100
message:
Merge John's gcommit changes.
added:
tests/test_commit.py
modified:
__init__.py
annotate/gannotate.py
commit.py
diff.py
olive/__init__.py
olive/menu.py
revisionview.py
tests/__init__.py
tests/test_diff.py
------------------------------------------------------------
revno: 278.1.2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fri 2007-09-21 18:06:05 -0500
message:
Add an extra box that pops up when we have per-file information.
modified:
logview.py
------------------------------------------------------------
revno: 278.1.3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-09-25 15:59:50 -0500
message:
Have the ability to tell the log view that we only care about a specific file_id.
modified:
annotate/gannotate.py
logview.py
------------------------------------------------------------
revno: 278.1.4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Thu 2007-09-27 17:16:26 -0500
message:
Just playing around.
Moved the diff contents into a separate class, so that we
could reuse it without having another top level window.
Playing around with how to lay that out in the gcommit view.
modified:
commit.py
diff.py
------------------------------------------------------------
revno: 278.1.5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fri 2007-09-28 17:25:49 -0500
message:
Starting to flesh out the dialog with actual windows.
added:
tests/test_commit.py
modified:
__init__.py
commit.py
tests/__init__.py
------------------------------------------------------------
revno: 278.1.6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fri 2007-09-28 17:26:56 -0500
message:
Clarify the note on the file message expander.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 12:37:36 -0500
message:
merge in the latest trunk, including the new 'broken lines' code.
added:
viz/treemodel.py
renamed:
viz/graph.py => viz/linegraph.py
modified:
NEWS
__init__.py
logview.py
setup.py
viz/branchwin.py
viz/graphcell.py
viz/linegraph.py
------------------------------------------------------------
revno: 278.1.8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 12:41:53 -0500
message:
Adding some prototypes of how the commit should look
added:
prototype_gcommit.wxg
------------------------------------------------------------
revno: 278.1.9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 12:42:04 -0500
message:
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
I still want to find a way to set a default size so that some get more
screen space than others.
But this is better than before.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.10
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 13:03:52 -0500
message:
To get the space weighting I wanted, I turned to a Table.
And that seems to be working. I just need to get the interior spacing
looking nice.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.11
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 13:22:16 -0500
message:
Worked out the rest of the spacing.
Also left aligning the labels on the right side, to make them consistent.
I might consider doing the same for the left side.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.12
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 13:26:38 -0500
message:
Delay computing the delta, and clean up some of the diff view names.
modified:
commit.py
diff.py
tests/test_commit.py
tests/test_diff.py
------------------------------------------------------------
revno: 278.1.13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 13:28:45 -0500
message:
minor cleanup
modified:
tests/test_diff.py
------------------------------------------------------------
revno: 278.1.14
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 15:03:50 -0500
message:
Tests that we fill out the pending list correctly.
We should consider switching to a nested view. But that may
be unnecessary, since typically we only have 1 top level merge.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.15
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 15:30:54 -0500
message:
Hook up the list of modified files.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.16
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 16:10:06 -0500
message:
Implement the file changes list on top of _iter_changes rather than
on top of changes_from.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.17
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 16:41:22 -0500
message:
Add a * reference for why you can't change the commit selection.
Set the screen up so the diff changes based on what is selected.
We *could* do that using a multi-select, or somesuch.
We still need a way to switch back to the whole diff view.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 17:04:43 -0500
message:
Start checking the diff view is correct.
modified:
commit.py
diff.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.19
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mon 2007-10-01 18:42:33 -0500
message:
Test what happens when a specific file is selected.
modified:
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.20
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 11:15:58 -0500
message:
We always select the All Files record in the files view,
as this will set our diff view for us.
Toggling All Files, sets the flags for all the other entries.
Added tests for all of this.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.21
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 12:03:44 -0500
message:
Start tracking the per-file commit messages.
Add tests that switching selections saves the current value, and
restores the value for the new selection.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.22
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 12:33:27 -0500
message:
Add a test-gtk command to make testing faster
modified:
__init__.py
------------------------------------------------------------
revno: 278.1.23
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 12:34:18 -0500
message:
Beginning to support actual commit.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.24
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 12:38:05 -0500
message:
Actually show the commit button.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.25
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 13:08:58 -0500
message:
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.26
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 13:26:42 -0500
message:
Handle pointless commits and trees with unknown files.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.27
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 14:10:01 -0500
message:
Add the ability to commit just specific files.
Also include the ability to save the file-info data.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.28
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 14:15:41 -0500
message:
Ensure that we can set per-file messages even during a merge.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.29
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-02 18:08:12 -0500
message:
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.
modified:
commit.py
diff.py
tests/test_commit.py
tests/test_diff.py
------------------------------------------------------------
revno: 278.1.30
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Wed 2007-10-03 10:45:41 -0500
message:
Removing the prototype as the dialog is complete.
removed:
prototype_gcommit.wxg
------------------------------------------------------------
revno: 278.1.31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Wed 2007-10-03 10:49:31 -0500
message:
We can make bencode work again by a simple decode/encode step.
modified:
commit.py
logview.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.32
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Wed 2007-10-03 18:25:15 -0500
message:
Add the Ctrl+n accelerator to jump through the commit messages.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.33
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Tue 2007-10-09 18:36:13 -0500
message:
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fri 2007-10-12 12:26:02 -0500
message:
Cleanup, we are still ignoring the 'selected' property, and the 'wtpath'
modified:
commit.py
------------------------------------------------------------
revno: 278.1.35
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fri 2007-10-12 13:10:24 -0500
message:
Make use of the 'selected' parameter to CommitDialog.
Also update the Olive interfaces to properly use CommitDialog.
modified:
commit.py
olive/__init__.py
olive/menu.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.36
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 15:36:16 -0500
message:
Merge in Jelmer's trunk update + conflict resolution.
added:
viz/treeview.py
window.py
modified:
NEWS
__init__.py
annotate/gannotate.py
commit.py
diff.py
logview.py
olive/__init__.py
olive/menu.py
preferences.py
revisionmenu.py
tags.py
viz/branchwin.py
viz/linegraph.py
viz/treemodel.py
------------------------------------------------------------
revno: 322.1.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-26 18:18:50 +0200
message:
Merge Johns' gcommit improvements and fix conflicts against trunk.
added:
tests/test_commit.py
modified:
__init__.py
annotate/gannotate.py
commit.py
diff.py
logview.py
olive/__init__.py
olive/menu.py
tests/__init__.py
tests/test_diff.py
------------------------------------------------------------
revno: 278.1.37
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 16:15:13 -0500
message:
Merge the latest trunk 326
removed:
tests/test_viz.py
modified:
__init__.py
mergedirective.py
tests/__init__.py
viz/branchwin.py
------------------------------------------------------------
revno: 278.1.38
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 16:16:58 -0500
message:
Add tests that when per-file messages are disabled
we use 'Commit Message' rather than 'Global Commit Message'.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.39
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 16:58:07 -0500
message:
To disable a checkbox it is set_property('activatable', False),
not set_active(False).
The latter just sets/clears the value, not the ability to function.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.40
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 17:04:17 -0500
message:
Make the 'Commit Message' bold.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.41
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 17:08:56 -0500
message:
For the moment, just hide the section headings Files and Diff for *.
Otherwise we have to remove all the logic for changing the section name,
but I want to wait until we are sure we don't want it.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.42
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Tue 2007-10-30 17:23:37 -0500
message:
start playing with using a radial box, rather than an entry in the list
to enable/disable selected files.
modified:
commit.py
------------------------------------------------------------
revno: 278.1.43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Fri 2007-11-02 17:08:54 -0500
message:
Finish connecting the 'Commit all changes' radio buttons.
modified:
commit.py
tests/test_commit.py
------------------------------------------------------------
revno: 278.1.44
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: j-gtk
timestamp: Fri 2007-11-02 17:29:12 -0500
message:
Merge in trunk, and update logview per-file commit messages.
modified:
NEWS
logview.py
revisionmenu.py
viz/branchwin.py
viz/linegraph.py
viz/treemodel.py
viz/treeview.py
------------------------------------------------------------
revno: 278.1.45
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: j-gtk
timestamp: Fri 2007-11-02 17:42:07 -0500
message:
Switch to a new tab for per-file messages.
modified:
logview.py
------------------------------------------------------------
revno: 330.3.4
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Wed 2007-11-07 10:42:33 +0100
message:
Merge changes from the 0.92.0 release branch.
modified:
NEWS
__init__.py
viz/branchwin.py
viz/treeview.py
------------------------------------------------------------
revno: 330.2.4
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: brokenlines-toggle
timestamp: Sun 2007-11-04 22:21:51 +0100
message:
Made use of compact view optional.
modified:
viz/branchwin.py
------------------------------------------------------------
revno: 330.2.5
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: brokenlines-toggle
timestamp: Sun 2007-11-04 23:11:35 +0100
message:
Support persistence of compact view option.
modified:
viz/branchwin.py
------------------------------------------------------------
revno: 330.2.6
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: brokenlines-toggle
timestamp: Tue 2007-11-06 00:54:57 +0100
message:
Added a maximum graph column width.
modified:
viz/treeview.py
------------------------------------------------------------
revno: 330.5.1
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Tue 2007-11-06 19:58:29 +0100
message:
Merge brokenlines fixes.
modified:
viz/branchwin.py
viz/treeview.py
------------------------------------------------------------
revno: 330.5.2
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Tue 2007-11-06 22:48:46 +0100
message:
Fixed set_tooltip_column() related issue.
modified:
viz/treeview.py
------------------------------------------------------------
revno: 330.5.3
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Tue 2007-11-06 22:50:56 +0100
message:
Bump the version tuple to final.
modified:
__init__.py
------------------------------------------------------------
revno: 330.5.4
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Tue 2007-11-06 23:48:07 +0100
message:
Update NEWS with release date, and also add some missing bits.
modified:
NEWS
------------------------------------------------------------
revno: 330.5.5
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Tue 2007-11-06 23:48:32 +0100
message:
Use better fix by John.
modified:
viz/treeview.py
------------------------------------------------------------
revno: 330.5.6
tags: bzr-gtk-0.92.0
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk-0.92.0
timestamp: Wed 2007-11-07 10:24:30 +0100
message:
Modified release date.
modified:
NEWS
------------------------------------------------------------
revno: 330.3.5
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Wed 2007-11-07 11:08:49 +0100
message:
Start working on 0.93.0.
modified:
NEWS
__init__.py
setup.py
-------------- next part --------------
Diff too large for email (3142 lines, the limit is 1000).
More information about the Pkg-bazaar-commits
mailing list