Rev 323: Merge Johns' gcommit improvements and fix conflicts against trunk. in file:///data/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Fri Oct 26 17:18:52 BST 2007
At file:///data/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 323
revision-id:jelmer at samba.org-20071026161850-d7qxxc0i10hg7xnf
parent: jelmer at samba.org-20071024180311-f7117v3sfyw3e9sc
parent: john at arbash-meinel.com-20071012181024-t332b4l0338y419t
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fr 2007-10-26 18:18:50 +0200
message:
Merge Johns' gcommit improvements and fix conflicts against trunk.
added:
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
logview.py logview.py-20051024072750-4d5c28cb73611027
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
tests/__init__.py __init__.py-20070201155018-mi2dl3spgj7fqdum-1
tests/test_diff.py test_diff.py-20070716102329-o1qvzd7v2fg9lyag-1
------------------------------------------------------------
revno: 278.1.35
revision-id:john at arbash-meinel.com-20071012181024-t332b4l0338y419t
parent: john at arbash-meinel.com-20071012172602-vdlj2cdrkczwyoqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fr 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.34
revision-id:john at arbash-meinel.com-20071012172602-vdlj2cdrkczwyoqu
parent: john at arbash-meinel.com-20071009233613-gerfa0rwn7tklvzd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fr 2007-10-12 12:26:02 -0500
message:
Cleanup, we are still ignoring the 'selected' property, and the 'wtpath'
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.33
revision-id:john at arbash-meinel.com-20071009233613-gerfa0rwn7tklvzd
parent: john at arbash-meinel.com-20071003232515-ziol79tmbtkbak3e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.32
revision-id:john at arbash-meinel.com-20071003232515-ziol79tmbtkbak3e
parent: john at arbash-meinel.com-20071003154931-29y6lt71hx6bqhp7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mi 2007-10-03 18:25:15 -0500
message:
Add the Ctrl+n accelerator to jump through the commit messages.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.31
revision-id:john at arbash-meinel.com-20071003154931-29y6lt71hx6bqhp7
parent: john at arbash-meinel.com-20071003154541-lpr0w64px103peqd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mi 2007-10-03 10:49:31 -0500
message:
We can make bencode work again by a simple decode/encode step.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
logview.py logview.py-20051024072750-4d5c28cb73611027
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.30
revision-id:john at arbash-meinel.com-20071003154541-lpr0w64px103peqd
parent: john at arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mi 2007-10-03 10:45:41 -0500
message:
Removing the prototype as the dialog is complete.
removed:
prototype_gcommit.wxg prototype_gcommit.wx-20071001174139-93ftf9udpg2jw2cw-1
------------------------------------------------------------
revno: 278.1.29
revision-id:john at arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
parent: john at arbash-meinel.com-20071002191541-qra1s73obzvgrf7j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
tests/test_diff.py test_diff.py-20070716102329-o1qvzd7v2fg9lyag-1
------------------------------------------------------------
revno: 278.1.28
revision-id:john at arbash-meinel.com-20071002191541-qra1s73obzvgrf7j
parent: john at arbash-meinel.com-20071002191001-ezz7ejijs0e8tlg8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 2007-10-02 14:15:41 -0500
message:
Ensure that we can set per-file messages even during a merge.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.27
revision-id:john at arbash-meinel.com-20071002191001-ezz7ejijs0e8tlg8
parent: john at arbash-meinel.com-20071002182642-qs9ohpjp8fdkkl2o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.26
revision-id:john at arbash-meinel.com-20071002182642-qs9ohpjp8fdkkl2o
parent: john at arbash-meinel.com-20071002180858-dtnzn5aclokxw0fp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 2007-10-02 13:26:42 -0500
message:
Handle pointless commits and trees with unknown files.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.25
revision-id:john at arbash-meinel.com-20071002180858-dtnzn5aclokxw0fp
parent: john at arbash-meinel.com-20071002173805-m5kd4t5b4j5bpun9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.24
revision-id:john at arbash-meinel.com-20071002173805-m5kd4t5b4j5bpun9
parent: john at arbash-meinel.com-20071002173418-m7sabp62wnth76k3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 2007-10-02 12:38:05 -0500
message:
Actually show the commit button.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.23
revision-id:john at arbash-meinel.com-20071002173418-m7sabp62wnth76k3
parent: john at arbash-meinel.com-20071002173327-3td5w3r03q4thu5j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 2007-10-02 12:34:18 -0500
message:
Beginning to support actual commit.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.22
revision-id:john at arbash-meinel.com-20071002173327-3td5w3r03q4thu5j
parent: john at arbash-meinel.com-20071002170344-20tg0gldveoc73bb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 2007-10-02 12:33:27 -0500
message:
Add a test-gtk command to make testing faster
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
------------------------------------------------------------
revno: 278.1.21
revision-id:john at arbash-meinel.com-20071002170344-20tg0gldveoc73bb
parent: john at arbash-meinel.com-20071002161558-vsjd6h1diaczrxnq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.20
revision-id:john at arbash-meinel.com-20071002161558-vsjd6h1diaczrxnq
parent: john at arbash-meinel.com-20071001234233-1pe2qg08mz10kivq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.19
revision-id:john at arbash-meinel.com-20071001234233-1pe2qg08mz10kivq
parent: john at arbash-meinel.com-20071001220443-q4jqupexf5wx2sqa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 18:42:33 -0500
message:
Test what happens when a specific file is selected.
modified:
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.18
revision-id:john at arbash-meinel.com-20071001220443-q4jqupexf5wx2sqa
parent: john at arbash-meinel.com-20071001214122-t8p1go9suaqy1ftu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 17:04:43 -0500
message:
Start checking the diff view is correct.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.17
revision-id:john at arbash-meinel.com-20071001214122-t8p1go9suaqy1ftu
parent: john at arbash-meinel.com-20071001211006-gliyvcbbg989wh8n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.16
revision-id:john at arbash-meinel.com-20071001211006-gliyvcbbg989wh8n
parent: john at arbash-meinel.com-20071001203054-uizh8fzgp29gtnuc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.15
revision-id:john at arbash-meinel.com-20071001203054-uizh8fzgp29gtnuc
parent: john at arbash-meinel.com-20071001200350-y4b9uh0rw5kjrfmf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 15:30:54 -0500
message:
Hook up the list of modified files.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.14
revision-id:john at arbash-meinel.com-20071001200350-y4b9uh0rw5kjrfmf
parent: john at arbash-meinel.com-20071001182845-9v2w9kj5mc90wt4a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 278.1.13
revision-id:john at arbash-meinel.com-20071001182845-9v2w9kj5mc90wt4a
parent: john at arbash-meinel.com-20071001182638-k6us5j33j06n3ppy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 13:28:45 -0500
message:
minor cleanup
modified:
tests/test_diff.py test_diff.py-20070716102329-o1qvzd7v2fg9lyag-1
------------------------------------------------------------
revno: 278.1.12
revision-id:john at arbash-meinel.com-20071001182638-k6us5j33j06n3ppy
parent: john at arbash-meinel.com-20071001182216-z6p6s38u9ela7s9s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 13:26:38 -0500
message:
Delay computing the delta, and clean up some of the diff view names.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
tests/test_diff.py test_diff.py-20070716102329-o1qvzd7v2fg9lyag-1
------------------------------------------------------------
revno: 278.1.11
revision-id:john at arbash-meinel.com-20071001182216-z6p6s38u9ela7s9s
parent: john at arbash-meinel.com-20071001180352-hs0qrytsfi40e2i4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.10
revision-id:john at arbash-meinel.com-20071001180352-hs0qrytsfi40e2i4
parent: john at arbash-meinel.com-20071001174204-7oms5k0g7jnurke3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.9
revision-id:john at arbash-meinel.com-20071001174204-7oms5k0g7jnurke3
parent: john at arbash-meinel.com-20071001174153-6xoqsds4hnv291l3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.8
revision-id:john at arbash-meinel.com-20071001174153-6xoqsds4hnv291l3
parent: john at arbash-meinel.com-20071001173736-4hu6w2sp0p3e407d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 12:41:53 -0500
message:
Adding some prototypes of how the commit should look
added:
prototype_gcommit.wxg prototype_gcommit.wx-20071001174139-93ftf9udpg2jw2cw-1
------------------------------------------------------------
revno: 278.1.7
revision-id:john at arbash-meinel.com-20071001173736-4hu6w2sp0p3e407d
parent: john at arbash-meinel.com-20070928222656-rxiw7wzmk0fm8whu
parent: szilveszter.farkas at gmail.com-20071001083733-mn111f1k16ojsqd8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Mo 2007-10-01 12:37:36 -0500
message:
merge in the latest trunk, including the new 'broken lines' code.
added:
viz/treemodel.py treemodel.py-20070909175138-leue3q5w1rxy86hw-1
renamed:
viz/graph.py => viz/linegraph.py graph.py-20051016214152-ebf565808c860cf7
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
logview.py logview.py-20051024072750-4d5c28cb73611027
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
viz/branchwin.py branchwin.py-20051016222514-15fd120652fcf25c
viz/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
viz/linegraph.py graph.py-20051016214152-ebf565808c860cf7
------------------------------------------------------------
revno: 278.1.6
revision-id:john at arbash-meinel.com-20070928222656-rxiw7wzmk0fm8whu
parent: john at arbash-meinel.com-20070928222549-iq71v20ax7h3x8ff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fr 2007-09-28 17:26:56 -0500
message:
Clarify the note on the file message expander.
modified:
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
------------------------------------------------------------
revno: 278.1.5
revision-id:john at arbash-meinel.com-20070928222549-iq71v20ax7h3x8ff
parent: john at arbash-meinel.com-20070927221626-tlpljk85fnavtmiu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fr 2007-09-28 17:25:49 -0500
message:
Starting to flesh out the dialog with actual windows.
added:
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
tests/__init__.py __init__.py-20070201155018-mi2dl3spgj7fqdum-1
------------------------------------------------------------
revno: 278.1.4
revision-id:john at arbash-meinel.com-20070927221626-tlpljk85fnavtmiu
parent: john at arbash-meinel.com-20070925205950-rfcj7y5ryg4s9gw7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Do 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 commit.py-20060721181724-0mfkrqwpsa09q1t3-3
diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
------------------------------------------------------------
revno: 278.1.3
revision-id:john at arbash-meinel.com-20070925205950-rfcj7y5ryg4s9gw7
parent: john at arbash-meinel.com-20070921230605-muo8c027l8ag5m5n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Di 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 xannotate.py-20051024072750-fe35acd6bb909bd3
logview.py logview.py-20051024072750-4d5c28cb73611027
------------------------------------------------------------
revno: 278.1.2
revision-id:john at arbash-meinel.com-20070921230605-muo8c027l8ag5m5n
parent: john at arbash-meinel.com-20070921174204-ux87radq4k80m8zg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: with_file_info
timestamp: Fr 2007-09-21 18:06:05 -0500
message:
Add an extra box that pops up when we have per-file information.
modified:
logview.py logview.py-20051024072750-4d5c28cb73611027
Diff too large for email (2864 lines, the limit is 1000).
More information about the bazaar-commits
mailing list