Merge lp://staging/~sinzui/bzr-gtk/per-file-commit into lp://staging/bzr-gtk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 789 | ||||
Proposed branch: | lp://staging/~sinzui/bzr-gtk/per-file-commit | ||||
Merge into: | lp://staging/bzr-gtk | ||||
Diff against target: |
59 lines (+16/-2) 2 files modified
commit.py (+9/-2) tests/test_commit.py (+7/-0) |
||||
To merge this branch: | bzr merge lp://staging/~sinzui/bzr-gtk/per-file-commit | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+98882@code.staging.launchpad.net |
Commit message
Ensure that the per/file message widget fits at least one line.
Description of the change
When I do bzr gcommit, a window is shown in which I can enter the per
file commit messages. But this per file commit window is too small. And
I am unable to make it big (and usable)
-------
RULES
* This is a Gtk3 issue where the rules of expand and fill changed.
The TextView was allocated 1 pixel which is not enough to see the
text of the line.
* This issue was partially addressed in a previously when the expand
and fill rules were adjusted to solve other layout issues; the message
has space for one line in trunk on precise at this movement.
* There is no way to guarantee that space is allocated, but the widget
could request the height of two lines when Gtk is allocating space.
* ADDENDUM
./setup.py check -m commit had errors because DiffView could not
be imported. I moved the inline import to a global import. If this
should not happen, test_commit.py could import DiffView to ensure
it is available for all the tests.
QA
* Add
per_
to your bazaar or locations conf file.
* Issue this command with this merged branch
BZR_
* Select commit.py from the listed files.
* Verify that "Commit message for commit.py" is expanded
and that there is about 2 lines of space. (works for me)