Merged repobrowser into master and added SQUASH_MSG importing
commitb90ab11119f38dba0de241ef8d76b62a332e29c4
authorDavid Aguilar <davvid@gmail.com>
Sun, 9 Dec 2007 11:32:42 +0000 (9 03:32 -0800)
committerDavid Aguilar <davvid@gmail.com>
Sun, 9 Dec 2007 11:33:51 +0000 (9 03:33 -0800)
treee020b8e99bb9ec0e20273671940670b7eaa4db50
parent90dc4111dc3529770697f6ed502dfa2f52cab4fd
Merged repobrowser into master and added SQUASH_MSG importing

- Added support for importing the SQUASH_MSG from a merge-in-progress.

Squashed commit of the following:

commit 610c3765ad7fbfbdeb82c21d02be10d0ce5126c5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 03:11:17 2007 -0800

    Implemented patch export in the repo browser

    - Added a save-as dialog in the repocontroller's double-click action
    - Added a module for holding session-lifetime default values

    Signed-off by: David Aguilar <davvid@gmail.com>

commit 5e86d35aa5c17095d9c58130a62b7a4e6dfb6e1a
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 02:12:18 2007 -0800

    Performance improvements for ansi_to_html

    - Avoid creating spurious string copies
    - Avoid superfluous int->str conversion
    - Reworked html_encode to not use a temporary ANSI array
    - Reordered html_encode's checks to catch the common case first

    Signed-off by: David Aguilar <davvid@gmail.com>

commit 2ec40f9ef38d525efa95ded41e0d2c8001528e31
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 00:31:21 2007 -0800

    Added tooltips and changed default window sizes

    - Changed default window sizes so that the diff, command, and content display would be 80 columns wide
    - Added tooltips to all items in the main ugit interface (Window.ui)

    Signed-off by: David Aguilar <davvid@gmail.com>

commit caa924eecd18b9667f5e07a5d3aa74a278db3fc1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 00:29:22 2007 -0800

    Fixed a bug where "Commit All" was commiting unstaged changes

    - Removed the "commit_all" parameter from git_commit in cmds
    - Changed the controller to pass model.get_staged() when "Commit All" is checked

    Signed-off by: David Aguilar <davvid@gmail.com>

commit d3d0486738993591feb7fa0976cbd5e6038a4745
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 00:18:50 2007 -0800

    Use git cat-file to show file contents

    - Added git_cat_file in cmds
    - Updated repobrowsercontroller to use git_cat_file
    - Added item_types to GitRepoBrowserModel
    - Renamed GitRepoBrowserModel's items to item_names for consistency

    Signed-off by: David Aguilar <davvid@gmail.com>

commit a77aeb2b57d2e2aa490fcf145c3220d968aecb58
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 8 04:26:59 2007 -0800

    Added "browse other branch" functionality

    - Added git_branch_list to cmd
    - Created GitBranchDialog / BranchDialog.ui
    - Added invocation of the GitBranchDialog in cb_branch_other
    - Guarded against item() returning None in repobrowsercontroller's cb_item_changed
    - Changed the commit browser's label to say "Object ID" instead of "Revision Expression" since that is more generic

    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7aa54406410e57b2102704a7774fd8e8ac0ef136
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 8 03:50:14 2007 -0800

    Fixed a bug when changing directories

    When changing into a directory with fewer items than the current directory the cb_item_changed callback is triggered.  When it's triggered the listwidget's current property still points at the old value of "current," thus we have an array index that is out of range.  We now guard against overstepping the item_sha1s array.

    Signed-off by: David Aguilar <davvid@gmail.com>

commit a547d323cb45573d996d7d59de7602388eb9998b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 8 03:47:01 2007 -0800

    Removed redundant label from CommandDialog

    Signed-off by: David Aguilar <davvid@gmail.com>

commit 10d610ed61b73188b7d39f210f28849d62ccfd99
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 7 20:29:44 2007 -0800

    Implemented the GitRepoBrowser

    - Added qtutils.py for qt utility methods
    - Added git_ls_tree to cmds.py
    - Added dir.png icon
    - Renamed a few modules for consistency
    - Added separate model and controller for the repobrowser
    - The CommitBrowser was reused as the RepoBrowser (same view)

    Signed-off by: David Aguilar <davvid@gmail.com>

Commit signed-off by: David Aguilar <davvid@gmail.com>
16 files changed:
bin/ugit.py
icons/dir.png [new file with mode: 0644]
py/__init__.py
py/cmds.py
py/controllers.py [moved from py/gitcontroller.py with 88% similarity]
py/defaults.py [new file with mode: 0644]
py/gitmodel.py [deleted file]
py/models.py [new file with mode: 0644]
py/qtutils.py [new file with mode: 0644]
py/repobrowsercontroller.py [new file with mode: 0644]
py/utils.py
py/views.py [moved from py/gitview.py with 65% similarity]
ui/BranchDialog.ui [new file with mode: 0644]
ui/CommandDialog.ui
ui/CommitBrowser.ui
ui/Window.ui