git-cola: 1.3.8
bottled-on: Sun Jun 14 03:03:28 PDT 2009

commit 9751d6c8ee0811f40eb7727e8503c4a723a92810 (tag: refs/tags/v1.3.8, refs/remotes/origin/master, refs/remotes/origin/HEAD, refs/heads/master)
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 14 02:53:10 2009 -0700

    setup.py: launch `pyuic4` with 'sh -c' to work around old pyuic4 bugs
    
    Older versions of pyuic4 were implemented as a shell script instead
    of as python script.  Interestingly, an older version existed
    that didn't have a '#!/bin/sh' shebang line.
    
    Use 'sh -c' to accomodate both current and older, buggy pyuic4s.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c3830cf1bf0def7343a6aa8b0ec23733c60dd519
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jun 13 19:35:21 2009 -0700

    Show the diff when moving the selection using the arrow keys
    
    We weren't reacting to the selectionChanged() callback and thus
    were not displaying diffs when changing the selection using the
    arrow keys.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 358d4c58016ece3dafb7b5ce4736fdabd6ff3ba1
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 9 02:36:17 2009 -0700

    userguide: describe the main elements of the cola interface
    
    This adds descriptions for the repository status view, the diff view,
    and the diff hunk regions.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 841f81c09fa2bc689cc3b78b21470471128311c6
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 31 18:35:59 2009 -0700

    Move the sphinx docs under share/doc/git-cola
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cd36f8b0740d02fc7a86069e72ba2a208ae5eeb0
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 31 18:24:34 2009 -0700

    Change doc version to release
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b193772809ffd80b5b185dfb60a7b60aa8e716f3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 31 19:37:19 2009 -0700

    controllers/main: adjust docstrings for readability
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fcf34a6223ed333642fcd7f002c00ba55ed85362
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 31 19:36:35 2009 -0700

    darwin doc: mention the macports dev environment
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 52ef28a6b7d5b64e9ea43c6c7cb7e497b38a691e
Merge: 34000c7 c7618a4
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 27 10:37:44 2009 -0700

    Merge branch 'documentation'

commit c7618a4cefd9ee12e79e0a1123e6319385b4fa30
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 27 10:31:32 2009 -0700

    doc: add documenation for the rest of the cola API
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0a2baa24ea2d8ad4564af716c829cf3ef06c35cf
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 26 02:11:20 2009 -0700

    doc: add module documentation for base classes, models, controllers, and views
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d9b1d9b744d470cb673e1eb57af322c09a6754d6
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 23:17:02 2009 -0700

    doc: add a skeleton API reference guide using sphinx
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ba552c30af64d638225d51a1af3b2f14facddc91
Author: David Aguilar <davvid@gmail.com>
Date:   Mon May 25 22:37:59 2009 -0700

    doc: add the source root to sys.path
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8d3293778c2ffac9b8c248350f1e85ad7428b8e1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 18 22:52:15 2009 -0700

    doc: add .gitignore for the _build, _static, _templates
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a18a8c3713f090dcb654e82fcbcd47d24883f693
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 18 22:50:33 2009 -0700

    doc: add sphinx documentation with sphinx-quickstart
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 34000c717167125e8fa6d4ce6ae18ea08ef04347
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 27 10:32:05 2009 -0700

    utils: fix the docstring for sphinx
    
    "*" in rest means emphasis, so don't use it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 55d318a04b48549cb8a6f3a97f751f982aa06852
Author: Uri Okrent <uokrent@gmail.com>
Date:   Sun May 24 20:04:30 2009 -0700

    Add 's', 'h' shortcut keys for stage/unstage selection/hunk
    
    Signed-off-by: Uri Okrent <uokrent@gmail.com>

commit b341236095f6895ecddd57c4d9c0ec9e9f0a936d
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 15 02:21:35 2009 -0700

    diff: add the ability to diff using an arbitrary diff expression
    
    Diff -> Expression... allows you to enter a diff expression
    such as master~3...master and see the results in the
    Repository Status tree.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 861515ec96ec0ccd946b9b1f0a399be6bd193de3
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 15 01:39:15 2009 -0700

    Add a diff menu to contain diff-specific actions
    
    Diff against SHA-1, diff branches, and diff commits should
    all be in the same menu.  The "diff expression" action
    can then go in this menu.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 525f2def04d6d546336e5791f878d5366544f152
Merge: 2a4a2bb cb1237c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon May 11 00:50:05 2009 -0700

    Merge branch 'darwin'
    
    * darwin:
      darwin: change setup-dev-env script to list the minimal dependencies

commit 2a4a2bb195b3eb2aeab6531388bd160907d90636
Author: David Aguilar <davvid@gmail.com>
Date:   Mon May 11 00:47:35 2009 -0700

    pep8: pepify and add more docstrings to the controllers package
    
    Add missing docstrings to the entire controllers package.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bec3eb4ade537b1500834b47c36ee0fd24083d60
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 19:08:21 2009 -0700

    Makefile: remove references to git-difftool
    
    We no longer install git-difftool so we shouldn't try to
    uninstall it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1eece4e275d8d062ece54c7e084f46395b96f54d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 17:44:51 2009 -0700

    controllers/main: remove the 'staged' parameter from delete_files
    
    The 'staged' parameter was never used, so remove it.
    This also means we can use the callback directly without
    having to wrap it with a lambda.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cb1237ce10738685045ab29b25eb28331841da8c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 15:47:31 2009 -0700

    darwin: change setup-dev-env script to list the minimal dependencies
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c577f70e69af7fab9872aa58982d3e10129d733e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 15:29:34 2009 -0700

    controllers/createbranch: add docstrings and source comments
    
    This adds docstrings and inline comments to the createbranch module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8b6a3543bfa6cb563a0c400044e32b05dade5527
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 15:01:56 2009 -0700

    controllers/compare: use lambda's instead of closures
    
    This eliminates the two gen_* methods by using lambdas
    instead of closures.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0b4df13e90e72926df6edebf648d324ead6209a8
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 14:59:39 2009 -0700

    controllers/compare: add docstrings and source comments
    
    This adds docstrings and inline comments to the compare module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a31ffcae2f6ff020b72480de826c173b6122ec88
Author: David Aguilar <davvid@gmail.com>
Date:   Sun May 10 02:10:08 2009 -0700

    views: raise_() all dialogs
    
    Some of the combo boxes were appearing below the main gui,
    so raise_() them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 220c58529ad97afd855da5d5f3695ffa473566b7
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 8 01:19:14 2009 -0700

    py2app-setup: fix the usage of the powerpc emulation option
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c8d3a23a4be7757c7e4f7287a9963ebce10d8d9e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 8 01:11:38 2009 -0700

    darwin/__boot__: don't chdir to Resources
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9fbe61f952e9ea483d963a4057558084bd721cdc
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 8 00:10:28 2009 -0700

    py2app-setup: use prefer_ppc when building on ppc
    
    This should get our intel tiger mac users up and running.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f2663f82fd4bfd743e70fd77e13fa4b8cc422a4b
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 8 00:03:17 2009 -0700

    build: simplify Makefile further by letting python name the app tarball
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1ccfdb28584ed00778390c5eb62fdcd7f58bc4cf
Author: David Aguilar <davvid@gmail.com>
Date:   Thu May 7 23:37:33 2009 -0700

    Makefile: make 'test' depend on 'all'
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a059ca47b647290c16797d17d6851f2bf50d5f54
Author: David Aguilar <davvid@gmail.com>
Date:   Thu May 7 23:35:21 2009 -0700

    macports-setup: simplify the instructions and make it sudo-compatible
    
    The script now lists the minimum steps needed to bootstrap a cola dev
    environment only.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0c67af6f36475c743190ddb51b76e8d53744a374
Author: David Aguilar <davvid@gmail.com>
Date:   Thu May 7 03:41:20 2009 -0700

    darwin: include system info in the generated app.tar.bz2 files
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 78624f86fa667eb7ac09526e1ae6c610a6c68e6b
Author: Uri Okrent <uokrent@gmail.com>
Date:   Wed May 6 18:56:08 2009 -0700

    inotify: fix a bug when exiting cola
    
    git-cola would hang on Ubuntu systems when pyinotify was installed.
    This fixes it by adding a setter for the GitNotifier.
    
    Signed-off-by: Uri Okrent <uokrent@gmail.com>

commit 45b3a307fab4b0dfceb4354431bddaca632bf897
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 6 02:05:09 2009 -0700

    Makefile: abbreviate the version SHA-1 to 4 characters
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 49c78bc3df5ab5a73854548d959e73aeca80f095
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 6 01:42:55 2009 -0700

    Makefile: add a 'git-cola.app' target
    
    'make git-cola.app' generates both the .app and the .app.tar.bz2
    tarball in one step.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac8426ca90a0edb88a8e68a45fc227220d0cfc52
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 6 00:10:11 2009 -0700

    docs: use 'git-cola' consistently when referring to the script name
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c53acfdc0101aebca69904a949b3195531bc19ed
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 23:57:37 2009 -0700

    INSTALL: update the git-on-windows url to point to msysgit
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bb1a58fefe8b73c345cba12223c616810ffd6eee
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 23:42:04 2009 -0700

    INSTALL: mention using the stable releases
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f19e9e65906e984417c308342025708d9d8b4e13
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 22:19:51 2009 -0700

    documentation: remove git-difftool.txt, update git-cola.txt
    
    git-cola.txt now mentions the environment variables
    for difftool.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0e8e9ccbc408bad051ebcdbfefa7e0cec62dbbfc
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 21:51:10 2009 -0700

    INSTALL: update the urls to point to PyQt, add more clarifications
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6af868a3fcb554e3d41944835c6de840472cc2e3
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 21:36:54 2009 -0700

    darwin: add an iconfile for git-cola.app
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f6605af340d6eca576a18f603e5343794d2ce5ec
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 21:35:48 2009 -0700

    Use SVGs instead of pngs for the main logo
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 55043cece137cbe509806664534d13af44fcd185
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 10:55:35 2009 -0700

    darwin: add scripts for generating git-cola.app for OSX
    
    'make macapp' now generates the git-cola.app OSX
    application bundle.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c615e2d9b4eae17086ac3132088938b9a62de838
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 21:34:23 2009 -0700

    models: do not flag deleted files as modified
    
    This fixes a bug where a deleted file would still appear
    in the modified files list after staging.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 54068edd1fd4194f89f78c9d6a76d63347a0063b
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 02:53:01 2009 -0700

    setup.py: add the private cola.models module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2f2428557e06c3d31e63fd0f3a11d8d97ce34863
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 02:25:30 2009 -0700

    win32 installer: keep a copy of git-cola sans .pyw installed
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 272b961704c687fe1143f57b41ef454caebc0fb4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 01:39:24 2009 -0700

    observable: use the current model's notify value when cloning
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6f5a511665c5438921087130bd2a3e40084709ce
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 5 01:33:04 2009 -0700

    models: fixed a bug in clone()
    
    It was the best of times, it was the worst of times.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b809514eec54dae870b196dc2abe138a18599d0c
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 1 21:29:36 2009 -0700

    drawerwidgets: add and use an add_bottom_drawer(widget) method
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 47210a699b0d5b645efe8463192a831683deb337
Author: David Aguilar <davvid@gmail.com>
Date:   Fri May 1 21:23:36 2009 -0700

    views: move the about dialog into its own module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f417208ba08a6c770984d7681e96c5cb33d20684
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 04:12:09 2009 -0700

    controllers/main: add more comments to the MainController class
    
    All methods now have docstrings and better in-line comments.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 204e95f74eb1675d2d45bb17ae388bc6e5c1a92c
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 03:17:52 2009 -0700

    models: optimize update_status() by only checking for partial staging on staged items
    
    We used to check every modified item to see if it was partially staged.
    It's fast to only check the staged items.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 75fdacf0fe2698dfea85636ad5ce2125830527cd
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 03:16:43 2009 -0700

    controllers/main: allow double-click / icon-click on unmerged items
    
    We were previously guarding users against accidentally clicking on an
    unmerged entry to stage it.  This was confusing
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 92140ea3868b429d0cd2ffd281a1ffc047adc933
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 02:29:06 2009 -0700

    controllers/util: remove an unused import
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 66cf4644f1a3fdde518b8182e244b147c047bbeb
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 02:16:39 2009 -0700

    bookmarks controllers: add comments to save_bookmark()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 64c8aee39a63b0d6d9a6a386251c2a2caad275eb
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 30 02:03:50 2009 -0700

    refactor the cola package namespace
    
    The models, views and controllers packages were doing too much in module __init__.
    This simplifies things by doing nothing in __init__ and using the fully-qualified
    package in the callers.
    
    This adds a cola.models package that didn't exist before.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 98f2bb2dc70fb37d5d4ed3ac80935eb4cc97cb33
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 25 20:15:18 2009 -0700

    Makefile: cleanup the install target, use rmdir -p
    
    It'd be good to move more of this into setup.py.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f64efd389a8a5eabea09a8de24dfad7e7e82a31f
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 25 19:46:41 2009 -0700

    tests: add test cases for the cola.settings module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cbcb8f20c6e71d9dd73af245e873585fba655dd4
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 25 15:24:35 2009 -0700

    Makefile: do not rm -rf $(prefix)/lib
    
    'make install' shouldn't delete the lib/ directory.
    That was a bad mistake.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bbfa0d8e7d486c27cab3d11c24ca00f89a4fa318
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 23:23:53 2009 -0700

    test: add a .gitignore to test/tmp
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9ba037aafb3683a740650396e307dee725ead85b
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 19:34:21 2009 -0700

    Save the splitter dimensions too ;)
    
    This adds the ability to save the splitter sizes on startup/shutdown
    by removing responsibility from the models.  We now use a SettingManager
    singleton to provide an api for arbitrary data saving.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e524af1577d09a9f0bab44dbd7ce556d08be87ae
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 19:20:17 2009 -0700

    settings: add a SettingsManager singleton
    
    The SettingsManager class provides an interface for view
    de/serialization.  We'll use this to handle saving gui settings.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d1075652b91ff317a35372c9f7e5e24e398d94c6
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 19:14:58 2009 -0700

    views: add import/export state methods
    
    This adds export_state() and import_state() methods to the
    StandardView class.  Subclasses extend this method to
    handle custom view data.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e586e74b81f61fe4e9a0bb1d14a04abbf602c74e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 19:12:51 2009 -0700

    cola.model: don't derive from observable
    
    cola.model.Model no longer derives from Observable.
    Instead, classes that need subject/observer behavior use
    the observable.Observable mixin.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 912dbff081b2592efce902541d2de2e1fa91ac54
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 18:59:44 2009 -0700

    git-cola: unconditionally add the bin/ dir to our path
    
    git-cola might not be in our path, so guard against it by placing
    cola's bin/ directory in the path.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e985be1c0ce4e6491b93892adde0015e8dbf412e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 16:21:57 2009 -0700

    diff/review mode: decorate the window title when in review or diff mode
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e3004eecab8aee2046c72575042da6d8b739e25a
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 16:11:40 2009 -0700

    diff/review mode: always use the staged icon and hide modified/untracked items
    
    When reviewing or diffing a branch we should only see things that have been committed
    over there.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 455f394f0dc138e76b0e770995f29d8305e5d7df
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 24 03:58:18 2009 -0700

    ui: add a Branch->Review action for reviewing in-progress branches
    
    Branch->Review compares a branch against its common ancestor
    with the current branch.  This basically shows you what's
    in a branch and lets you run difftool on it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0f25ad250b736a25349f2466ae892ea0421e9e99
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 22 16:02:09 2009 -0700

    remote: select the current branch by default for 'push'
    
    'git push' now requires both the remote and branch to be specified when pushing,
    so select the current branch by default since that is the typical use case.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 673da3cd3cd86de7e1f9bacd69723cbb16ed9df4
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 22 16:00:44 2009 -0700

    remotes: always show the status output when doing fetch/push/pull
    
    We now force the status to '1' so that the log display is presented for all
    remote operations.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 33a2f171e4743cf9f097da6dfff81089393a06f2
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 23:32:57 2009 -0700

    ui: add a branch->diff menu action to compare against arbitrary revisions
    
    Branch->Diff lets you compare changes against arbitrary commits, tags, branches, etc.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 421077fafbff75e1c8d512b051a69775664ee2d0
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 21 02:41:00 2009 -0700

    setup.py: fix a bug when generating .qm files
    
    We were double-adding the .qm extension.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 75346cde7504efce1e43a86d67d432ace246df3e
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 21 01:23:19 2009 -0700

    Install all cola resources into /usr/share/git-cola
    
    Debian bug #519972 suggested installing all items into
    /usr/share/git-cola/* instead of /usr/share/cola.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2539c3c1133b7e4a4b6001eb4e82a8dde6dd262f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:56:47 2009 -0700

    win32: update the create-installer script for the new directory layout
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 95f5eedcafc9522b29bf58e5af1e66fd8f3ea585
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:46:05 2009 -0700

    Makefile: make the 'install' target more quiet
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d08e92e13b28902e991d64f74a9353d055681261
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:36:12 2009 -0700

    difftool: sync up with the last git version of difftool
    
    We keep git-difftool around for compatibility purposes only.
    This pulls in vimdiff fixes and support for diffuse.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 819aacc970cd526099f4a69b47b8f41623dd42e7
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:27:23 2009 -0700

    win32: remove a superfluous 'find' command in create-installer.sh
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e492cd9eb1c1c0a7e696bf13a3359a384e404bba (tag: refs/tags/v1.3.7)
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:15:00 2009 -0700

    qobserver: fix a misspelled QComboBox
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6f6f0a1ae16bdbf99f94322ef512fdf920d62260
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:07:17 2009 -0700

    qtutils: use QApplication.instance() instead of QtGui.qApp
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f5fed2db85b3c586e187ef39bfd84e10ee2db47f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 01:06:39 2009 -0700

    inotify: terminate the GitNotifier on shutdown
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8eb79783760b71220c00e92b135b8bc7b9ee86a3
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 20 00:37:30 2009 -0700

    utils: make fork() take a list instead of a *args parameter
    
    This makes things clearer by using a list as an argument
    to utils.fork().  This also centralizes the difftool invocations
    in the cola.difftool module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8a4a318f13b699be947e03b93da77021e1008310
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 19 13:54:47 2009 -0700

    Use a private module dir for cola's libraries
    
    This fixes debian bug #519972:
            git-cola: should use private module dirs.
    
    All of the cola modules are now installed into $prefix/share/cola/lib.
    The private versions of jsonpickle and simplejson were moved up
    a level in the source tree and synced with upstream since they are now
    installed into $prefix/share/cola/lib as well.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1818d777f952f022b5cee2f9bacccc5ce5d9c2ee
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 19 13:55:05 2009 -0700

    tests: create all temporary directories underneath test/tmp
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 52faaf1f00a54c822bbc297c3e04db45f248f3e9
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 19 21:41:54 2009 -0700

    app: make ColaApplication test-friendly by using less derivation
    
    ColaApplication no longer inherits from QApplication.  It now
    contains either a QApplication or QCoreApplication based on the value
    of the gui=<bool> construction option.
    
    Consequently, this makes tests work without a gui =)
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a18b9476eb945945df68043e26e3973b5fd14476
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 19 00:00:47 2009 -0700

    version: remove the get_version() docstring
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit aea38354d04b7e5307c0fca794534f718ec39f78
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 18 23:56:44 2009 -0700

    difftool: only install git-difftool on older versions of git
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6575874d3bc888ace9bbc9400cd631a7495f403f
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 18 23:35:03 2009 -0700

    version: add a get_version() function to replace version.version
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 90546dea02667eec6252948e75a73ee9ef264279
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 18 23:57:32 2009 -0700

    Add a ColaError base exception class
    
    ColaError is now the base of all cola exceptions.
    
    We don't really use exceptions much at the moment, but it's there
    for future use.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e8feffb418af49bb19630fe4cee7b03ddf884b87
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 04:01:44 2009 -0700

    observable: add more source comments
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 32cf8cefb08554da3e1b705fc8818e76675ab34c
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 03:49:05 2009 -0700

    qobserver: minimize imports and avoid double-underscores
    
    This lessens namespace pollution and makes the code more obvious.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ee3fab5ce21fd35855f0a2aaf1f532b5028e4b40
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 03:46:47 2009 -0700

    resources: add more source comments
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dd43457a4dba1199b12054322c1d1dc61190977f
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 03:46:23 2009 -0700

    observer: remove the unused set_debug() method
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 11e80f85609d18c3098bbbaed4e410062be067cf
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 03:14:32 2009 -0700

    settings: add comments to the SettingsModel
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit febf7a6a8907971c5c3fcee3d9aa0ff4cb5800db
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 02:37:37 2009 -0700

    models: use core.write_nointr and other trivial fixups
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 37e39e1a4e19f7d0cf8080c8f355d5db51ca082c
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 17 02:26:19 2009 -0700

    ui: simplify the search and branch menus
    
    Less is more.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bcb28c1900c93400a5ba1797c0521d8fee3c30aa
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 16 02:02:17 2009 -0700

    model: add more comments and minimize the number of imports
    
    We now import just the 'types' module instead of importing
    lots of individual items out of it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f01269d901751bedd3c8d83669073950c84a6212
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 16 02:01:30 2009 -0700

    main: add more comments to the cola.main module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c94801d672ee30ca4bae8831777d609cb4ff559f
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 15 22:26:12 2009 -0700

    tests: add deadlock and interrupted system call tests
    
    This adds tests to ensure that the git.Git command object
    never deadlocks and properly handles interrupted system calls.
    
    This also does away with the stdout/stderr.py fixtures
    since the code is now contained within each test.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2be4692a8536b173f0cee78c20cca254e1a66f0f
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 14 00:20:48 2009 -0700

    PEP-8: cleanup docstrings and methods in the tests
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7cf78db43e4d3ae6e244434d5a5819db73bd86ca
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 15 22:25:23 2009 -0700

    git: remove the deprecated with_extended_output option
    
    with_extended_output has been replaced by with_status.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3a16abf80d53cb6941a5db25a90b7bf9de51b5aa
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 30 09:42:22 2009 -0700

    difftool: add support for a difftool.prompt config variable
    
    difftool now supports difftool.prompt so that users do not have to
    pass --no-prompt or hit enter each time a diff tool is launched.
    The --prompt flag overrides the configuration variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ee2af7186d24e3cd7bcc6c62c147b967db4e54b0
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 24 23:29:59 2009 -0700

    difftool: add a -y shortcut for --no-prompt
    
    This is another consistency cleanup to make git-difftool's options
    match git-mergetool.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 505144bb8c7f71f3db799d5983778f34bf46ab96
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 24 23:13:53 2009 -0700

    difftool: use perl built-ins when testing for msys
    
    I don't even know what $COMSPEC means so let's be safe and use the
    same perly $^O test add--interactive uses.  While we're at it, make
    git-difftool match the prevalent git-perl style.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7fd60f3b6455f5474e93bcb39ff63c0dc455a0f8
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 11:13:01 2009 -0500

    build: cleanup Makefile/setup.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 33e7100411b19a3161548550756a0b24cd644661
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 08:44:58 2009 -0500

    tests: improve the test_cola_model test cases
    
    test_cola_model now uses its own local model for testing
    so that we don't have to maintain one in the test/helper module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d3cd74d331f23d7f654aff57da500a7280e85c95
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 08:35:14 2009 -0500

    core: add a wait_nointr() function and use {read,wait}_nointr() in cola.git
    
    cola.git's execute() method now uses {read,wait}_nointr() to handle the
    "interrupted system call" problem.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0452fe48cfe19f85c20303d02a3077efdbd08a6e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 02:52:08 2009 -0500

    refactor: change various modules to use core.{read,write}_nointr
    
    OSX and other systems can interrupt us in the middle of a system call so
    wrap all read/write calls with an automatic retry loop.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 19964a0ec15fa30c179f6744ed653739735af9b6
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 02:49:00 2009 -0500

    core: add read/write_nointr helper functions
    
    read/write_nointr automatically retries interrupted system calls.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4b12880b731c923fd9d78d679f7e7a3126ce395b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 02:00:24 2009 -0500

    git: catch OSError in addition to IOError in the execute() method
    
    Popen.wait() can throw OSError errno.EINTR, so catch it and retry the syscall.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d04e6d5a0556bb807572dda13ed3c7348f0d8a87
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 01:58:57 2009 -0500

    app: move ColaApplication into its own 'app' module and test it
    
    This refactors things so that ColaApplication lives in the cola.app module.
    i18n is tested by the test_cola_app test script.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3ab6e07b34157453f376b6e829b07d8d3376c6ff
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 01:57:14 2009 -0500

    resources: add a 'resources' module for finding cola resource files
    
    resources.path() returns paths relative to the cola installation root.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 32d9fdb1a9006ae84644933aaa9b07e8266d0d82
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 29 00:10:55 2009 -0500

    inotify: add more source comments and cleanup the code
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 824e751168dccbaeec4e91fd03d8a891fbf32347
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 17:26:42 2009 -0500

    tests: add better comments to the test_cola_git test
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 195561970f45475021fb966030e6f072417bbf87
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 17:06:32 2009 -0500

    tests: add tests for the cola.core module
    
    These test the unicode encode/decode functions in the cola.core module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 67d2f3ddaab38ee366ec11ce0c414f46300b1881
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 17:05:38 2009 -0500

    Makefile: update 'test' target and add a 'coverage' target
    
    The test target no longer adds build/lib to PYTHONPATH.
    The 'coverage' target runs nose's coverage plugin.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c8c3262219826f8a360856c82f6348b0cb4638bd
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 16:47:59 2009 -0500

    tests: renamed tests to match the prevalent Python coding style
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 35aaf18c213b6e5299adf546f9fb66fe62d3f7fd
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 16:20:32 2009 -0500

    cola: allow Ctrl-C to exit cola from the command-line
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 70614f887c6747588692265c366becb0415cb204
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 16:19:38 2009 -0500

    git: handle interrupted system calls on OSX
    
    OSX will actually interrupt creationg of subprocess.Popen objects so catch
    the OSError and retry.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8980d9cb98345c9f7a2947420fe064570301ce8f
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 16:18:47 2009 -0500

    inotify: make the inotify module import-safe
    
    The tests were failing on OSX because inotify wasn't import-safe.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dfe07d51c92f872a35c73590ae76f212324728b9
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 28 16:20:12 2009 -0500

    options: fix unicode bugs in the option dialog
    
    Font names with non-ascii characters were crashing cola.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 787e46ea1d100f86e695fdcc0780db8624b08b6c
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 26 03:07:09 2009 -0700

    remotes: warn when non-ffwd is used for push and pull
    
    cola could be destructive when using push/pull w/out fast-forward-only
    so issue more warnings.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f4b8e0479f5b0bc0fd6921dd41c81f36f302c553
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 26 03:05:31 2009 -0700

    models: pass the remote/local branch to fetch/push/pull when specified
    
    We're going to hide local branches in the pull dialog (so that pulling
    can only happen on the current branch) so prepare the model for the new
    caller.  This improves the usability of fetch/push as well.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a3962781da4384c80c8c8fe7b9bc0d4ee884a1d0
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 26 03:02:06 2009 -0700

    views/remote: hide appropriate controls when in specific fetch/push/pull modes
    
    This makes the remote gui automatically hide controls based on its mode.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a138c60dc55f59e56ace3498074226ae78df3a4d
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 26 03:00:06 2009 -0700

    ui/remote: name the local/remote branch labels
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a3a86efe2db2ad029fdbfbacac24abde716f00fe (tag: refs/tags/v1.3.6)
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 19 01:44:10 2009 -0700

    ui: simplify the log display by removing the search functionality
    
    This makes things the interface simpler by removing the rarely-used
    search feature in the cola log gui.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7f714dc6b22ff4997ddbf1ab878e4eae0d107107
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 18 03:57:04 2009 -0700

    logging: add support for the cola.showoutput configuration variable
    
    This makes it so that the log window honors cola.showoutput.
    
        never = never show output
        always = always show the output
        errors = only show output on errors (default)
    
    This was done by centralizing logging logic in qtutils.log() and adding
    a model.should_display_log(status) method.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e99440d6457809b03394099dd37c3ee579507c4d
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 18 03:53:28 2009 -0700

    ui: removed the status bar and cleaned out some dead code
    
    The status bar isn't very useful now that the right-hand tree widget
    succinctly displays a file's status, so remove it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 312a5a416a499911d05e599607d7ccaae8616187
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 14 03:49:41 2009 -0700

    gui: improve logging by adding drawers to the main window
    
    The log window is now a drawer positioned at the bottom of the
    main window.  This does away with the dreaded log window.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2d7934c68cbfe78a3bef97107975c4581f061214
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 18 00:40:45 2009 -0700

    refactor: move log, options, and select commits into separate controllers
    
    This makes the util controller more lightweight separating out the
    logger, options, and select_commits functionality into separate
    controllers.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 362cc1b8f5f557e62d9fe9b844a6accecc859f8a
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 18 00:38:59 2009 -0700

    qtutils: minimize the number of imports
    
    We now access QtGui classes through the QtGui module so that
    we import less and are more explicit about our module
    dependencies at the call sites.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 308e1d443d206db4d5cbde5a6e94f77dd78cd988
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Mar 19 01:48:41 2009 -0700

    refactor: avoid importing encode and decode directly
    
    This changes call sites so that they always use core.encode/decode
    instead of importing those functions directly.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e02484f060b4ff112e64a51836c14661eec28c9d
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 17 22:00:44 2009 -0700

    json: run dos2unix on cola's pickle module
    
    This keeps jsonpickle consistent with the rest of cola.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 61cff60a6970afbed3c3cd3922303b18edb891a8
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 17 01:03:41 2009 -0700

    json: make cola's pickle module exception-safe
    
    cola.jsonpickle wasn't exception-safe and was breaking
    help('modules').
    
    This fixes Debian bug #519971.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fe010d0e298d2e6f989d5fabeffbb4712d41bf4c
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Mar 13 02:21:52 2009 -0700

    controllers: warn users when amending a published commit
    
    This makes cola more user-friendly by warning users when
    rewriting published history.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7f28c9e2fc486587497f57b6b34e7a8f33dadea7
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Mar 13 02:20:42 2009 -0700

    models: add is_commit_published()
    
    This allows us to check whether our HEAD has already been
    published.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e093aacaf5e450155260988d066cbc6f1652e1d8
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Mar 13 02:19:57 2009 -0700

    models: add get_local_config() and use it when reading gui.diffcontext
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9b212f95da8a2d9c7bcb3bfba93d5716206f8a02
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Mar 13 02:17:15 2009 -0700

    models/get_global_config(): add support for default values
    
    We now use get_param() so that we can pass default values to
    the get_global_config().  load_commitmsg_template() was updated
    accordingly.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 23000b5a1e9d0455c139b1c72c0d0bb2fcc5ae6b
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Mar 13 02:12:52 2009 -0700

    models/current_branch(): catch stderr and return '' for detached HEADs
    
    We now return the empty string when our head is detached in
    current_branch().  This also improves detached head usability
    by capturing the stderr message that was being printed to the
    console at startup.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5a1a08536095dcd836030b563e087f16adf5c6b4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Feb 24 01:31:46 2009 -0800

    difftool: sync with the proposed git.git patch
    
    This updates the documentation to match the proposed git.git patch.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 96f6064bd74932f1ed76d058c38d51893c47436b
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Feb 24 01:30:15 2009 -0800

    difftool: use "wincmd l" when launching vimdiff
    
    Oops, this must have been dropped when syncing with the git.git version.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bde4e51eec80da5fe7d53984ad622711df62a8a3
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Feb 24 00:52:01 2009 -0800

    difftool: fix a bug when reading $GIT_MERGE_TOOL
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e5e325ba95443091f7e29fe188d30ab5d1f801e6
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Feb 24 00:16:58 2009 -0800

    difftool: use the old variable names for inclusion in git.git
    
    We should probably keep LOCAL/REMOTE since that's consistent with
    the rest of git.  This also adds fallbacks for the old mergetool
    variables for user convenience.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d3c0823b21645be9c92477d41f3d01e22c7e5ae7
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 23 21:32:38 2009 -0800

    stash: add a keep_index checkbox to allow 'git stash save --keep-index'
    
    This adds a keep_index checkbox to the stash dialog so that
    users can save stashes and and keep the index state.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c0ff00490583b53aa2aff160294613f5386078d6
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 23 21:31:02 2009 -0800

    stash: add docstrings to the stash controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit eaa7bb0f183f60c00ce4a2a7dab04fe41c06e656
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 23 20:55:58 2009 -0800

    cleanup: remove shebang lines from cola modules
    
    Fedora reported that non-executable python modules should
    not have shebang lines:
    
    https://bugzilla.redhat.com/show_bug.cgi?id=461483
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d7be10284b883fe8fc8f46cfa2a2999eaffe1b5c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 23 02:46:16 2009 -0800

    cola: add support for diff.tool
    
    Now that difftool uses diff.tool instead of merge.tool
    we teach cola to use merge.tool.
    
    This also removes all usage of the --tool=<tool> parameter
    to git-mergetool and git-difftool since the assumption is
    that users will use the appropriate diff/merge.tool config variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d18bcadddfcfd04683101ad069f6d1d50385932c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 23 02:25:04 2009 -0800

    difftool: use a different config namespace then git-mergetool
    
    Users might want to have different settings for merging and
    diffing, so difftool should use its own config variables
    for setting defaults.  We now use the difftool.* config names
    instead of mergetool.*.
    
    We still fallback to merge.tool to make it easier on users
    who haven't yet defined the new diff.tool config variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c1e464be6df138f46ccc95c2db75b009d20fd14c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Feb 11 04:19:52 2009 -0800

    models: detect modifications in newly-added files
    
    This teaches cola to detect the case where an untracked file is added
    and then modified prior to commit.
    
    cola now displays the path as both staged and modified, which matches
    git status.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0e66ab17888d7dd6d6ac463b44a780ec8b1520a6
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:26:00 2009 -0800

    INSTALL: don't mention simplejson since it's a cola built-in
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8c7b88ae60683ace73d20358c13270bf5b397d08
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:21:19 2009 -0800

    models: refactor the model api
    
    This makes things "more pythonic" by removing the create()
    method.  We let jsonpickle handle serialization stuff so that
    the model has to know less about how to translate python
    objects into dictionaries.
    
    The next thing to do is factor out the common git properties
    and subclass models.Model for different controllers:
    	models.search, models.compare, etc.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bac0eba54436fc6d2460b8db8e016d5d20e1f278
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:15:13 2009 -0800

    controllers: refactor the init() method out of the controllers api
    
    We no longer use the init() stuff so subclasses just override __init__ now.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 504012ac092ccb43d556174b9293c7ab2a22b4cf
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:08:11 2009 -0800

    views: simplify the views api
    
    This removes the init() methods in the view internals and makes
    things look a bit more pythonic style-wise.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 64b728ffcfbc4a1ca542e3c8d510d6db01228754
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:06:40 2009 -0800

    syntax: refactor the api to be more pythonic
    
    We're removing all of the funny init() methods since they just made
    things not-simple-enough.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 35df8357b4245d0384c71307f264d39b324e46fa
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:04:37 2009 -0800

    tests: lesson the buffer sizes in the test_git tests
    
    We probably only need to be bigger than PAGE_SIZE so to catch
    deadlock so set our buffers to PAGE_SIZE * 2
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ee535439391e42a0176caef3779f1118a4750e45
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:00:42 2009 -0800

    tests: refactor tests to use a single helper.py file
    
    Renaming moving testlib into helper stopped nose from trying to execute
    testlib as a test itself.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 63a317d948ee7448d13df723dfafac333a1c9d4b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 19:09:00 2009 -0800

    settings: remove the import checks in the settings module
    
    Now that json is built-in we don't have to check whether or not we
    have them available.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c9c595eb2a0522d0cc8180e9036ae6c23cca0e78
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 18:54:17 2009 -0800

    cola: add json and jsonpickle to make things easier on our users
    
    This'll make installation easier for users and allow us to remove
    more dependencies.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit def8023acee9ab921c9ec7e504b9d18d04941319
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 17:46:49 2009 -0800

    inotify: refactor inotify to simplify its pyinotify usage
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2e6a42623b7c558d6e2228948f231843fae46f7e
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 17:23:46 2009 -0800

    controllers: use absolute imports for better portability
    
    PEP-8 recommends using absolute imports to improve portability with
    older versions of Python.  Relative imports can also be ambiguous
    so don't use them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 71d24ba1d977b981aa0c95607433282e17af28ee
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 16:05:07 2009 -0800

    controllers/remote: select 'origin' by default if it's available
    
    We used to select blindly select the first remote.
    We now default to 'origin' if it exists and fallback to the
    first remote otherwise.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5a5658ce82186b3a4c3eb6dfcc729c741c072f49
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 15:58:09 2009 -0800

    Makefile: run nose with more verbosity, doctests, and test ids
    
    This makes it easier to see what's going on when running 'make test'.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 44691c5f8ad14fa4aead9b04c433ab61ca3831dc
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 15:56:26 2009 -0800

    ui/options: use a colspan in the diff context
    
    The local repository options had text fields that were too small because
    the diff context field wasn't using a colspan.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a4d96a1cba09ad8cf2371e418620c6b3ff2fc9f0
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Feb 7 15:54:21 2009 -0800

    compare: hide the file list when comparing a single file
    
    When showing history for a single file then there's no need to
    show the file list in the compare view.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5ef3b3179e9ef4ef2ec33a88032c40831494aeb6
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jan 31 12:27:56 2009 -0800

    difftool: Don't repeat merge tool candidates
    
    git difftool listed some candidates for mergetools twice, depending on
    the environment.
    
    This slightly changes the behavior when both KDE_FULL_SESSION and
    GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case
    meld is used in favor of kdiff3 (the old code favored kdiff3 in such a
    case), but it should not matter in practice.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 31da27aeb74f58b62ff93014f0c28f304cad2849
Author: Markus Heidelberg <markus.heidelberg@web.de>
Date:   Sat Jan 31 00:19:29 2009 +0100

    difftool: add support for Kompare
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Acked-by: David Aguilar <davvid@gmail.com>

commit 891858716deed8afe772c002ee1be899f4b596d5
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jan 31 01:40:08 2009 -0800

    controllers: move all of module __init__ into main in prep for refactoring
    
    We'll be doing some big changes soon, so get everything out of __init__
    because we really shouldn't be doing much in there at all.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a240d5724470f0f2ff7712b051cc18323d011db1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jan 31 01:38:39 2009 -0800

    bin/git-cola: add build/lib/cola to sys.path to find builtin_version.py
    
    Without this we get vuknown-version when running cola out of its source tree.
    
    Reported-by: Mechazawa <zedside@gmail.com>
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a5cf5183ce913b07bb8933535bd329c274be8871
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 30 21:36:10 2009 -0800

    cola/version: capture stderr to avoid printing bogus errors to the shell
    
    We weren't capturing stderr which meant that cola was printing
    	fatal: could not describe <sha1>
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 19b7e9ad9bdbf6dd945c91429beb3c717cf15656
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 27 15:02:03 2009 -0800

    ui: set the point size to '6' for the cola 'about' dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 842e96e2ede4e73f447c0eff4f5959ba4a526e0a
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 26 04:03:32 2009 -0800

    INSTALL: mention the Windows installer
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 77072775ca69613f2229b4fb6ee87be850093033
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 26 00:20:48 2009 -0800

    cola.desktop: add 'RevisionControl' to cola's registered categories
    
    This is in compliance with:
    http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
    
    Reported-by: shaforostoff <shaforostoff@kde.ru>
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e07e073b7111a63721d449fbae717202382b8900
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 26 00:14:16 2009 -0800

    win32: add a binary installer for Windows
    
    We can now create binary installers for Windows.
    create-installer.sh drives InnoSetup and generates Cola-$VERSION.exe.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6aacd26e5fae0e346aeb28e2fb6d1956ff63d94b
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 11:40:14 2008 -0800

    main: add support for '--git-path=<path>'
    
    Launching cola from Windows ends up with an environment where 'git.exe'
    is not in the $PATH.  The Windows installer will supply --git-path
    which solves this issue.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8349bcdaf530b8988e873dd58f47df284c0b6aeb
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 25 21:40:37 2009 -0800

    win32/cola: update to support the Windows installer
    
    The 'dirname' function did not properly handle paths with
    embedded spaces.  Also, Windows uses git-cola.pyw instead
    of the default git-cola startup script.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 906c079524c0cfb7a9c2fdef88b1b01952ff5bcd
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 25 16:27:24 2009 -0800

    git-cola: add support for the win32 installation layout
    
    Windows uses a slightly modified installation layout that does
    not include the 'python2.x' directory in its site-packages path.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e2657c59adcf51bb12d1e9566e6c3b341acaee03 (tag: refs/tags/v1.3.5)
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 19 19:09:46 2009 -0800

    git-difftool: update difftool documentation to include some packaging notes
    
    difftool is now available in cola.git and git.git.
    Mention this and recommend usage of the version from git.git.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c6b12a1442b0b0e79580bbe8391bb2e51b720b96
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 19 19:07:02 2009 -0800

    difftool: change trap condition from SIGINT to INT
    
    Markus Heidelberg provided this patch against git.git's
    contrib/difftool.
    
    In 'man 1p trap' there is written:
    
       "The condition can be EXIT, 0 (equivalent to EXIT), or a signal
        specified using a symbolic name, without the SIG prefix, [...]"
    
       "Implementations may permit names with the SIG prefix or ignore case
        in signal names as an extension."
    
    So now we do it the POSIX compliant way instead of using an extension.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fc805e5dd33dd4f9d43837981f09049d60e761f5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 18 16:52:05 2009 -0800

    git-difftool: incorporate suggestions from the git mailing list
    
    Markus Heidelberg has a number of stylistic improvements to the
    difftool documentation and comments.  This also adds usage of the
    vim "wincmd" command for positioning the cursor at startup.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e7a80fee4304ba25c06dd1b1527c5373b2f7a914
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 03:34:30 2008 -0800

    windows: make clone and open work reliably on windows
    
    os.spawnv is a nasty beast in windows-land.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 44ed8ab3bf526873e19704a296fcf06687cc288f
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 03:32:41 2008 -0800

    win32/cola: add Python's path to $PATH
    
    This lets us easily launch python scripts.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c5b0ecd991d7f2ab33e8e2025908e6d27aaccbcd
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jan 17 02:49:58 2009 -0800

    cola: use the new with_stderr flag throughout cola
    
    We now grab stderr only when we really need to do so.
    Places that care about stderr but not about the return status
    no longer need to grab it into a throw-away variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5d437b618beec020340a78a645e70af1fd6732d9
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jan 17 02:48:39 2009 -0800

    git: add a with_stderr option to control whether or not we get stderr
    
    The git command module will only include stderr when the with_stderr
    option is set to True.  This separates with_extended_output and with_stderr
    so that they do not have overlapping duties.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9a1f2a7fa64c54c293fb73605b164bd311ad85fb
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 16 18:12:56 2009 -0800

    models: simplify the model worktree status routine
    
    We no longer post-process the status data to remove unmerged
    items from the modified files list -- this is done up front
    when unmerged entries are first found.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 73ecfad6264d33abdb59bf5e9e71fc885abada54
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 16 21:05:13 2009 -0800

    tests: skip serialization tests when simplejson is not available
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dc7d7b0edf21dd4c286f0903f7f4dc66076def29
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 16 21:04:57 2009 -0800

    model: simplify the deserializer by using __import__()
    
    We were using the 'imp' module to for loading modules.
    Using __import__() is simpler and more robust.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 166b38543b9a6005de7a2f3b2f5647941fb19ebb
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 16 18:10:32 2009 -0800

    git: change with_extended_output to only return status, output
    
    The stderr+stdout handling in the git module was broken because it
    could deadlock on older versions of Python.  All of the complication
    came from trying to handle both stderr and stdout in the same
    function.  We now pass stderr=subprocess.STDOUT to subprocess.Popen
    so that things become much simpler.  We only include stderr when
    with_extended_output=True, otherwise we ignore it.
    
    This fixes deadlocks on older Pythons and on Mac OSX.
    It also seems to speed things up a bit on Linux, which is a plus.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d1d3b93da32c7761f6a21ab663da458ef5bf1ac4
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 16 18:08:18 2009 -0800

    tests: simplify the import test by using __import__()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 369ae9fbc35880f6e7e061c87dbd4632801996e5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 15 21:51:31 2009 -0800

    inotify: add support for pyinotify 0.8.x
    
    The pyinotify API changed between 0.7.x and 0.8.x.
    The cola.inotify module now works with both 0.8.x and as 0.7.x.
    
    We do accomplish this by checking pyinotify.__version__ at runtime
    to determine which API to use.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 761ede3ce3ea3e1bc3d5c8cf1dfc66043d6f3a3c
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 00:34:08 2008 -0800

    git-difftool: simplify the windows exe() handling
    
    Windows doesn't need the full path to git.exe.
    We just need to exec "git.exe" instead of "git".
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 37a01c137271d001cd71b486f05be4c412331b22
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 00:27:21 2008 -0800

    win32: update the 'cola' script so that it passes "$@"
    
    We were losing command-line args when run through the 'cola'
    windows wrapper script.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 273be078708beac8d77dfb101b38a6a3faaa229b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 29 23:51:36 2008 -0800

    git-difftool: add portability code for Windows
    
    git-difftool now works on Windows.
    The GIT_EXTERNAL_DIFF rewrite broke Windows.
    This makes things happy again.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 789cdd388feba59a4b11c7a3b15137ec49078d11
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 15 11:34:06 2009 -0800

    git: fix a deadlock on python2.4
    
    Python 2.4's subprocess.Popen requires that you read from stderr before
    reading stdout.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 540bb69c6511071d436c1281fcfad7e710ed8437
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 9 02:38:31 2009 -0800

    ui: add a 'Help->About' menu action
    
    The 'About' dialog lists the cola license and version.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 35e9fb7e8f40f5efa14913a0a6badd79672a1451
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 9 02:28:14 2009 -0800

    Makefile: handle the case where the 'cola' symlink already exists
    
    We should ignore the 'cola' symlink if it already exists.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2459017e155efcff43a79668772e8aaa35db23f4
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 8 22:06:28 2009 -0800

    docs: update the 'git difftool' documentation
    
    'git difftool' is much more powerful (and simpler) now,
    so update the documentation accordingly.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8cfbdc740a2353142c60e42435b03704ae26d39a
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 7 02:45:42 2009 -0800

    search: show author and date in the summary line
    
    The default 'git log' format was updated so that the author
    and date are part of the summary format.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3c3a08081b8c501d2f7fb537618bb5cbea74b055
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 7 00:22:54 2009 -0800

    git-difftool: simplify the code slightly
    
    Some unnecessary temporary variables and control blocks
    were removed.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b272078cf6cbe8fb2ef67994b6f00fc7f0f1988c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 7 00:58:32 2009 -0800

    ui: clean up the options dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 80f22bf71f43f03a3efcb9ddbab8731b5902f4d9
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 6 01:32:39 2009 -0800

    options: add a cola.tabwidth configuration field
    
    Users can now specify their own tab width in the options dialog.
    The setting corresponds to the cola.tabwidth git configuration variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 30a6c67d05e11adec58aa355f436cda9b1264f77
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 5 22:43:09 2009 -0800

    stash: use --index when applying stashes
    
    git stash apply --index preserves the index so we should use it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ae43deba349e85e5d13c3dc1e78121e4a20085fa
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 5 22:40:22 2009 -0800

    ui: add a stash button to the main ui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bd0f10bd4ed14b5afd05d857cf482c12e0291847
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 5 22:35:37 2009 -0800

    usability: reinstate the rescan button
    
    This brings back the old rescan button.  We hide the button whenever
    inotify is available since rescan is automatic on linux.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 95dec436a8704a13c9ba3a6afed8c78435494fb7
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 5 19:27:26 2009 -0800

    doc: update git links to point to github
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit aed58632e73b36b6f463b8378c7366e768e9fd2d
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 2 09:44:01 2009 -0800

    git-difftool: take advantage of GIT_EXTERNAL_DIFF
    
    By using GIT_EXTERNAL_DIFF we can make git-difftool support any
    option supported by 'git diff'.  This makes git-difftool much more
    useful since it can now handle any type of diff,
    e.g. worktree vs. index, worktree vs. commit, commit vs. commit, etc.
    
    'git-difftool-helper' is invoked by git and handles all of the
    git configuration and merge tool finding logic.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9cde7c554b366bd3decbe12aacbda917ca3619b4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 30 14:40:35 2008 -0800

    git-cola: add 'prefix' to the sys.path
    
    We lost the ability to launch git-cola from its source tree when we
    fixed things up for Windows.  It would work if you were sitting in
    the cola source tree, but not if your current directory was somewhere
    else.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7715361133d7640cbd7d29d926a9e992e9eca56c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 29 15:51:58 2008 -0800

    .mailmap: add /me to the mailmap
    
    I had a bad user.name configuration at one point in time, so add
    a .mailmap entry to fix it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 38be16d8bbd41d416555bc52e4b54e588baf95fe
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 27 01:08:32 2008 -0800

    win32: vastly simplify the installation procedure for Windows
    
    We now automatically install the bin/cola win32 wrapper script.
    This is now the only recommended way to run cola.  Installing
    cola on Windows is now no more difficult then unzipping a tarball
    and running the 'cola' shell script.
    
    The 'cola' wrapper script is now smarter in that it checks for
    both Python2.5 and Python2.6, thus cola can now run with either
    version.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 43d9101681a844312d9faddf4bba611fed74bd40
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 27 00:41:00 2008 -0800

    win32: make gitk launch properly on win32
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 52a0d1fd074929967f21241a36e87dd79ddb6006
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 20:05:16 2008 -0800

    views: remove the log icon and its toolbar
    
    It doesn't make sense to have a toolbar until we have more buttons
    in there.  The 'View Log' functionality was moved to the 'File' menu.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5735f747f7a024e2a8e285be64582f8a04f3e4ab
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 19:29:52 2008 -0800

    ui: re-save all .ui files using Qt 4.4.2
    
    This updates all of the property definitions to the latest
    schema.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 44a508004d5c41a6924aa996613c11caee23e708
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 19:23:48 2008 -0800

    views: remove exec_ calls so that all dialogs are non-modal
    
    Calling exec_ makes it so that the parent window cannot be
    raised above the child window.  This removes all exec()
    calls to prevent this.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5cbaed0f649f6daf120bd56ffa576426139c2afd
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 18:58:40 2008 -0800

    search: make the dialog slightly shorter by default
    
    This saves some screen real estate.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9bf49779f2609ef207b1a9280de4d89229af4440
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 18:04:02 2008 -0800

    views: move cola.syntax into the views namespace
    
    cola.syntax was moved the cola.views.syntax, since it makes more
    sense there.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9448492a74159dc277315cadf3b6def27967f638
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 18:04:50 2008 -0800

    search: pass the parent view to the search dialog
    
    We now pass the parent view to the search dialog so that it can
    properly center its window on the screen.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a542351b8d6ff7655346ef458c2f296543fd7ff5
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 17:04:29 2008 -0800

    views: make all dialogs maximizable
    
    Windows requires that we use setWindowFlags on all dialogs
    otherwise Qt drops the maximize button.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 62a7ab1be18fef0ac13bf0c8bac0a51ed9c3e8b7
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 16:19:09 2008 -0800

    Add a .mailmap file
    
    This fixes a commit where I messed up David's name.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit be70329b11f7a611db63e13255c9f9b74b76ab01
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 01:26:49 2008 -0800

    setup.py: work around the pyuic4 setSortingEnabled bug
    
    We work around the bug by suppressing all lines that mention
    'sortingenabled' in the generated .py files.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8a1ecb87437eb946064a782dfe6e879ebce0e15f
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 00:15:10 2008 -0800

    INSTALL: remove references to the old pyuic4 shebang issue
    
    The previous commit works around pyuic4 installations that are
    missing shebangs, so we shouldn't mention it in INSTALL anymore.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8d8922f52bf7c743e47613acaf627eaee17ef59a
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 26 00:14:04 2008 -0800

    setup.py: guard against pyuic4 that are missing #!/bin/sh
    
    Some installations of pyqt4 have a copy of pyuic4 that's
    missing the shebang line.  Guard against this by using
    popen() instead.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 88ad1302c77ed33c16db78b2659867c12fbb21e0
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 25 17:20:46 2008 -0800

    git-difftool: prepend $(git --exec-path) to $PATH
    
    git-sh-setup is no longer in $PATH as of git 1.6.0.
    Prepend PATH with git-sh-setup so that git-difftool
    can use git-sh-setup.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fd3a43bef15b51350256e31d6ae2a1df996a3497 (tag: refs/tags/v1.3.4)
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 25 14:05:12 2008 -0800

    remote: add a rebase checkbox to the pull dialog
    
    The pull dialog now has a 'Rebase' checkbox that tells cola
    to pass the --rebase option to pull.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 90e23ce2fd57960cbb2a68538b524cbf24915128
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 25 05:03:08 2008 -0800

    INSTALL: fix a typo in the windows installation section
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 250282933a3d905248993a372c7121f9d29b1034
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 25 03:51:27 2008 -0800

    win32: add a win32/ folder for storing all of the win32 hacks
    
    Building cola for windows involves a little bit of voodoo.
    We now keep all of the windows-specific scripts and such
    in the win32/ folder to help make living in windows-land
    a little easier.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 27a7e19a1ed2137f27c5f8612f054701c374bdce
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 24 13:42:32 2008 -0800

    INSTALL: remove references to the now unused 'file' command
    
    We no longer mention the 'file' command now that
    utils.ident_file_type() uses only mimetypes and filenames
    when guessing file types.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f18b101db02adc98cdbc07837c990133a25828e1
Author: Barry Roberts <blr@robertsr.us>
Date:   Wed Dec 10 09:29:24 2008 -0700

    Speed up file identification
    
    This is for all platforms and is probably more flexible
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 88e9431a62e4eb952e9de8c8861c20257795fa76
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 22 08:29:12 2008 -0800

    rebase: list all branches in the branch chooser, not just local ones
    
    The rebase dialog only listed local branches.  It now lists all
    branches, including remote ones.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3ed716233b650ff3c6f3310b4c80fcc57a4a892b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 22 08:12:22 2008 -0800

    models: call 'git update-index --refresh' in get_workdir_state()
    
    There was an earlier version of git that would report files as
    being modified when only their modification times changed.
    This causes cola to report false-positives in its modified
    files list.  We now guard against this by refreshing the index
    in cola's get_workdir_state() method.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 09b43847052314211072a11f9a168a576d09bf84
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 19 10:15:44 2008 -0800

    Use 'utf-8' instead of 'utf8' in core.encode()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f31d7bd3b9334c123039dc325068e0740fb25452
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 14 14:26:25 2008 -0800

    compare: fix an edge case when decreasing the number of log results
    
    When changing the number of results in the compare dialog down
    to a number less than the index of the currently selected
    filename then it would generate a traceback.  We now detect
    this condition and behave accordingly.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ddb19ffee595156744d516c092b86c4b0b18a78b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 14 14:23:50 2008 -0800

    options dialog: fix some annoyances with the font handling
    
    The font handling in the options dialog had some small
    annoyances that have now been fixed.  The dialog should now
    show instantaneous results and properly react to all user
    input.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 95bd9b73d7169871b95ba69323060dd782fb48ab
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 12 11:37:16 2008 -0800

    controllers: fix a typo when restoring the scrollbar values on rescan
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cffa5f48943f772d801a2b0725dda5572587be38
Author: Barry Roberts <blr@robertsr.us>
Date:   Thu Dec 11 10:45:58 2008 -0700

    Context menu items for Commits list
    
    This adds checkout, cherry-pick, and create branch
    to the commit list context menu.
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 117aa32f129b3fd89342eeebf80229d6e8632b9a
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 11 02:59:22 2008 -0800

    cola: pass --no-color to 'git diff' to avoid receiving ANSI sequences
    
    If someone has a git config such as:
    
    [color]
    	ui = on
    
    Then git might ignore whether a TTY is attached when printing diffs.
    We now guard against this by passing --no-color to all 'git diff'
    invocations.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4c218fe4c1c69ed1ff1deccee2b1dc7ba5409286
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 10 02:56:12 2008 -0800

    diff gui: properly restore the scroll bar values on update
    
    We now properly restore the vertical scrollbar values when interactively
    staging content for commit.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e2efc30125a671f88af87145301ca412772b55c6
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 9 22:26:31 2008 -0800

    views: fix obsolete references to the old dockwidgets
    
    The main view needed to be updated to reflect the changes to the
    main.ui interface file.  This fixes a bug in the stash view.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit aecfd3dbd99fafa67aa5755284c38d425adcdd31
Author: Barry Roberts <blr@robertsr.us>
Date:   Tue Dec 9 19:52:35 2008 -0700

    Fix stash typo
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 2612b3a3d9efa5d77e0ce415efee13c4174f00dc
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 9 16:37:41 2008 -0800

    compare: reinstate the Commit -> Compare File... menu action
    
    We recently lost the ability to compare changes to just a single file
    across commits.  This has been reinstated.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dda2f8380599edc8acce60aec644a9dcb58070df
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 7 22:02:38 2008 -0800

    i18n: fix a few more places where we weren't unicode-safe
    
    The search dialog and the commit browser now properly decode
    git's output before handing it off to Qt.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c8c4838f488be76751457275ae32eac2fe603d8f (tag: refs/tags/v1.3.3)
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 4 23:13:36 2008 -0800

    qobserver: fix a bug where we would respond to redundant notifications
    
    When setting a text field Qt triggers a callback.  We catch this callback
    and update our model accordingly.  When the model updates, it triggers
    another callback which causes a feedback loop that eventually resolves
    with the text field getting set twice.  This is problematic since
    it makes entering text problematic.
    
    We now detect this situation and stop the notification loop accordingly.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1e352393667c73766b2e1178d03095c0439e26d5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 4 01:52:41 2008 -0800

    win32: Updated INSTALL to mention dirname.exe
    
    The INSTALL file now points users to the cola website for file.exe
    and dirname.exe.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2e52b5735d578a0b3cf657768a68c5e00e4c30f5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 4 00:57:31 2008 -0800

    models: guard against broken git configs
    
    Users could enter erroneous settings in their .git/config.
    
    For example:
    
    [merge.tool]
    	meld
    
    git config --list returns that entry without an "=" sign, which
    was crashing cola.  We now ignore these entries.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 07bd56e25c755eebdbb1f61e777df942fad40d24
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 4 00:47:12 2008 -0800

    create branch: fix gui bugs when entering branch names by hand
    
    We were resetting the user input whenever it changed, so we now
    only reset it when it was changed as a result of clicking on a
    remote branch.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 28f2099bc26f97d41ba8520d0dfabe0e8a5adbbc
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 4 00:13:52 2008 -0800

    clone: handle massaging .git strings in URLs when guessing the clone dir
    
    This improves the cola behavior when cloning foo/.git and foo.git URLs.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a8ce54473ce39fe40cdf7733f1eed81b1f728100
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 3 23:43:10 2008 -0800

    clone: assume that git url = the new destination directory
    
    Previously we used QFileDialog.getSaveFileName() and restricted
    users from selecting existing directories.
    
    We now use getExistingDirectory and assume that the destionation
    directory should just be the basename of the git url.
    
    We could prompt again, but that would be annoying.  Unfortunately
    Qt doesn't have a convenient dialog to allow both existing
    directories and new directory names (most of the world is centered
    around files, it seems, unlike git which is more dir tree-ish).
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3631deb20c7759533b43426b88e180b16e36fe8b
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 3 22:39:54 2008 -0800

    controllers: use the --repo option in menu_clone
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 854e1cb81db94fb3efb19555610ee2bb28551bd8
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 3 22:11:22 2008 -0800

    opendialog: upddate to use the --repo option
    
    oops, 605a2ba7 changed the option parsing but forgot to update the open dialog
    which actually uses it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7a49d47d86da5669633442eaa6df34961065baec
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 28 04:43:46 2008 -0800

    interactive staging: workaround a qt quirk where \r\n is lost in qtextedits
    
    qtextedits unconditionally eat \r\n when returning the selection.
    This breaks the interactive staging on files that contain \r\n.
    If we're not able to find the selection in the diff then we know
    that this has happened so simply replace \n with \r\n and try
    again.
    
    This fixes interactive staging on repositories that contain
    windows/dos text files.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dd8cd024e10f575285d659253960a91958e4ed36
Author: David Marti­nez MartÃi <deavidsedice@gmail.com>
Date:   Thu Nov 20 19:20:30 2008 +0100

    search: fix bug that blocks searching
    
    When trying to search something, git-cola complains:
     > AttributeError: Parameter 'commit_list' not available for Model
    
    Attributes for class "Model" must not be null to be detected as a parameter.
    Model.get_param_names has the related code to check if it is a parameter
    or not.
    
    So, the solution here is initialize model.commit_list with an empty array,
    because it is similar to the data used there.
    
    Signed-off-by: David Martínez Martí <deavidsedice@gmail.com>

commit 6d8bbd16bd72cf1c1ba8384d46a6beda23b3cb81
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 20 12:40:23 2008 -0800

    models: properly detect merge conflicts with deleted files
    
    When a file is deleted locally and changed on the remote side diff-index
    reports the state as 'A' (added) since it's going to add it during the merge.
    We now detect this and list it as an unmerged file.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0fe0bd382878bb3c7c1bb58448d1dee0f78e2cee
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 20 02:56:59 2008 -0800

    inotify: fix a bug introduced when removing the defaults module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6d04408ecc2e5f63759d0365b9fef60658e89182
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 20 02:46:00 2008 -0800

    INSTALL: fix a typo in the pyuic4 section
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 04def89eb2dbcc9cd297419312c7efa22a9c5f53
Author: Barry Roberts <blr@robertsr.us>
Date:   Wed Nov 19 16:36:02 2008 -0700

    Simple blame
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 3d0c28af19ce1a2872af9bbcf2594582e99571c4 (tag: refs/tags/v1.3.2)
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 03:35:25 2008 -0800

    gui: fix the gui settings save/restore
    
    The defaults module was removed in the process of refactoring the gui
    settings save/restore functionality.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 72cdd4a7bdff5e6b916da24babdf4ae9d45ef646
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 03:33:31 2008 -0800

    main: call git update-index before importing the version module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c469d17e63041025ca33a8e4c71944d545205d64
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 03:32:39 2008 -0800

    git: make the git module independent of the exceptions module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 82b89d5fe90f6e7cf17626113fc9afc218ad236f
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 03:31:47 2008 -0800

    core: assume utf-8 when no other encodings are able to decode a string
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e7b75f26c301c5fba2b4fb718973bb23f206a92a
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 03:30:21 2008 -0800

    cola: add more documentation strings to the cola modules
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 58ad4f099af09510ba7a1768314962f64de294e4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 18 02:09:05 2008 -0800

    version: remove the git update-index call to improve startup time
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8470c27b9d302f169a33cbcfc75cc03eb0bd126c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Nov 16 21:48:11 2008 -0800

    Makefile: add an uninstall target
    
    This target allows users to easily uninstall cola.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e2437f96053a001bf29d191610bffedaad2ecd61
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Nov 16 21:47:34 2008 -0800

    INSTALL: mention some build issues encountered by users
    
    Issues with pyuic4 and PyQt were added to the INSTALL guide.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 60675e650badc21d81e8e16056d0f8144ae2df8e
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Nov 15 06:16:54 2008 -0800

    unicode: use core.encode() and core.decode() throughout git-cola
    
    This retrofits git-cola to use the new core encoding module.
    This centralizes all of the encoding duties so that we can modify them
    as needed.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c54dfa941f9c4b5e729089e17a94f28e2cde219c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Nov 15 06:15:19 2008 -0800

    core: add a core module for holding core encoding routines, for now
    
    This creates generic core.encode() and core.decode() routines from the
    encoding-guessing patch provided by David Martínez Martí.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1ef6f5ef638e17ddd98094027413e07aa4590800
Author: David Martínez Martí <deavidsedice@gmail.com>
Date:   Fri Nov 14 17:13:25 2008 +0100

    Guess the correct encoding for each diff line.
    
    Git can handle any type of file, whatever encoding it uses
    (or a broken one). Git-cola must not fail (or complain) when
    trying to show that data.
    
    Git-cola only handles utf8 in diffs, which is not very useful
    when your project has different encodings.
    
    This patch adds a very simple encoding guess for each line.
    Do not try to do this at the whole file, because it is useful
    when you are viewing a diff of a encode change.
    
    Signed-off-by: David Martínez Martí <deavidsedice@gmail.com>

commit df58c910bef4e706b790d60c0d854d7664c5dd8f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 23:04:52 2008 -0800

    controllers: optimize delete_files by only calling rescan() once
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit af7cc1b05922299196237409af351fae9d4dadb5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 23:04:23 2008 -0800

    models: do not list a file in both the unmerged and modified sections
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit eca3d33342076104ad544405eab55808837b9a4c
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 17:50:47 2008 -0800

    git: check for errno.EINTR when handling interrupted system calls
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 904c7a681c208dd19cc9211043170ad2b2d2e154
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 17:35:51 2008 -0800

    ui: remove the sortingEnabled property to allow qt 4.1.x compatibility
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 44f2c3c95d08f0a1faaaf65129c98a24850f6b9f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 00:22:05 2008 -0800

    context menu: simplify the context menus in the right-click menu
    
    This simplifies both the code creating the context menus and improves the
    order in which items appear in the menu.  This moves the common operations
    to the top of each context menu permutation and adds separators to delineate
    less common/dangerous operations.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d70f7230de5e606e97d1f897e82a842693500f24
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 13 00:19:46 2008 -0800

    controllers: disable single and double-click staging for unmerged items
    
    Accidentally staging an unmerged file loses the ability to launch
    git mergetool on the unmerged path.  This disables the convenient
    staging UI shortcuts for unmerged paths so that someone doesn't
    accidentally stage a file they are still merging.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8df5059755371658fec78e81140fd7363377fb83
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Nov 12 23:42:46 2008 -0800

    models: clear out the unmerged list when checking for updates
    
    The unmerged list was never getting reset, is bad since we'd end
    up in an incorrect state.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5b2fb776a6bd64ad87e99d81984c4dca471a15a8
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Nov 12 23:36:36 2008 -0800

    controllers: extend delete_file to delete multiple files
    
    delete_files now respects multiple selection in the status tree.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 08709bf2964ec6a5a6a5ca4a08f2fca12598ce46
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Nov 12 23:35:50 2008 -0800

    views: fix a bug when selecting an untracked item
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 58831dedc00fbfdc1bbf0355bbf1b5cc7db8b770
Author: Barry Roberts <blr@robertsr.us>
Date:   Thu Nov 13 00:07:49 2008 -0700

    Add "delete" context menu to untracked files
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 2e5c32841cb8a450f1dfe3b60c718228f289ff51 (tag: refs/tags/v1.3.1)
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Nov 12 02:47:53 2008 -0800

    cola: completely rework the cola user interface
    
    git-cola now provides a repository status view that closely matches the
    output of 'git status'.
    
    The staged and unstaged lists were replaced by a single tree view.
    Likewise, rest of the UI was simplified to account for this --
    e.g. there are no more dock widgets in use.
    
    New icons were added for the Staged, Modified, and Unmerged categories.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6e8c1357ba538684a2b9e8244d123196f0e611e6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Nov 12 02:43:55 2008 -0800

    views: allow arbitrary input in the combobox and listwidget choosers
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a55a4486e20512926837e086cd4731ff476cea23
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 11 20:24:55 2008 -0800

    controllers: import new merge messages if they're available
    
    Previously, we would only import new merge messages at startup.
    We now 'git hash-object' the merge messages and import new ones
    whenever the hash changes.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5ea2f4ea88a0c8d09ad6496a28aadb7eebcde166
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 7 22:46:06 2008 -0800

    models: handle the git init case in get_workdir_state()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c9c7c261960c684f44c08ed7375dad2c81cfa4cf
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 7 22:31:37 2008 -0800

    models: handle the git init case for removing staged files
    
    When no commit exists we have to fallback to git rm --cached.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 733651dda69184f397d8afce78cbc5c97f58b866
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 7 22:16:52 2008 -0800

    models: use symbolic-ref instead of git branch in current_branch()
    
    This allows cola to handle both git init and detached heads.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b251185f1d896eb169f96556d573cc58a16c9211 (tag: refs/tags/v1.3.0)
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 6 21:15:54 2008 -0800

    version: use the current branch when determining the automatic version
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c2e0fbded94a1b5dc075c86ef36d9b09b912f480
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Nov 6 21:09:11 2008 -0800

    desktop: updated cola.desktop with the latest changes from debian
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 703bbcab28433544a1ff515763339ceee2bb12bc
Author: Barry Roberts <barry.roberts@xactware.com>
Date:   Wed Nov 5 09:37:31 2008 -0700

    Fix checkout in create branch
    
    AFAICT, the checkbox was being ignore.
    
    Signed-off-by: Barry Roberts <barry.roberts@xactware.com>

commit 1dc8343d49030212bd2257e84e432858ddf3c459
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Nov 4 19:59:57 2008 -0800

    controllers/merge: reformatted code to stay within 80 columns
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e59a5f48a47346396c966e8353103010182b92f1
Author: Barry Roberts <barry.roberts@xactware.com>
Date:   Tue Nov 4 12:42:34 2008 -0700

    Disable Commit checkbox when Squash is checked
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit ba354727f1e9e6f730d2914e64500adc08346b6b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Nov 2 19:14:37 2008 -0800

    INSTALL: update win32 instructions to mention the pyuic4 workaround
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac9a0b3c54a53b8da0df6cc4bf8ba6b32c22a43d
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 31 11:50:48 2008 -0700

    git-difftool: don't use "echo -n"
    
    "echo -n" isn't portable.  We now use "printf" instead.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit af0e7db901093c07728f46aae7bd16fa3a3247eb
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 30 15:38:22 2008 -0800

    win32: fix the utils.fork() implementation for msysgit
    
    The latest msysgit expects argv to contain "git" even though the argument
    to os.spawn is "git.exe".  Interesting.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fecc9573da3f5325aa8cf529e102e284795af671
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 30 16:26:13 2008 -0700

    utils: cast to a tuple to properly handle the win32 case
    
    The win32 branch concatenates args with a tuple so we need the cast
    so that it does the right thing.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 032200b23c3c299ea564b3f4a09604eee6b99eb0
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 30 16:22:42 2008 -0700

    branch compare: add a signal/slot to close the branchview dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7a8ac82c54c21b24f943fd3ad9ace10c9daf3c13
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 29 21:07:44 2008 -0700

    git.py: retry execute() to workaround interrupted system calls
    
    unix can still kick us with an EINTR so we have to retry read() calls.
    This is known to workaround a problem on OSX but it likely exists
    other places too.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6d603db101febea5ec96693b0739f416c90ed394
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 25 12:21:07 2008 -0700

    darwin: remove darwin from the use_shell conditional
    
    we'd like to avoid using the shell at all costs.
    If we enable shell=True on darwin then we also have to
    shell_quote, but not on win32!  what a tangled mess cross-platform
    IPC introduces.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7d38991a137df1b0ffeda2464d9562c1bae7e23c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 25 12:07:03 2008 -0700

    win32: do not shell_quote commands
    
    shell quoting is a world of hurt so don't do it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5a43923d653696c073dd68fa8e18e14526c2eb5f
Author: David <davvid@gmail.com>
Date:   Sat Oct 25 03:22:18 2008 -0700

    git-cola: add support for win32 installation layout
    
    Signed-off-by: David <davvid@gmail.com>

commit 419b54bb91425caf423669103ee939b35e3e30d6
Author: David <davvid@gmail.com>
Date:   Sat Oct 25 02:55:17 2008 -0700

    win32: fix subprocess communication
    
    This reverts the non-portable changes to execute()
    
    Signed-off-by: 'David <davvid@gmail.com>

commit 6ce5fde2c332319770ff6a2e893e08a5f87ddf11
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 24 13:20:50 2008 -0700

    repobrowser: pass with_raw_output=True to git cat-file
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 97e6c0fc98ef63f46909f015d0c79a3c466ad8fb
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 24 13:11:23 2008 -0700

    repobrowser: fixed bug when calling cat_file
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6c3a174084ccec0ba04f135dc7fd7531e86b4990
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 24 03:15:13 2008 -0700

    version: use git.Git.execute
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7988615f5e95afffc5187ca944940e0d5037f916
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 23 22:17:36 2008 -0700

    Add self.items(), self.iteritems(), __iter__, and __getitem__
    
    This lets you use models like a dictionary.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4266c7e9853a30b32e8b1de9c23a1412eaeeee6f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 23 22:16:39 2008 -0700

    git.py: workaround osx interrupted system calls
    
    On osx select gets interrupted and exec'ing out commands fails.
    We now retry the system call to recover.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 311679776b5af9f321241c11e9444935a9f74ce4
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 23 14:24:26 2008 -0700

    compare: use get_corresponding_remote_ref instead of get_default_remote
    
    Older versions of git don't let you refer to remotes as refs,
    so don't do that.  Newer gits resolve "origin" to "origin/master".
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bc3b1340880ed2e54616df4d5751764d57b4b162
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 23 03:53:47 2008 -0700

    models: remove the need for parameter registration
    
    Previously, model would only export attributes that it knew about
    due to a create() call.  It now determines parameter names dynamically
    by filtering __dict__ with some simple rules.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e13d8e1fdae2df93c95f42160e4b025ef9275a89
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 05:36:57 2008 -0700

    git-difftool: add a newline after the missing file message
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5e3d981af652eeab979563d9cb9570a9b0b7e0f5
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 05:32:55 2008 -0700

    models: fix unicode handling for config load/save
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9e7456d73fc7fb3a553c20b00007080272cc9582
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 05:19:10 2008 -0700

    models/utils: more unicode fixes
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bda4085a24742a76ac1571ee850075340c0d8338
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 05:07:24 2008 -0700

    models: add unicode/i18n support for get_latest_commitmsg()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c1ec81c0dd7182eb7820dd0d286a9546f97b03e6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:58:24 2008 -0700

    compare: add a BranchCompareController for use by Branch->Compare
    
    The Branch->Compare dialog lets you compare between your worktree and
    arbitrary branches.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e02d2c702023045c49d5ba128b68dfe912832571
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:57:00 2008 -0700

    qobserver: add *_item, *_selected and *_index for listwidgets and treewidgets
    
    The model.foo_item now contains the selected item corresponding to the foo
    list/tree widgets.  using foo_item vastly simplifies things.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 239721256e04d2ed8d2d758fb47425ff2a3bbe3c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:55:44 2008 -0700

    qobservers: make double-click callback registration automagic
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d551b077f966e13bdfc936d52520e5fb61ac11a2
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:51:38 2008 -0700

    main: rework the untracked checkbox handling
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f4aa12d202a3c80e6ca91d258ea88838d8dd66fa
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:48:13 2008 -0700

    models: slightly refactor the unicode handling
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e89e13ea2d4e6f5334efefde0f7970d311efe648
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 22 04:46:00 2008 -0700

    views: add a BranchCompareView class
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e964d86a2c99bcb43e0572345ae280ff12ccc12b
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 21 22:40:02 2008 -0700

    models: add get_default_remote() and get_corresponding_remote_ref()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 076f7602eca92ed0f86148a112b212af001bf1e9
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Oct 19 04:40:29 2008 -0700

    models: some more unicode fixes
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 010c63bef494bd8cf6770e8bfc587a32ae90aee6
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Oct 19 04:26:25 2008 -0700

    gitignore: add "tags" to .gitignore
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ed9239088b0f75dc2637acd789dbe7ce2ae27814
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Oct 19 04:25:42 2008 -0700

    controllers: refactor fetch/push/pull
    
    This removes some duplicated code and makes the GUI better
    by removing the tags option from the pull field
    (--tags is a fetch and push-only thing).
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 06332a62bccf9dbea2e6d5d71816821b4fd46439
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Oct 19 04:24:24 2008 -0700

    startup: instead of bailing out, prompt for a git repo
    
    We used to previously bail out when we were launched from a non-git repo.
    This makes it so that we launch an open-directory dialog instead.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3c241a38fcba0e5c52e379693c7c3b85b6b52a8f
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Oct 19 04:22:50 2008 -0700

    git: rework work_tree / git_dir initialization
    
    git.Git() now contains a _git_cwd entry member which is separate from
    _git_dir and _work_tree.  This will let us refactor the way app startup
    is handled.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 01f0e9c817998ecb714849f635a2271fae74d0fa
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 16 02:12:44 2008 -0700

    difftool launchers: better behavior when amending commits
    
    If you launch git-difftool from the right-click context menus it now takes
    the value of the New Commit / Amend Last Commit radio buttons into account
    when creating the difftool command.
    
    The biggest difference is that a completely staged file launches with
    --commit=HEAD.  When amending, we launch difftool with --commit=HEAD^.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 36171c7f316e3d4de4092029cbfeddfd2fbf123b
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 16 01:54:56 2008 -0700

    git-difftool: compare against the index by default for all commands
    
    This reworks git-difftool so that the command invocations are slightly
    closer to git-mergetool.  One big difference is that we show things from
    oldest to newest when there are changes in both the worktree and the index.
    
    In that case:
    	BASE=the latest commit
    	LOCAL=the index
    	REMOTE=the worktree
    
    Certain diff commands were adjusted so that they would show these three
    states in a left-to-right progression since that made most sense to
    english speakers.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 91717da68ab78da88bb636a99e4c224737d1e78d
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Oct 15 17:25:08 2008 -0700

    git-difftool: always show local changes in the right-hand pane
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f7b7039096e4290b8061bc8a81bb9205973a9a2c
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 14 12:55:40 2008 -0700

    git-difftool: add a check to make sure we don't try to "rmdir ."
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a106ef89b30facffe05cb9ba26990375c9305972
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 14 02:49:59 2008 -0700

    ui: do not present 'undo changes' and 'stage changes' for unmerged files
    
    We don't want to accidentally stage a file that's unmerged so this removes
    the option from the right-click context menu.  We also fixed a bug where we
    were launching git-mergetool with '--', which it does not support.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c7fe8d046db5026f29589e3104d6ebbee96b5f81
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 14 02:48:32 2008 -0700

    models: avoid parsing the output of 'git status'
    
    git status is a porcelain so we shouldn't rely on its output.
    Change things so that we use diff, diff-index and ls-files to determine
    what's changed, staged, unmerged, and untracked.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 617320fcb52496425161871329d4e5b450d6c846
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 14 02:46:33 2008 -0700

    git-difftool: better behavior for unmerged files
    
    If a file is created in two branches then it won't exist in the index (yet)
    but will be valid for diffing.  git-difftool now handles this case.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8b6ffcd4376c35724a721dc4ddd71c80376a52bd
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Oct 14 00:17:59 2008 -0700

    unicode: refactor parse_status to centralize more code
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4db4a05d81e987466bdd9e995e6cf3774a2469e4
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 20:48:32 2008 -0700

    cola: improve unicode support
    
    These changes improve unicode support so that commit messages,
    etc. can be written in non-english languages.  These changes
    make it possible to commit Japanese (and other text) into a
    utf-8 project.  We may need to modify things so that we use
    the git project's default encoding in the future.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit abba82d46b933252cbc68c7bb2c4247eac0603f0
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 13:51:21 2008 -0700

    commit: fix the 'stage changed files to commit' logic
    
    We were passing in a list of changed files instead of passing
    the items in as the args to git.add().  We now do the handle
    this correclty.  This also turns on git-add's verbose mode
    so that better feedback is given.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 031e1711c910c17875b129e571b532f4250a3c93
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 13:48:20 2008 -0700

    branch compare: do not relaunch difftool when using double-click
    
    If we double-clicked on a file in the file list then we don't
    need to relaunch difftool when the 'Ok' button is clicked.
    Otherwise, the 'Ok' button launches difftool and closes the
    file list.

commit 88ee7271a942b1196a22fb3bf67da64aae1eb72b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 13:36:10 2008 -0700

    branch compare: handle double-clicks in the file list
    
    When comparing against another branch you can now double-click
    on the file list to launch a comparison against that file.
    
    This is nicer since you can now launch multiple comparisons at once.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f267da1e680043213e9565ed3ef55be574dfb4a8
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 13:33:02 2008 -0700

    ui: simplify the 'commit' and 'branch' menus by adding sub-menus
    
    Less-commonly used and advanced entries have been moved into sub-menus.
    This makes things easier to understand and visually cleaner.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1bd06642ecb6b3e892c4ae6d39dc8029f88e921a
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 03:00:25 2008 -0700

    compare: add a file icon to the compare_files list
    
    We now use a file icon to visually indicate that each line in the
    compare_files list is a filename.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 561d0e04ad79b0bbba67e1128039f14472538f6c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 02:49:54 2008 -0700

    compare: restore listwidget selection when performing updates
    
    The 'compare commits' gui now remembers the selected treewidget items and
    restores them whenever we change things such as the number of results or
    the 'show version numbers' checkbox.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2f59c3d0dc7a57ba21c85951c844ae5b447f6e64
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 02:47:22 2008 -0700

    compare: pre-select the latest commit diff by default
    
    We now pre-select the second-to-last commit as the start and the
    latest commit as the end commit by default.
    
    This makes it so that the 'compare commits' gui is setup to show the
    differences between HEAD^ and HEAD by default.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 28bf6fe1907566600d29b299ab4e9c3118e89b44
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 02:20:14 2008 -0700

    compare: properly display renamed files
    
    We now filter out old renamed file names from the file differences list.
    This is better since the only names that are listed are the final,
    surviving names in the end revision.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d7a1b863c0406a124806a7d7fe963543967e9e7e
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 02:15:01 2008 -0700

    git-difftool: detect and handle renamed files
    
    git difftool --start=<rev> --end=<rev> -- <filename> would not show
    the correct diff for renamed files.  With this change it now follows renames
    and shows the correct diffs.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0fa13051677b045f7400630e5354698caeef921f
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Oct 11 00:47:03 2008 -0700

    tests: rename the git ops test
    
    oops, how did that get the name test_git_opts (vs ops)?
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7e4b986ff62e0e9808ab5faf8587edac442c689b
Author: Barry Roberts <blr@robertsr.us>
Date:   Fri Oct 10 09:58:40 2008 -0600

    actions: add 'get commit message template' to the file menu
    
    This adds the ability to load a commmit template from the file menu.
    A default commit template can be set using the commit.template git
    config variable.
    
    Signed-off-by: Barry Roberts <blr@robertsr.us>

commit 8cf225eac17b3815d0800c79d0d87935f60f600c
Author: Matthew E. Levine <melevine@disneyanimation.com>
Date:   Fri Oct 10 21:46:07 2008 -0700

    compare: streamline and improve the compare commits GUI
    
    The compare commits GUI is now simpler and gives users a more
    streamlined workflow.  The GUI now shows the file differences
    up front and does away with the intermediate file selection dialog.
    
    Signed-off-by: Matthew E. Levine <melevine@disneyanimation.com>

commit 1b2f2e7894a561527c712be14b3d6f580f93d732
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 10 21:45:16 2008 -0700

    git-difftool: use empty files for missing files at --start or --end
    
    You can diff files that don't exist in either the starting or ending revision.
    We previously bailed out of when that occurred.  We now provide empty files
    to diff against since that is more consistent.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8cb1a11126498f3f5d07707d2dabb603b67969c6
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 10 00:12:06 2008 -0700

    git-difftool: handle comparing non-existant files
    
    We now properly handle comparing against files that do not exist
    in the current checkout.  The current behavior is to show a diff
    between an empty file and the file as it existed in the other commit.
    Another possibility could be that we just ignore that file altogether...
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4fe9e7b1e93dd44b8372a6676de2752d99b199a0
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Oct 10 00:09:54 2008 -0700

    git-difftool: add a few comments explaining the code's intent
    
    git-difftool was pretty sparsely commented.
    These new comments clarify a few small details and don't clutter
    an otherwise straightforward script.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit aff386856670fe6628dcf67949669cbe4e70d971
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 9 23:23:33 2008 -0700

    git-difftool: add better cleanup handling
    
    git-difftool now uses a SIGINT handler to clean up after someone control-c's
    out of git-difftool.
    
    The cleanup routines were also improved so that no transient files are ever
    left behind.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c75a69581a3f7839a1b00fec54852d77fcbc7e6f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 9 23:21:43 2008 -0700

    git-difftool: never add changes to the index
    
    The safest thing to do is to never change the state of the index.
    This effectively makes git-difftool a read-only viewer, though the user
    always has the option of saving to $MERGED if they want to.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2a7cbdea3315964fa81410b8ae89fc34b829830f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Oct 9 02:23:08 2008 -0700

    gui: streamline the interface and allow more i18n
    
    An overridden tr() method was added to the main controller that
    routes things through the main qapp instance.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 95648aef85fc6fbaba8af80b9e2a8c84ba0ab9f1
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 26 11:24:33 2008 -0700

    Added cola.gui to setup.py's list of modules
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a0d916ced5f58779ce26891d4cfd5456be26791d
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 26 03:10:30 2008 -0700

    compare: make the ok button work in the 'compare files...' selection dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e5ed33ca39389611ed548fdab3fa0d1584127eb8
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 26 02:56:45 2008 -0700

    compare: add a 'Show Versions' checkbox to control usage of 'git describe'
    
    When 'Show Versions' is enabled the descriptions in the compare view get the
    canonical 'git describe' version number prepended to them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 78aa229e0cdc8b851c21d157f2ac11edc2ad9463
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Sep 24 00:13:18 2008 -0700

    checkout: show stderr in case of errors
    
    Reported-by: Barry Roberts <blr@robertsr.us>
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e3a359a4b0694215faa067402e353707b0331bc6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Sep 24 00:12:33 2008 -0700

    git-cola: allow running cola from the source tree w/out having to chdir there
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9b31b5e380e8d2ff3193456dd3c315140369e51c
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 23 22:34:27 2008 -0700

    gui: refactor code so that all generated code lives in the cola.gui namespace
    
    All of the pyuic4-generated classes now live under cola.gui.*
    cola.views is now reserved for subclasses and hand-rolled guis.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 86053bd5c89cc7a9f3974f63a96c0a4e6c4f2e72
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 23 17:02:56 2008 -0700

    repobrowser: return the full path to the filename, not just the basename
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1f677be7754ca345efa7b9fc4badbc31533a1213
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 23 01:49:36 2008 -0700

    doc: update git-difftool documentation for merge.keepBackup
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 465151a1c1fb984009b1ffba045ca0af676b5bed
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 23 01:19:34 2008 -0700

    git-difftool: use merge.keepBackup to determine wheter to keep *.orig
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7d221cc1d44788e441be8d0558e1987d5b3d5228
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 23 01:17:38 2008 -0700

    ui: tighten up the scrollbars in the dark.qss theme
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ec30e1b655c1277c7ed3381dc0b785050b1e6571
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 22 22:03:33 2008 -0700

    options: properly handle merge.keepbackup
    
    'git config --global --list' mashes all config variables into lowercase
    names, so we need to use merge.keepbackup instead of merge.keepbackup.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 89c6afd4b790a5a466d8badf6283e7d03d9b1dfd
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 22 22:02:20 2008 -0700

    compare: add a 'Compare File Across Commits...' menu item
    
    With these changes it is now possible to compare commits relative to a
    specific commit.  This is basically an extension of the 'Compare Commits'
    functionality.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 350cbb2f9cb2d1afb54a1ad013b8980df956f6f6
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 22 01:04:33 2008 -0700

    doc: updated INSTALL instructions
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 94c270a4759cafca7d490de028a8e8cbb71acdb1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Sep 20 15:52:40 2008 -0700

    style: make the scrollbars slightly smaller in the dark theme
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 642d42d23f68acf6e53a9d6bd020f57f0c10c261 (tag: refs/tags/v1.2)
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Sep 20 05:05:47 2008 -0700

    utils: suppress stdout in run_cmd
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 17428c8600d7d8cae64c12597b2dcb332667971e
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Sep 20 04:52:31 2008 -0700

    cola: add copyright statements for inclusion in debian
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 14ae833897a930ccfcf5930c655b0b499c0f0bf1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Sep 20 04:48:51 2008 -0700

    Add copyright notices to files
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit de838f024a3abddfe33c231f4329be1af51e365f
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Sep 20 04:39:24 2008 -0700

    win32: Launching executables (diff editor, editor, etc.) was busted on Windows
    
    From: Barry Roberts <blr@robertsr.us>
    Launching executables (diff editor, editor, etc.) was busted on Windows.
    This fixes it.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f61a8af01b3b73cb2f92f84398aecfb66e441098
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 19 04:20:17 2008 -0700

    test: use nose for running tests
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f80f6c3e971515821182f424bfedaaed59376feb
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 19 04:19:21 2008 -0700

    ui: add 'Save *.orig Merge Backups' to the options dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 471dcc2d63747d3cdefd9bbf7a1f21d22b09635e
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 16 01:55:03 2008 -0700

    options: Make merge.keepBackup accessible from the options dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 65653bd52e13b580fee5b059af3102c90a1ef3d3
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 16 01:54:11 2008 -0700

    controllers: differentiate between 'Merge Tool' and 'Diff Tool'
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 11bbdae87800531602a93fb5d904144a6c1a9855
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 16 01:53:47 2008 -0700

    git-difftool: better support for newly-added files
    
    The documentation was cleaned up a bit too.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4457efd55647c830613f0e7a1db9c91d201e3092
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 15 22:43:28 2008 -0700

    ui: reinstate actions from the old 'Repository' menu
    
    We accidentally lost all of the menu actions from the 'Repository' menu
    during the last round of refactoring.  This reinstates those actions, though
    the respective actions are now in the Commit and Branch menus.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 544032b2d65cd0acbb85156247627baf4086807f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 15 02:34:12 2008 -0700

    setup.py: do not replace shebang lines in python scripts
    
    The '#!/usr/bin/env python' is good enough so we can make setup()
    leave it alone by changing the regex it uses when searching for shebangs.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a25ee8fb600a2ced71214e0a443d4dc6248486dc
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 14 17:47:54 2008 -0700

    difftool: fix a bug when creating backups
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2772ccf5e538a850efc34a330a201b7f1be07e6a
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Sep 12 03:51:49 2008 -0700

    ui: added some tweaks to make things look correct on macos
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d361e9d64e5c32e7045fa4c62ed44ddac54d3e1c
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 05:52:21 2008 -0700

    controllers: added dock window save/restore for the main gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b0383f243d7b93b270d06617d5ce1d1592682aec
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 05:50:16 2008 -0700

    git-difftool/compare gui: detect when files do not exist in specific revisions
    
    When rev-range mode is on we now check for the existence of directories
    and files and handle their presense accordingly.  We now handle creation of
    directories that don't exist in the current checkout (do to older ancestry).
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 697f97c3817bf4a861e5fbafae20b09c9e313060
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 05:48:27 2008 -0700

    git-cola: $prefix/bin directory at the front of the path
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4aae4460662c4842db42eaf5d89d9f3c17c49f27
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 03:55:03 2008 -0700

    ui: refine the 'compare commits' dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 13db6b3f4c6de13b09f99ca4d2a1ec1a8e3111eb
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 03:35:41 2008 -0700

    ui: moved "Get Latest Commit Message..." to the file menu
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a2af35a47db79963ff51b95865c297973babf454
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 03:33:12 2008 -0700

    cola: add a Commit -> Compare Commits menu action
    
    By using Commit -> Compare Commits you can use git mergetools
    for showing differences between arbitrary commits.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 06a51821a76afea4512691da161daebc06af534d
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 03:32:15 2008 -0700

    controllers: add a compare-commits controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 267e470f62e02116c3d87f789058c444c9c42337
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 03:31:31 2008 -0700

    views: add a CompareView gui for comparing arbitrary commits
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fddb1b47b28ea4c5151a1f05e187df2c942588c1
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Sep 11 01:46:07 2008 -0700

    git-difftool: add --start and --end options
    
    If you specify --start and --end git-difftool will compare files between
    two arbitrary revisions.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4085731d10387af903ad52f504f62d3f288d6af4
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 8 22:58:02 2008 -0700

    views: call show_current_column() at startup
    
    This makes it so that the column display is initialized at startup instead
    of when the user enters the first text into the commit message editor.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 268392a290ed4e7b65469b3381d12876b60531e2
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 8 22:55:36 2008 -0700

    views: fix edge cases in selected_line()
    
    Selecting the first or last line was not getting properly handled.
    This fixes an off-by-one error for the offset and avoids using split
    when there is nothing to split.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7358a21e677b56f4a57804f5e6164a975c9ce5f6
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Sep 8 00:34:30 2008 -0700

    build: Add a MANIFEST.in and more doc to share/doc/cola
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit de607fcac4a55cb6184faf08525445abe4566539
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 23:10:44 2008 -0700

    version: run 'git update-index --refresh' prior to checking for a dirty state
    
    debian and pypi builds can sometimes get the stat information out of sync
    so we guard against it now.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 01ccf81e9a56d233823d853d60c04e4a3d6e36d2
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 21:48:16 2008 -0700

    version: only consider the master branch when determining versions
    
    Tags are created on the master branch so we should only consider
    commits relative to master.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac1a2bd17b2426f01f6ecf338608db55aa1e47a6 (tag: refs/tags/v1.1.4)
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 21:27:06 2008 -0700

    ui: show the current column in the commit message editor
    
    This adds a column number label to the commit message editor to show
    the column position of the text cursor.  This is useful since the commit
    message editor is a WYSIWG editor for commit messages.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e89bac12b66d225103069803868fe20e23cf1f12
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 21:05:11 2008 -0700

    setup.py: install doc/*.txt to share/doc/cola
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 535144f6e995ff1c17b43fd86baff97f49202bd3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 20:50:39 2008 -0700

    git-difftool: staged_files should not pass a commitish when using --ref
    
    The common case (no changes in the index) was creating a
    three-way merge when it should have done just two-way.
    This is because --cached doesn't make sense when comparing
    against a commitish.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4cf9d9f7559abd72750c949e775cec59b3f2bdb5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 20:31:17 2008 -0700

    grep: add a goto_grep context menu action
    
    When viewing grep results you can now right-click and select
    'Go Here' to launch $EDITOR on the files found in the grep results.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e058aded6f1b74a2e12d31f535a1faefa11752d5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 20:30:05 2008 -0700

    models: only allow access to git commands through model.git.<command>
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 518b1c68005e448b1da15463b059d85afe311e7d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 20:15:11 2008 -0700

    doc: updated difftool documentation and external manpage links
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 85e892df16ffdb98d41b80cedbf1d77b22e76917
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 19:38:15 2008 -0700

    ui: add a Help -> Documentation menu action
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 78ca69b3c904badc2af6450d928f4761de07c592
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 15:28:37 2008 -0700

    doc: Add documentation for git-cola and git-difftool
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0b1b76a65c7986c49990df0f4f6cb78abddd5c40
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 15:27:31 2008 -0700

    controllers: use 'git difftool --no-prompt'
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0c0709d8a2e07bf24823c2662d70c1a5c4a81f94
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 15:27:07 2008 -0700

    git-difftool: add a --no-prompt option
    
    By adding --no-prompt we can remove the dependence on xterm
    when using 'Launch Merge Tool'.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7929891587cb510412d5751bf35d030a4a600e38
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 05:51:35 2008 -0700

    config: removed the need for the 'cola.saveatexit' config variable
    
    cola.saveatexit was removed since cola.savewindowsettings is sufficient.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 605a2ba7e9e6574160aa948333ebc5bf3816e32b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 05:45:20 2008 -0700

    main: add better handling for the --style option
    
    If users specify a custom stylesheet we now register all
    immediate subdirectories with QtCore.QDir.
    
    This makes it possible to use resources and styles outside
    of the git-cola installation path.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 43e969cad03057a22ba08ad005363ff3df106c11
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 05:42:38 2008 -0700

    git-difftool: modify git-cola to use git-difftool
    
    Lots of cola code is now simpler since we're using our new
    custom git-difftool command.
    
    Several config variables changed since there is no longer a
    concept of a "diffeditor."  gui.diffeditor was replaced by the
    standard merge.tool variable, etc.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cd27b8c390a97635a05bd2897e1b059b4e4f25d3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Sep 7 04:08:23 2008 -0700

    tools: added a git-difftool helper script
    
    git-difftool allows using mergetools for staging changes.
    This is used by the 'launch diffeditor' functionality.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b3d5278fe51d71806501dde02de11e8a4b936af4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Sep 2 00:30:24 2008 -0700

    Makefile: simplify DESTDIR/prefix usage
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4d0062648d6b3bbb9275c87cff18f41eff2a90df (tag: refs/tags/v1.1.3)
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 26 02:39:12 2008 -0700

    build: allow relative paths in DESTDIR and prefix
    
    The Makefile now allows any combination of relative
    and absolute paths in DESTDIR and prefix.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ada615378c46b516112000ca768c9793d00f5372
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 26 01:57:22 2008 -0700

    cola: make the source tree layout similar to the install tree
    
    Consequently, we can now run bin/git-cola from the source tree
    without needing run make install.
    
    The tests and bootstrap scripts were updated to reflect this.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 04d8e81faa1d4953d8fefb3068677fad10ed4d9b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 25 02:20:36 2008 -0700

    cola: add better behavior for 'amend last commit'
    
    The 'Amend Last Commit' radio button now does everything that you
    would expect it to do.  The gui now shows the amended status, etc.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 744fa2e7b6b67db9ad65ee78cf82a170a0eda650
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 25 02:16:01 2008 -0700

    views: add reset_checkboxes() and is_amend_checked()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0137c2863ddb1b36d9e13ce9bfd1d5f4b444c5a6
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 25 02:11:30 2008 -0700

    models: add machinery for diffing arbitrary revisions
    
    We'll use this later when we implement a gui for viewing
    arbitrary diffs.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8be9fcd919d1dd285da1d9820a5bb806497f8812
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 25 01:47:46 2008 -0700

    ui: remove the last remaining tooltips
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 33d4581ede35c86ff241a13469e42c19f8f5365d
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 25 01:33:29 2008 -0700

    build: catch more stuff in the 'make clean' target
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d01b593e0c266195a7e53244dfa8eb84bf50e5df
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 24 19:20:04 2008 -0700

    tests: use the built cola instead of the installed one
    
    The test suite used to require you to install cola before testing.
    The cola tests now use the build/lib directory instead.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1c571f3f11025089f784baf1e46e84abc4cf9a2b
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Aug 20 01:50:50 2008 -0700

    build: remove waf in favor of setuptools
    
    waf is python and it's great but unfortunately most people are
    not familiar with it.  Setuptools is the standard Python way of
    doing things, so it makes sense to switch.  This makes
    packaging simpler too since debian is quite keen at handling
    projects that use setuptools.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0ac195ec9ef64038428f657bdd3001d24e44a274
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 17 16:24:10 2008 -0700

    git: missing sys import in git.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2834ea932606ebda07df17010224f4b595f98888
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Aug 15 01:39:03 2008 -0700

    git: pass shell=True on win32
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a98f5bbaf6759b462f8630ce8d672b3b26ce6209
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Aug 13 03:26:02 2008 -0700

    Moved many scripts to the maint branch
    
    This makes things more tidy since we don't have to expose these maintenance
    scripts in the main branch.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9373b4b92405f44bde1fb178baa2191983f0bbdd
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 12 19:38:05 2008 -0700

    Move all debian/ files into the release branch
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e77e5013397691eb8a1d39dae4433b41000b81f5
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 11 01:28:31 2008 -0700

    Added a script for auto-generating debian/changelog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 936c963a90ce182ffd95cbc670459e5829b29ff4 (tag: refs/tags/v1.1.2)
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Aug 11 01:01:51 2008 -0700

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

commit e62093e334bbbb5b0a1f0aed74a4493050ad0542
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Aug 9 19:12:33 2008 -0700

    ui: fix the 'save window settings' feature
    
    When we removed the main gui's slider we forgot to update
    the save/restore methods for the UI.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5f2459e5f37dc0954aa8ba96cef8aba4d76b345a
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Aug 6 10:23:32 2008 -0700

    ui: work around a qt 4.1 bug where QObject.tr throws an exception
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 14d5ec1a933846208d289169da4d1fb6a78f0da5
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Aug 6 02:10:40 2008 -0700

    ui: remove excessive tooltips, fix a small bug
    
    Many of the tooltips were out of date or unnecessary
    so they're gone now.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a75871e6f244fdcbab873ff6745a7fc6e5355b83
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 5 20:51:11 2008 -0700

    style: use single quotes whenever possible
    
    We were mixing single and double quotes.
    Double quotes should only be used when the string itself
    contains single quotes.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 02aaa34f537da283090092f1570ef4e153a33428
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 5 20:50:17 2008 -0700

    ui: centralize some more tr() calls
    
    main.set_info() now handles the translation call so this
    patch removes the calls to tr() from the calling side.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bf7379ffbdf37d34ad221511fb80464f9b5706ce
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Aug 5 02:26:59 2008 -0700

    ui: make the syntax highlighting colors configurable using a stylesheet
    
    dark.qss now provides an example showing how to set the syntax
    highlighting colors.  They colors are properties that are added
    to specific widgets.  These properties are queried at runtime to
    create the syntax highlighting colors.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c9c6c4b24bdab17b6319cb03878b9ca528e2cce7
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 23:02:41 2008 -0700

    ui: add a checkbox for controlling the status vertical/horizontal layout
    
    this makes the ui less quirky since it no longer tries to guess what
    the correct horizontal or vertical setting should be.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cc945b78f1ba2ab5c403553431b02d4fcd658129
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 22:07:39 2008 -0700

    cola: added 'undo hunk' and 'undo selection' actions
    
    These actions undo changes to the work tree by calling
    'git apply'.  This builds upon the diff selection gui
    and lets you manipulate your work tree using the same
    interface.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1db70deff243fbae48ba189a2ada26b78fcae649
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 22:06:24 2008 -0700

    ui: add QRadioButton to the stylesheet
    
    dark.qss now support qradiobuttons
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c27667033b60a4ccbfdb95669f245f3e2e5e42e0
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 20:59:37 2008 -0700

    ui: add a context menu for to staged item list
    
    Some of the options from the unstaged context menu
    are now available, notably 'edit' and 'diffedit'.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d241de811eff87d49218635626f2d140707d0094
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 19:35:32 2008 -0700

    models: properly report unmerged files
    
    We now detect unmerged files and return the correct diff.
    We were previously using --patch-with-raw, which we don't want to
    do for unmerged entries since it ends up not giving us a patch ;)
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fb5242f6c39da7f66ac7bdc35a5745a107223ccf
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 19:34:47 2008 -0700

    controllers: only prompt to import the merge message once
    
    Previously, every time rescan() was called we would prompt the user
    asking if they wanted to import the merge message.  We now prompt
    once and only once.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac46f9300702f022763d09d23819b45e6642eee4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Aug 3 19:31:23 2008 -0700

    ui: redo the layout so that we have a central widget
    
    Previously, the main interface shunned having a central
    widget in favor of purely having dock widgets in the
    dock areas.  Since I haven't figured out how to make
    a splittable dock area be the central widget, I made
    the status widget the central widget and placed all of
    the other windows in the left dock area.
    
    TODO: figure out whether we can have a nice splittable,
    dockable layout.  It was possible in qt3, but it does seem
    like some of this functionality might not be accessible
    from python.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1454f2ac0721cb1819af1f6d3c48f33232fc9ff0
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Aug 2 22:38:46 2008 -0700

    controllers: add a File -> Clone action
    
    You can now select File -> Clone, enter a URL and
    target directory, and a new session of cola is
    launched from the clone.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f933a012fc1b8671678ac74f10057dc91ffc2d56
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Aug 2 22:35:02 2008 -0700

    i18n: centralize some more of the tr() calls
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2df7f0163ea98ec0ff9b4cfd96c667a663bf3642
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Aug 2 22:30:02 2008 -0700

    cola: some small internal cleanup to the startup script
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 00b8120596ac088401fd366125c69f13d33d51c5
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Aug 1 12:24:45 2008 -0700

    git: fix a python bug in the command module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 713291b0280dfae38b416234d467954e66e11298
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Aug 1 02:34:34 2008 -0700

    osx: catch subprocess exceptions
    
    For some reason osx gets an interrupted system call
    when using subprocess.Popen.  This avoids that problem.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 40fa4fb82ba6cb4a2685520ae040c46259b9eba4
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 22:51:58 2008 -0700

    i18n: update to the latest .po's from git-gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6f9c58ec6eb3303fa34590a39a96fcbaeeda6e97
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 22:13:18 2008 -0700

    cola: allow user-supplied stylesheets
    
    Users can now supply --style=/path/to/style.qss
    for skinning cola.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e7fdd63e1aee584a8540d743238d2255c58a3e16
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 22:06:58 2008 -0700

    cola: add a --stylesheet=dark option
    
    If you pass --stylesheet=dark then git cola
    loads with a cool dark theme.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 559875897ab929b71fa8f088205a01fc4e39f527
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 22:06:26 2008 -0700

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

commit f4a2d7746f2ab670df33b624a315987a7e0b31ee
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 22:06:07 2008 -0700

    gui: add a dark theme stylesheet
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 205df18df6924d193caa927f12462e1d94ffca83
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 31 02:00:10 2008 -0700

    commit: report errors when git returns non-zero status
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0a44c06db27c0ef5ac58258512df89800ba09627
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 30 03:57:50 2008 -0700

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

commit 3678e1619ee77d18e77f5b2e00f9355410e633b7 (tag: refs/tags/v1.1.1)
Merge: 68bfb55 c39e836
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 30 03:23:10 2008 -0700

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

commit c39e836fe9e2f9901064875785e498a259d74e98
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 30 03:19:49 2008 -0700

    configure: update the url to the waf buildsystem
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c21ad3380f6601f39dbc22370b29da05ac4366b4
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 30 03:16:14 2008 -0700

    models: gracefully handle various repo types
    
    cola now works on bare repositories and symlinks.
    Running cola on a non-git directory will now
    print a friendly message instead of a stacktrace.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 78981d1e74da20f61d504dd13f3b5e0bbd628274
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 30 02:02:35 2008 -0700

    configure: generate better Makefile vars
    
    We also remove some waf crud about files not being chmod +x
    (probably some stupid svn thing or an old waf version).
    
    The makefiles are now portable in that they don't hardcode
    the current directory anymore.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7c6bf7f4d7cf8eef5a50a7ca675b058ed07f5b0a
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 29 01:44:00 2008 -0700

    cola: add mergetool support
    
    git-cola now has a mergetool option in the
    right-click menu when running on non-macos,
    non-windows platforms.
    
    The reason for blocking out windows and macos
    is that there is no simple way to spawn a terminal
    for the interactive mergetool session.
    
    We could, of course, write our own mergetool wrapper
    in Python, but this is the easiest way for now.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e76dd87d44ad91f6d39a513efb21712fdbfce242
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 29 00:30:01 2008 -0700

    cola: use better config values for the font size params
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3e97cb744cad4824ec64b9e769eed3d8d552395e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jul 27 02:59:26 2008 -0700

    Fix disconnected widgets on macosx
    
    macos, like windows, doesn't play nice with
    disabling the titlebars, so leave them alone there.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f581fa98ade5d60cc5f8ba5a02a720fdcd979a93
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jul 26 03:43:55 2008 -0700

    git-cola: remove some dead code
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ace2e80cc9a3a9ec0a81344747bc5a4c25fa568c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 23 03:01:33 2008 -0700

    cola: make i18n/l10n work again
    
    Something changed in PyQt where all of the localization
    strings had dialog-specific contexts in their names
    when passed to qApp.translate().  Since we're using
    simple .qm files (without any context) the fix is to
    simply blank out the context when calling translate.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8c1fc40aed90b0173ed2d746d370996cde1f9698
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 21 00:41:19 2008 -0700

    git-python: removed method_missing
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c63e8c38665fe9aa292056808ea902d78ab3bd99
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 21 00:40:51 2008 -0700

    updated readme/license
    
    the gpl is so passe
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d3e4cb4ea8ea54d75064569b423b3d88ebdccb7f
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 17 03:50:47 2008 -0700

    Added a COPYRIGHT file and renamed COPYING to LICENSE
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6c739e7c580c165120a2b5d0cbcc94a26c4069f9
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 17 03:43:19 2008 -0700

    git: include the GitPython copyright notice
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2f9fee66c7d2aa325d948c4741c1e04a2722f090
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 17 03:42:47 2008 -0700

    tests: oops, I forgot to update the gitpython test
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 408e87d75ff3a9aac7ff10a7e6bbc96bc0e77f47
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 17 01:56:07 2008 -0700

    cola: update cola environment variable names
    
    TODO: cola needs some better documentation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c611c3008a30621737604fa41ea69de85473e9ea
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 16 23:19:05 2008 -0700

    debian: remove the python-git dependency
    
    git cola includes its own copy of GitPython's
    Git class so there's no need to declare a dependency.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5a9c2cb82e912f81ecb8f3451163e976d2b00f31
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 16 23:15:09 2008 -0700

    cola: copy selected filenames to the clipboard
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b59ed2ade9cc65643b1b6214bbfc00a8d4b991c6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 16 00:22:14 2008 -0700

    config: add a cola.editdiffreverse setting
    
    Setting cola.editdiffreverse will cause cola to launch:
    	$diffeditor $tmpfile $filename
    instead of the default:
    	$diffeditor $filename $tmpfile.
    
    $tmpfile points to the contents of:
    	git show HEAD:$filename
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8ded9009a6fce6665e226795b645fbb937b1ec37
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 16 00:19:11 2008 -0700

    model: add config helper functions for cola+gui items
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 68bfb55cdb541cb072a685c1d9f594f5425846e1
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:55:44 2008 -0700

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

commit b3fc04654ca5d32aa224230c51dc95512261f353
Merge: 979fcd4 fde6ced
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:54:01 2008 -0700

    Merge branch 'master' into release
    
    * master:
      README: update the build instructions to mention GitPython
      build: teach the build scripts about the bundled GitPython
      tests: use the interal git module
      cola: switch to using the internal git module
      cola: include GitPython to make installation simpler for users
      syntax: improve the whitespace checker

commit fde6ced1edfb9762ae0f678789a0c02c2de26d08 (tag: refs/tags/v1.1.0)
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:44:23 2008 -0700

    README: update the build instructions to mention GitPython
    
    This removes the requirement notice on GitPython since it is
    now built in to git-cola.  An acknowledgements was added instead.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1f8777550a88341d66ee6c767cf8356e9ab5859e
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:41:06 2008 -0700

    build: teach the build scripts about the bundled GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4b8568dd82394f7800b54837ce5d763968751e58
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:40:31 2008 -0700

    tests: use the interal git module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4675fff67a61c694f99d82c29920e35bfdd85e09
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:40:15 2008 -0700

    cola: switch to using the internal git module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4f9c2d617420bfa537a9e12ad8c4428a3984d94d
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:39:31 2008 -0700

    cola: include GitPython to make installation simpler for users
    
    We now ship a copy of GitPython so that users don't have to install
    it themselves.  Another benefit is that we're shielded from API changes.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3975b6e62414557482ebf76f305ebb165a38bb31
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jul 14 00:19:16 2008 -0700

    syntax: improve the whitespace checker
    
    Previously, the syntax checker would only complain about the
    final trailing whitespace character.  It now flags all of them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 979fcd4211baba28f4cebcd0e2c90fda10f39d69
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 9 02:22:30 2008 -0700

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

commit cd6ad92fb5e358731ab012e5ae722be66062eaff
Merge: 761314e 786132c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 9 02:20:23 2008 -0700

    Merge branch 'master' into release
    
    * master:
      utils: rework fork()
      models: fix (fetch|push|pull)_helper
      style: do the mainstream python thing and use spaces instead of tabs
      syntax: use nicer colors for the diff display

commit 786132ca149706a06d4cc448dade0c1487a47944
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 9 02:13:36 2008 -0700

    utils: rework fork()
    
    We were getting some backtraces when launching apps in the
    background with the subprocess-based fork() method.
    This reworks the implementation to avoid subprocess.
    
    The downside is that we now rely on shell_quote().
    I'm probably doing something wrong, or there's some weirdness
    introduced when running under PyQt.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 956e1bd6a64ddb7d4c9c4d8ca6157b7e63b92400
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jul 9 01:51:23 2008 -0700

    models: fix (fetch|push|pull)_helper
    
    I forgot to return status, which callers of fetch,
    push and pull_helper expected to receive.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4cd2e7fdc256a5d164d389c2f40c7744592b811f
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jul 6 14:51:56 2008 -0700

    style: do the mainstream python thing and use spaces instead of tabs
    
    No comment.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 815c654ddfc223fc05a2bee63de4144ba3dd9db0
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jul 3 01:46:32 2008 -0700

    syntax: use nicer colors for the diff display
    
    This should really be a user preference...
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 761314ec49a229ae1f618f4a1d83f0fc9af803d8
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:33:44 2008 -0700

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

commit 0dd3e1d66682c0b7cec3d444ab6b77f089ad1254
Merge: f7b7dbb 97b1749
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:30:45 2008 -0700

    Merge branch 'master' into release
    
    * master:
      controllers: add support for using the diff editor to compare branches
      ui: add a Branch->Launch Diff Editor Against... menu item
      models: properly detect copied files in parse_status()
      controllers: when restoring selection prefer unstaged files
      ui: add ItemsView and ComboView dialogs
      views: reworked item selection dialogs
      cola: centralized tmpfile management

commit 97b1749b2b3509e59a8bcce3832237b164c30631
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:30:04 2008 -0700

    controllers: add support for using the diff editor to compare branches
    
    This lets users launch a diff editor against files that are different
    between their work tree and a specific branch.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit df5dad891bf27544d04e05e43c473f0f3900fef8
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:28:41 2008 -0700

    ui: add a Branch->Launch Diff Editor Against... menu item
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d0b3e9eac3cde0a747a925cc697178f2af12b260
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:28:12 2008 -0700

    models: properly detect copied files in parse_status()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d1c2ae8b81f9d5bb1dd86e841cb32b2040682518
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:27:54 2008 -0700

    controllers: when restoring selection prefer unstaged files
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 071f77f8bf081c627307e05c222f64ed2ac9bfbe
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:27:29 2008 -0700

    ui: add ItemsView and ComboView dialogs
    
    These are simple dialogs for choosing items
    from a list or a combo box.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f92236134a3d745cddfc957b77b5cb8e3751ee0a
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:24:18 2008 -0700

    views: reworked item selection dialogs
    
    There are now two simple dialogs for quickly
    selecting items from a list.  One uses a qlistwidget
    and the other uses a combobox.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 19761b2393f931c017fd426468075e28f468c7d5
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jul 1 01:21:56 2008 -0700

    cola: centralized tmpfile management
    
    git-cola now keeps temp files around until
    the application is shut down.
    
    This is more convenient since we no longer
    have to worry about unlinking files.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f7b7dbba142dd327d3590d7a82dd91dba8b50397
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 26 00:15:28 2008 -0700

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

commit 195b9bd01dc2d20a8ab566916529f7fa9a0acde2
Merge: c9a104a cf3d0f3
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 26 00:13:24 2008 -0700

    Merge branch 'master' into release
    
    * master:
      models: update to the latest GitPython API (again)

commit cf3d0f3e7b63bd139b3c87862f0057156a014eb6
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 26 00:11:49 2008 -0700

    models: update to the latest GitPython API (again)
    
    GitPython removed get_git_dir() and get_work_tree().
    git.Git() now requires that a path is passed to it as well.
    
    All of cola's interaction with GitPython is now isolated
    to the GitCola class.  This commit adds these useful
    methods to the GitCola class.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c9a104a83296f6ecb8b0843e42e5f565dd61acf9
Merge: 688deb1 bda109a
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 24 02:24:56 2008 -0700

    Merge branch 'master' into release
    
    * master:
      scripts: update mktar-win32.sh to use a win32 subdirectory

commit bda109a267a6190d37ea931ebb1b65844bec54ac
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 24 02:24:34 2008 -0700

    scripts: update mktar-win32.sh to use a win32 subdirectory
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 688deb1fd17bf92ef899a19a7dea455189809ae6
Merge: 028dcfa 8738342
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 24 02:23:08 2008 -0700

    Merge branch 'master' into release
    
    * master:
      ui: enable the Branch -> Apply Diff From... menu action

commit 873834217956fb77d15592c92afe719476a12775
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 24 02:21:59 2008 -0700

    ui: enable the Branch -> Apply Diff From... menu action
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 028dcfa0385fc148f4e3672f7351cab502821f1d
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:52:10 2008 -0700

    release: updated debian to cola 1.0.1
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0c9b5e01fc839d76be28f2b6e4fa1fd1d936a61d
Merge: b934382 a29d12d
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:50:53 2008 -0700

    Merge branch 'master' into release
    
    * master:
      controllers: generalized the diff gui for 'Apply Diff From Branch'
      stash: update to the latest GitPython API
      models: add an 'apply_diff_to_worktree' function
      utils: generalize the diff parser
      ui: add an Apply Diffs From.. option to the branch menu
      models: update to the latest GitPython API
      utils: add branch/rev support to the DiffParser class
      models: add branch/rev support to diff_helper
      GitPython: updated to use Govind's latest GitPython changes

commit a29d12d0b28bb8120db280cc7f26c90d2b870d37 (tag: refs/tags/v1.0.1)
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:46:06 2008 -0700

    controllers: generalized the diff gui for 'Apply Diff From Branch'
    
    The diff gui can now apply diffs against arbitrary revisions.
    This makes it possible to use git cola to do things like diff
    branches, remotes, etc.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 45a91d1c4840b8633ad734ab4744456e79a49340
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:45:05 2008 -0700

    stash: update to the latest GitPython API
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 56d70cd52d90b8f05f06ce4b2a02b9583e147900
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:44:12 2008 -0700

    models: add an 'apply_diff_to_worktree' function
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b6fcad2b34353a773efe1f85eec1898f17e86138
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:43:53 2008 -0700

    utils: generalize the diff parser
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2ccb998dc56a7a1f5debe18e6bc4be66e3561d21
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:43:14 2008 -0700

    ui: add an Apply Diffs From.. option to the branch menu
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b91534b9837cbdd92ce01e8dd3ce746fa98b28d1
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 23 23:42:24 2008 -0700

    models: update to the latest GitPython API
    
    apollo13 changed GitPython so that with_exceptions=True
    is the default.  Also, with_stderr no longer exists.
    Instead, we can use with_extended_output.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fb519a75477f3d3de5d90c08fed04eb6e8efce7c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jun 21 03:13:22 2008 -0700

    utils: add branch/rev support to the DiffParser class
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2cba7e82d49b3fb9b808f38d1bca2ce13c4b8005
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Jun 21 03:11:32 2008 -0700

    models: add branch/rev support to diff_helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b9343825c7743726ad5a22bbe02cd67d2e214c26
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 03:27:00 2008 -0700

    debian: temp hack until python-git has a deb
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e518655a78f487bb147d1e6c00f37a830879334b
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 12 01:52:01 2008 -0700

    GitPython: updated to use Govind's latest GitPython changes
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 447d3d357e66c8dc1dcd0fa44b1d00ce48e6a5ba
Author: Barry Roberts <blr@robertsr.us>
Date:   Tue Jun 17 22:47:58 2008 -0600

    Add simplejson to install instructions

commit 38cff667e4b3d1d71e8b476308dcf7075beb4e2f
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jun 13 03:35:05 2008 -0700

    gui: avoid a win32 ui bug
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f6d08fdcead7f9c6ac651cbdc938f48b54b9b28e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jun 13 03:32:44 2008 -0700

    Added Barry Robert's Window install notes
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2d8ba2cc957dcf8803259601e2c210d6107f8df1
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 12 01:34:05 2008 -0700

    git: use -v instead of --verbose to make older versions of git happy
    
    git 1.5.3 doesn't understand "git add --verbose."
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5cc1a8cefb93a652272e1691f7b3cce9ce599281
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jun 11 01:34:30 2008 -0700

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

commit 9ac35427810fc08245b82a36ac523c30bbcf09dd
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jun 11 01:16:53 2008 -0700

    README: Updated the win32 instructions
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2803194de81675c8835e8142d6c641105da8fc1a (tag: refs/tags/v1.0.0)
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 10 03:05:36 2008 -0700

    git-cola: a highly caffeinated git gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 24b259461d3c6b9f7cba19965d6255da979f0121
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:19:31 2008 -0700

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

commit 5b0991ef7f4cbd7afe74eb0a3e750d13be40b955
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:09:54 2008 -0700

    controllers: handle fetch/push/pull
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1e0aa5688eb643a48f6b17646dd5538deea8ef1a
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:09:41 2008 -0700

    ui: add fetch/push/pull buttons and a spacer
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 59e136dd62e94610fe5c514370a8753452969ea4
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:06:10 2008 -0700

    views: add a RemoteView
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 279d081abc5777056dbc7d166be565e7cf0c4c1e
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:05:38 2008 -0700

    controllers: add a remote controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 08e4c40e5fa5046944372998b64bd5a01b7580a6
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:05:10 2008 -0700

    ui: turn the push controller into a generic remote controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a4fd0305212ff1ade14387e509783761400b3be8
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:04:14 2008 -0700

    qtutils: add raise_logger, optional args to show_output
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 165eece6da5c81dfd67d2ac822c513cb7d89ae4b
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 02:03:52 2008 -0700

    qobserver: add support for optional args in init()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 111ceaae644cb71725a6c10fc42e5924c7ef6cd7
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 01:58:49 2008 -0700

    gitmodel: implement fetch/push/pull_helper()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8705543450e0f0af40db3717104ce710df0333f4
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jun 5 00:26:19 2008 -0700

    Oops, these should have been renamed too.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 11a431f64f54f9bca14ce9264b683b27765a9eb1
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 03:25:49 2008 -0700

    search: add export patches/cherry-pick functionality to search
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ccb8c0d8056d796130b01ad32cfff6853223ffd3
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 03:25:33 2008 -0700

    models: add export_patchset helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 661ee8f5ce2f1dc80dc40885b56d8c7c551c03e0
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 03:24:56 2008 -0700

    ui: finish the search gui, remove the merge button
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 66d8cff3c27d843a2b2b4e669565d0c1f8a97dd2
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 03:24:00 2008 -0700

    stash: don't close the gui on "Remove All"
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9f7c343887dba5d86854397e414e7edbf54a2924
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:58:08 2008 -0700

    views: fix a bug in the view refactor
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ed1d53e2300ff32c3d2d39f7ddc74f1a8eec88fd
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:48:33 2008 -0700

    stash: rearrange gui to save real estate
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 20317453d25cd47520984088b4bafe3335f83805
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:35:45 2008 -0700

    controllers: add a "launch editor" shortcut
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ee1adc1a30c1bc1ea7c0b5bbdeefeb8f63b73df3
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:35:31 2008 -0700

    controllers: add an "edit diff" launcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b7c16bfd250fec7f41e62103a711a041644047ee
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:31:35 2008 -0700

    options controller: update for diff/editor fields
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 73f3d7f47075e0e710248324257ffd1d78b3191c
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:30:56 2008 -0700

    ui: add diff/editor fields to the options gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9a51e1e20884904c2eeb882c66577b2be6754501
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jun 3 02:30:26 2008 -0700

    models: changed some config variable names, added editor/diffeditor
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 200ce7c759b0e90f69075bfcb5780b3a2e5daec7
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 04:06:27 2008 -0700

    README: updated to mention GitPython, LGPL
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 341775b106ccdf8c894c023024beb36d6357ec85
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 03:02:13 2008 -0700

    models: fix a bug in format_patch_helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 199f0776f0c7b53b737988702bcb67c6d01b6152
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:54:05 2008 -0700

    ui: remove some unused actions
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fe3a588bb859a9379115fc01048b8362575540d3
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:52:58 2008 -0700

    ui: add the stash menu item
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dff52419e82819064496e249f45f46822d6d9cca
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:46:08 2008 -0700

    controllers: enable the stash gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3ef83ae3497afb979d9f8a6459d004aeb8ad6c5f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:45:38 2008 -0700

    ui: add a Commit->Stash menu item
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9fe33c71cafc808cbd162e8bc8d188d6fb1c6c1e
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:44:20 2008 -0700

    controllers: add a controller for the stash gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8b5d640dfc3a824ba2c08011a9465508267b93aa
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:43:58 2008 -0700

    utils: add a sanitize_input helper function
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9f7a15eeccd4d49a5b88546d6cf6f31b7305a049
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:43:27 2008 -0700

    views: refactor the view classes
    
    The view classes were all very similar, so a factory
    method was created for generating view classes.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ea6b24d33eede9b1b61cee943b0b1981b9c71863
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:38:52 2008 -0700

    models: add a parse_stash_list helper function
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit abff05d844c5910fbb74ca5a14d09a44d9b0cf79
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jun 2 02:38:19 2008 -0700

    ui: add the stash dialog contributed by Barry Roberts
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f7007fdd46347a799202194f73bd1c9d049692ac
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:28:10 2008 -0700

    models: fix a bug from the run_cmd/GitPython refactor
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9e788bbbd9cfde97384f319122a16e08c772a480
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:15:57 2008 -0700

    ugit: remove python-git in favor of GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b3a030dcd1dc96f18344170db19561ce4793e6a3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:15:37 2008 -0700

    tests: update git-ops test for GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7199cf60bf16fb058b520a7522b5fef576bf99cb
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:15:20 2008 -0700

    utils: update to use GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9044c8c267c2e812053497ad0109cc842dddfa3c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:15:10 2008 -0700

    models: update to use GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6d36b6063bb23be83ce9148bef93dfdd73e5aed5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:14:54 2008 -0700

    git-ugit: update to use GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 11097febd0b85f0782aee618e726783932963cd3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:14:46 2008 -0700

    inotify: update to use GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 274b499c117f2e39b895f4c2156726f845f58e95
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:14:36 2008 -0700

    tests: update git-commands test to use GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d1bea4f0053f22ab9b3592e0dfa39f09535bbc94
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:14:15 2008 -0700

    build: remove python-git in favor of GitPython
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d276dc3b78461f4beac0d1160b13a9d6bbeb56bc
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:13:57 2008 -0700

    LICENSE: switch to LGPL3
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1d13a5d8f7b34ceb9c2051e1d92a5d800721e448
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jun 1 23:13:49 2008 -0700

    debian: update debian version/changelog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2f69b507c7494aee34cdb4ab38505143684e6471
Author: David Aguilar <davvid@gmail.com>
Date:   Thu May 29 13:31:18 2008 -0700

    controllers: fix hang on exit bug
    
    ugit was previously hanging on exit.  This fixes it by
    calling QMainWindow.close().
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 55c56aa7c66b282a58ca4f664b00d256366bec2c
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 27 18:27:06 2008 -0700

    export-patches: use the updated format_patch_helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a74427b99fbade3d0ec7a0c1b4df698d7e017f03
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 27 18:44:31 2008 -0700

    python-git: make format_patch_helper better
    
    format_patch_helper now creates patches that are suitable
    for using with "git send-email patches/"
    
    Commits that are selected in a range are exported as a
    series of commits.  Single commits are exported individually.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dd677777e5eda4a9059dc977a4e53d603d3b442a
Author: David Aguilar <davvid@gmail.com>
Date:   Sat May 17 13:24:50 2008 -0700

    git.py: make "output" a keyword argument
    
    This fixes issues when passing (output='foo', *args)
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2d2d92cd83cb4f9602e775e64d7fdef9e8e8b248
Author: David Aguilar <davvid@gmail.com>
Date:   Sat May 17 13:18:28 2008 -0700

    controllers: fix format_patch_helper usage
    
    The output field is now required by format_patch_helper.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 213ce45335b7486772eec69c54e4275df64490c0
Author: David Aguilar <davvid@gmail.com>
Date:   Sat May 17 13:06:26 2008 -0700

    git.py: fix format_patch_helper
    
    The output variable was being improperly reused due to a recent rename.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 72c90f3cca4267e06fd19b04126d72aefaae3195
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 22:53:23 2008 -0700

    debian: update the changelog

commit a1a6150bea48f0c98886d7e14ddd4111cb6ca930
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 22:40:51 2008 -0700

    gitmodel: ensure we use Model.clone() instead of clone from git.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 57544ec5ed2fd7f55ad87ae7894372a827165666
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 22:36:36 2008 -0700

    git.py: add the "rest" of the git commands
    
    This adds the rest of the normal git commands so that git.<cmdname>
    is available at import time for just about every git command available
    from the cmdline.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9eabca5907a815551a3dff6b6e62cf03f1a7d5ea
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 22:34:35 2008 -0700

    push: rename model params to avoid conflicting with git.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b393c428cf156a7c5c75b18379676dbb534a76d8
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 03:21:59 2008 -0700

    git.py: add a docstring to the git_cmd closure
    
    Even though the docstring is never seen, it still serves
    as good documentation for the module's interface.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 616b49cd7138c4f546d2d84c49fc591024e1bf52
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 03:03:50 2008 -0700

    configure: allow $PYTHON to be overridden in the generated Makefile
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a157fb63adb9937d2a76dc31dbf7aa9f681a7471
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:58:54 2008 -0700

    README: update usage and mention the deb/rpms
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5b5bcf8c518bc00e033daa4f376be457d6948aa3
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:36:14 2008 -0700

    wscript: only check env['PYTHON'] when python versions do not match
    
    When running "configure" the waf script might be running under a different
    version of python than the target for which python we're building.
    We now detect "env PYTHON=/usr/bin/python2.4 waf configure" overrides.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e1bd33f5e51983b8d110fe575ae6c7d5f4cddb75
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:26:00 2008 -0700

    git-ugit: setup sys.path for git.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4694b35f898d009982279310f8df2c3f37920c08
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:12:45 2008 -0700

    python-git: fixed a bug in run_cmd
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5963444b1b7269447f03f8533f8db9475fba1d14
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:08:56 2008 -0700

    python-git: handle filenames with embedded quotes in their names
    
    The git porcelain shell-wraps filenames with shell meta-characters.
    We now detect this and use python's eval() to recover the
    original filename.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1efddbd4cb3dffa48de52f6a5ded251ef49079ed
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:05:48 2008 -0700

    models: move the config functions closer to each other
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b99de6c0696ccd6a8db72ada863fcabac0702cd5
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 02:05:00 2008 -0700

    models: add a comment, fix a typo
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f826db0420a429bbcf71a1461e3e8900028987fe
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 01:44:50 2008 -0700

    configure: allow fine-grained control over python versions
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bd25e7101dc40a1622fd34f50cf37639e5be881c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed May 7 01:44:23 2008 -0700

    configure: always regenerate the Makefile
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 32d4a33b6a4f92edec8768a159f9e54b4004ec08
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 23:09:34 2008 -0700

    git.py: update docstring for run_cmd
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f5485201fb58ce70c93236288fb8728ee23067f9
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 23:09:15 2008 -0700

    debian: install git.py for both python2.4 and python2.5
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e30ccdc0b6e00b66511605f33c521319c3a0c509
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 23:07:50 2008 -0700

    build: add a pycompile shell script
    
    This is a simple script to compile python
    files into .pyc/.pyo files.  It will be used
    by the debian makefiles.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dfa3cbea14219b8c201ac1685c79ea8c62dfe74e
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 02:23:38 2008 -0700

    debian: update changelog with proper signature
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 115f043eda4a28b1c8b7731ccbaa54c5e5d6fc13
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 01:52:55 2008 -0700

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

commit fd1f23c7acadeef5328e8efc37ffce723a5d9708
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 01:48:55 2008 -0700

    python: make git.py globally accessible
    
    git.py is now installed in the standard python
    site-packages directory.  This means that it is
    possible to merely say:
    
    	import git
    
    to access the git.py module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 51a7b47e60da2ecc1331b4218049d2db9adaaaa5
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 00:57:54 2008 -0700

    models: set the global diff context during startup
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 46f2086b26acba44e4a522187180d7bd79ca9211
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 00:52:46 2008 -0700

    inotify: add a timeout to the inotify watcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4d1780983b98f5bcd6c984502efaf23f7fd2d3d4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 00:52:23 2008 -0700

    utils: remove QProcess usage
    
    run_cmd and friends were moved to git.py.
    Make utils redirect callers to git.py for
    run_cmd and get_tmp_filename methods.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8d893bb747555dcd33c9f38bcda14286e6f43817
Author: David Aguilar <davvid@gmail.com>
Date:   Tue May 6 00:09:12 2008 -0700

    git.py: remove all external dependencies
    
    The git.py module is now dependent on Python only.
    Previously, it depended on the ugit.utils and PyQt4.QtCore
    modules.  All process management is handled by subprocess.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 43b4794db74fe9c89157fa6184e59ee2ba76cab5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu May 1 02:39:06 2008 -0700

    tests: add a test summary to "make test"
    
    "make test" now prints a summary at the end of a run.
    "make test" exits on the first error it encounters.
    
    To force running all tests, use:
    	make RUN_ALL=1 test
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d484f1c012549093169e84e0aad0934c52aa70af
Author: Kelvie Wong <kelvie@ieee.org>
Date:   Tue Apr 29 13:50:10 2008 -0700

    Use the maxsplit argument to str.split when parsing config files.
    
    This is so you can use the "=" symbol inside .gitconfig without raising a
    ValueError.
    
    Git seems to parse lines in gitconfig like:
    	work-week = log --author=Kelvie --since=last.sunday
    without any issue, so this seems appropriate.
    
    Signed-off-by: Kelvie Wong <kelvie@ieee.org>

commit 20f00d3579be4e3261ead989d25b8a31ff6511cc
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 28 23:10:40 2008 -0700

    build: gracefully handle a missing python installation
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac00e047a8325cc1bdc29f47d1e0773aed14072c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 28 22:56:54 2008 -0700

    tests: add an import test, update the model api in model-save-restore
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 96e9d4e86e2aea0663b20e89851a5dc496345801
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 28 22:54:54 2008 -0700

    model: load() should import parameters in-place
    
    This fixes an infinite recursion when loading the
    SettingsModel() since that model's init() method
    calls self.load(...)
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fbcf229f33fe02252c14587ddc9e4562d117c4d6
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 07:06:38 2008 -0700

    debian: have the mkdeb.sh script also generate rpms
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3e0a1c933e9b23d6fc6528e812f32f3cf33a2643
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 07:03:19 2008 -0700

    debian: updated release to v0.9.1-x
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 867a8d929f7d9dd0b96093d126bb584dc9d7f6b2
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 06:54:30 2008 -0700

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

commit 7f0d4d05979c981720a8d611a86bb0f1dea02534
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 06:45:11 2008 -0700

    tests: add a test-case for recursive structures
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7c2e986ff3a4fe7d337ca6ae2383186134824f1a
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 06:44:26 2008 -0700

    model: improve the core model to allow recursive object structures
    
    Previously, the logic for serializing/deserializing to/from dictionaries
    did not properly deal with lists of hashes, hashes of lists, lists, etc.
    
    The core model can now handle any arbitrarily complicated structure.
    The core to_dict() routine recursively walks the object structure
    without the need for external data for tracking parameter types.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a9f4f2828c9156b05402d0774c531281e7a492c1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 06:35:57 2008 -0700

    tests: update tests for the new installation layout
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c55ca4dd8fa3353afd86432d302d07d0fdaddfff
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 26 05:05:26 2008 -0700

    inotify: simplify the code a bit
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0e10109cee6d7bb1e64fbb188f7659d38d83c057
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 24 03:26:49 2008 -0700

    inotify: only watch directories
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 346c710374dcc56ad2dbf59496fa74895be1f1ad
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 24 03:26:26 2008 -0700

    use "git ugit" when spawning ugit sessions
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e7573f14594cc3cb9645ee6b60287d7f0137b539
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Apr 24 03:25:30 2008 -0700

    bookmarks: fix menu action names
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 33b05527ef8c0de4ebcb0fe8735bcba61876c725
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 05:22:25 2008 -0700

    controllers: implement a bookmarks manager
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bee3e158963c3685211f54b08d8b59d6c5113757
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 05:21:24 2008 -0700

    views: add a bookmarks view
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 05d7239d7c93aadd58d112b109d1025aa1b6bafe
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 05:21:02 2008 -0700

    qtutils: simplify qtutils.information()
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 90a5e49c0bfcda8433994b7f949df79f31078021
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 05:19:52 2008 -0700

    model: rework model save/restore
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 94d3bc58e82ce6b4119082fed357b85aaa2ea185
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 05:18:58 2008 -0700

    git-ugit: put ugit module path first in sys.path
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4e4f523abb5cd49b6bb43277a1714336bd17570a
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 04:08:43 2008 -0700

    model: fail gracefully when simplejson is not installed
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f00bc8291540999531880d0fab30b77edb8ed169
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 02:53:30 2008 -0700

    ugit: implement file->open repository
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4440eeacee533d4efb048368b46b8b6476289310
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 02:52:40 2008 -0700

    git-ugit: allow multiple repositories on the command line
    
    The following form is now valid:
    	git ugit /repo/path-1 /repo/path-2 ... /repo/path-N
    
    A new ugit session is spawned for each repo.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bf9a846527c3aef9cebd0edeb3367bd1efb49cdc
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 02:23:27 2008 -0700

    git-ugit: improve ugit's command line interface
    
    The following form is now valid:
    	git ugit /path/to/repo
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a12666ae42fa0389f5e249cfbd55f5acc023beb2
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 22 02:22:01 2008 -0700

    git model: bail out immediately when we're not in a git repo
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6317264a462bf4602aa156796b5441f28e92106b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 01:09:47 2008 -0700

    release: update version.sh to better handle tags
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 36739cf1aae7fa1034fcf8c5c75b3b5d78525f84
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 00:52:15 2008 -0700

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

commit 9d86a739ba8cb772498e7911758950d72fab80e0
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 00:52:05 2008 -0700

    controllers: do not require modified files when amending
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 39b72069d9d954786ee560061a1014a233a5eae2
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 00:46:15 2008 -0700

    debian: properly cleanup ugit builds
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ac8236e4261640eece2190c0a7e673ff58099d88
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 00:24:18 2008 -0700

    debian: update build dependencies
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ef78d9422527ebdb3660417d5e8dd3ce31519526
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 20 00:24:00 2008 -0700

    release: use tag-based versioning
    
    we now use a tag-based versioing scheme just like that of the
    git project itself.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d0a839f3ce19132602e9d1e4f2c6fd451ceb54f8
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 19 23:34:29 2008 -0700

    search: add a keybinding for the return key
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ba3716a8f923750d13585d6fe7aedb3141fb45d5
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 19 23:16:30 2008 -0700

    search: don't automatically search when the user types
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cbad8ca2e09d310f515046afafcfe5eccbd80c4c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 19 19:00:45 2008 -0700

    .gitignore: add an entry for the /meta directory
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8a199966d8881226c6c78854c7ff05249236ecff
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 19 18:56:29 2008 -0700

    git-ugit: setup sys.path for the debianized module path
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1c013213a94884d3aa7d794d2a43ee4d4549b940
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 18 01:54:59 2008 -0700

    controllers: raise the editor dock when an item iss staged
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 37c46e6b36fbff884280159d19ff31b2eebc5262
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 18 01:54:22 2008 -0700

    debian: comment the debian/rules
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a4fc242b837fcc27ce48b2086194d1de60d3e187
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 15 03:14:44 2008 -0700

    fix refactoring bug in the search dialog

commit d16c8781e9c3bc3a0c98eaf27fc6e35d71104fe4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 15 02:37:47 2008 -0700

    merge: add a commit checkbox to allow merging w/out commit
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 049bb53ab1d35d7205581c0bec81b807d9ae504e
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 15 02:37:03 2008 -0700

    utils: fix fork() to properly pass argv[0]
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b366d30fe32dc32434967273f1545fbf39c625f0
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 15 02:36:40 2008 -0700

    models: handle loading MERGE_MSG and SQUASH_MSG
    
    ugit now detects both MERGE_MSG and SQUASH_MSG
    and loads them into the commit message editor.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9277ac02288f1e53075c2643ae101b1daad97b7b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 14 04:43:21 2008 -0700

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

commit b651cfc9ebd2a1a25c20167aff3d3db2c7a80834
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 14 04:38:21 2008 -0700

    controllers: added a merge controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 04fd0fb96a3d7d4d3734b0a5f3ef1056537cdd3d
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 14 03:11:06 2008 -0700

    controllers: implement abort merge
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 18e4af2e204bf5c93294ce2a1c805c4471d083c5
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 14 03:10:23 2008 -0700

    controllers: simplified qobserver startup
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7801694f3302f6f8490f8b6ade70963cd29a3ff3
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 14 00:08:32 2008 -0700

    debian: ugit is now debianized
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c4332d4acbafe56a79dd3166c3e3fadb587cc5ba
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 18:20:13 2008 -0700

    gui: added a merge menu
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1ba197e3c24a15d6ade528b832333e7cb357ee7c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 18:14:43 2008 -0700

    build: simplify the win32 build script
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7c760602bacf93d8aff1505795c585c17651d763
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 18:02:58 2008 -0700

    build: use a common.sh file for common operations
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d982638c830a621701a25e5b7127a1c7df3dbf06
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 18:02:25 2008 -0700

    oops: fixed git reset usage
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fab3d8661366326167190743c775709313d672a0
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 07:04:01 2008 -0700

    cmds: add rev_list to the git auto-cmd list
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d053611998a2d97ed366eaa31b86018101dfb99b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 06:53:46 2008 -0700

    controllers: add a quick 'git grep' search menu helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1e5f27ae449a2faadaeb1a79283d316c4fdfe9cf
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 06:52:35 2008 -0700

    win32: updated py2exe-setup.py for the git-ugit rename
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 72bfcc5217885170d92a98017336b5fa65790ae3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 06:52:16 2008 -0700

    commands: reworked to remove hardcoded method names from the model
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ca3dbb5a9be3d43914b87ae93840367699952e10
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 06:50:21 2008 -0700

    README: updated to mention "git ugit"
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 937779e74af53b347d7b21bf6962e4639e56132e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 06:49:35 2008 -0700

    qtutils: add a simple input dialog helper
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9c8726e5d9af96706526ba1c5dead5d86200a438
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 04:02:01 2008 -0700

    release: version up to 0.8.13
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 134cbcd90faa6ba9683798a50f6ec19cf1177515
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:58:39 2008 -0700

    controllers: implement search by committer
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cc2342eff4e9cd9aba9a10430723ba6c8d933983
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:58:20 2008 -0700

    controllers: implement search by author
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit eddec93589992887e286a3534ec1c5efe2ff6cca
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:57:47 2008 -0700

    controllers: implement search by path
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e68feb7038e06cd6f4095467a7f036494a07092e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:56:50 2008 -0700

    controllers: implement search by diff contents
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0df6ec29c1bd348e861f22f97e89a296cb69faae
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:55:33 2008 -0700

    controllers: implement search by date range
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 74ce1283846e3d411634e5a23cec557f3a6fc9fc
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:54:04 2008 -0700

    controllers: implement search by commit message
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b626ccced9691278bff2c7fcc7d4f55f9c62c23d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:53:04 2008 -0700

    controllers: implement search by revision range
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 3df0ba07f37d25048978e64a4c4d864a78351c16
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:52:14 2008 -0700

    controllers: remove the old search-by-revision controller
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1dc74c857674f91d1edb4c0054ec3e74fcb91bf3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 13 03:46:13 2008 -0700

    controllers: implement search by revision using the uber-search dialog
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d1ce3d03e70b7dcb8e11ce7be998579e951e181c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 06:23:24 2008 -0700

    controllers: implement search by revision range
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 973f6d43df2b90f7ca7bbbf966a407c0744d10c3
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 05:05:19 2008 -0700

    qobserver: add_actions syntax sugar
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0cac58142402b2c593420a3a34069827929d602b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 04:04:44 2008 -0700

    gui: renamed the gui modules for consistency
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ddf46de2245c6a8cd7509d61b366f1592b3a33c2
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 03:44:35 2008 -0700

    cleanup: remove some unused code
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a25deac906845bba8a2853eb5e36930adb735cde
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 03:44:20 2008 -0700

    layout: move views and controllers into a subdirectory
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c8f0b5b1175948b0303de7d685acfae6e489850c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 12 02:20:06 2008 -0700

    Add a merge button to the uber-search gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 39a0bdc3f27828a2c2a6b2af50623eefe7066b58
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Apr 8 00:34:04 2008 -0700

    ui: created a search dialog gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f0644cbeb22fcbae103e840405440802a2984707
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 7 02:44:23 2008 -0700

    controllers: rename "find" to "search" in prep for search menu work
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 6cc000c7ccf5afa918df9766bf0ad8fbbb6b79ef
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 7 01:48:05 2008 -0700

    controllers: improve the search by revision functionality
    
    double-clicking in the revision list will now run
    git format-patch on the selected revision.
    
    some small quirks with the ui were also fixed.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e058abbd3e4a41407be4132f5a2170112134111a
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Apr 7 01:46:12 2008 -0700

    gui: add the proper menu action names for later use
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bc4fe64a4c0ef2010b60ea1953b75b4107fda6d3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 06:38:49 2008 -0700

    s/log/log_helper/
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 61d224db37f1242f60187bf04c5b47b54cfab496
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 05:34:30 2008 -0700

    cmds: dispatch ls_tree and s/parsed/parse/g
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0f889991bd08e2ead1575385f3db00807d6b2b42
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 04:25:16 2008 -0700

    release: version up to 0.8.12
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b43aef3383061bc334110388a182002e808b9739
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 04:09:58 2008 -0700

    cmds: use the dispatcher with git push
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bb35347183891edf0672eadc94eca9b12b171be8
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 04:07:49 2008 -0700

    cmds: use the dispatcher with git log
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f6b3e091dba80ae2d28446cf16ffe6d486f2817e
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:57:58 2008 -0700

    cmds: simplify cherry-pick by using the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7e1014b1888596d01e28b36e645116ae1e37b7cc
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:47:51 2008 -0700

    cmds: teach format-patch about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit bf230dffe7d107a3ac6699da4806574b0399bca1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:40:36 2008 -0700

    cmds: teach checkout and remote about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1868f607a7b20573808b74150200b00b7c16ec2b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:39:45 2008 -0700

    cmds: teach apply usage about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0d0ab3f7b76109cdd73c3bfc2e42fd146fc50358
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:39:05 2008 -0700

    cmds: teach diff usage about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dd90636a572e926b962700d40b6ada7a4b30776b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:35:54 2008 -0700

    cmds: teach cat-file usage about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 549f512bfebf5d426d13c0c44344e6b686d11186
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:34:26 2008 -0700

    cmds: teach ls_files usage about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7fa23fd86d04663f1a1a49373bf0e6e4a4332bed
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 03:33:18 2008 -0700

    cmds: teach add, reset, and rebase about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 86392d8da559c5295c92878370621423dcf1c351
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Apr 6 02:23:55 2008 -0700

    cmds: teach config handling about the comman dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 20d4fe0c90d4f23b6086ce643fece7344af30e38
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 19:02:02 2008 -0700

    tests: add git repo tests
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 50095592bbfc0dbf5c64bc050ca1a15e9d5a9a5b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 19:01:31 2008 -0700

    tests: add a "make test" target
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit dafd93f819d78627e89c5365f5929e8607cd0eac
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 19:01:15 2008 -0700

    tests: add a testutils module
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ad725436830f62f4d2d2cd815cad590eb53bfbec
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 19:00:41 2008 -0700

    oops: fix rev-list by range
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 459ad5340d2ddc949145632d5cedba6fb37edf90
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 18:59:12 2008 -0700

    cmds: teach git.commit about the dispatcher
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 84bd89972d7d9035a1e39865a78e9ac75bbbe2e7
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 16:56:40 2008 -0700

    clean up the comments
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit ba27341facd352b0e7dc60a647d758af4402bad8
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 16:56:06 2008 -0700

    Make the status parser use the gitcmd dispatcher and rename it to parsed_status
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 64217dc17218e4bb926379642e1a0efda0eeb11c
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Apr 5 16:54:47 2008 -0700

    git.py: create the command dispatcher earlier in the import phase
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit b9b8d1b522009d9028749743c3046c564cbde918
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 4 03:40:58 2008 -0700

    git.py: use a dispatcher to allow for more dynamism
    
    The goal of these changes is to allow runtime creation
    of arbitrary git commands.  e.g. git.branch() should
    return the output of "git branch."  We do this by
    using a module dispatcher/__getattr__ to intersept
    attributes.  Eventually, the git.py module should
    be very tiny as the hand-coded methods are
    phased out.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit a319f866c91264800200d00d8e5f65b0ea3804ce
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Apr 4 03:37:06 2008 -0700

    tests: add a run_tests convenience script
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 7be70df4db1e51f63aeab2ba9df3f55e3f4b57a6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 2 03:14:55 2008 -0700

    gui: finish the search by revision gui
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 88ffa84bce847e8e641b829c0692472e30814ab1
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Apr 2 02:45:54 2008 -0700

    Vastly improve startup time by reducing notifications
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d0c295d1b5054dbaafd5c0add4e63626b85a0855
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 31 01:34:09 2008 -0700

    utilcontroller: improve find by revision
    
    Find by revision now returns multiple results and
    allows the user to browse the found/matching commits.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2da2f63fa6a030c4117160af8d0117b1ed1ef30a
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 31 00:52:18 2008 -0700

    gui: clicking on a file now raises the diff gui
    
    ugit now raises the diff dockwindow when the view_diff()
    action is triggered.  This works regardless of whether the diff display
    is a standalone window or if it is in a hidden dock tab.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 931b711b2471ff1f41ae37479c7cc6ba0a6ce208
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 31 00:48:43 2008 -0700

    ugit: add --version and --project options
    
    ugit can be launched on projects in a different path
    by pass --project /path/to/git/repo.
    
    ugit --version now reports the current ugit version.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit af39d7b2a87c9fa12df201deda47186a9168b4b6
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 30 16:59:29 2008 -0700

    release: update ugit version to 0.8.11
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit edd9f09d338787d9257cb61f9626d37fb0cab90d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 30 16:50:01 2008 -0700

    ugit: remove the .py extension for git-ugit.py to make completion look nicer
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit da992c5eac3105680c26e920b0118e745e3d02e4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 30 16:28:17 2008 -0700

    gui: remember the saveatexit setting on first use
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f6ac00fd239313c33159893178fd1d7aa95bece2
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 30 15:33:35 2008 -0700

    gui: cleanup the interface by auto-setting the status view splitter orientation
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f865c21531cbbae3080c9bb7d886c1279574879b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 30 14:53:57 2008 -0700

    maint: move TODO into the maint branch
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 2d00b07a1df53412ccc2e4a115e58f2f23fc3031
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 04:37:20 2008 -0700

    release: update ugit version to 0.8.10
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1bdf4a84857216a5d652d8fd7a6a2a24df61bd1d
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 04:34:30 2008 -0700

    gui: improve the default layout
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 134d8fd62d6735fe4aa80196d44a6d7ea5ff0b26
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 04:34:05 2008 -0700

    build: properly detect dirty work tree in gitversion.sh
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5e13fd7b1187ff970051dbe811e07ba863775264
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 03:05:44 2008 -0700

    build: add a git revision id to the ugit version number
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 1635615135267f0856c31ef7e43120626d520667
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 00:10:56 2008 -0700

    build: update build-win32.sh script for ugit rename
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 82fec5a1ab96c6285f4cd847a8c97f913c162d6c
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Mar 26 00:02:30 2008 -0700

    Renamed 'ugitlibs' to just plain 'ugit'
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 388824acc429b0d465cfd8a36061255f19bc986d
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 25 21:56:09 2008 -0700

    configure: match git's shell script style
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit cbc48ae7994adce997ff06d97ab41ec01b1a2016
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 25 04:24:09 2008 -0700

    gui: improve layout options
    
    The gui is now fully fluid.  Widgets can be placed anywhere and
    torn off separately.  The "Horizontal Status" checkbox now controls
    whether the status view is layed out horizontally or vertically.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 56d68e4ab72c757c3a69eaed238e102d6ef8eb2d
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 25 04:03:49 2008 -0700

    gui: allow torn widgets to be on top
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9ebcda2f631cd832f3bb90fd6260e5228f31afaa
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Mar 25 03:47:53 2008 -0700

    Improve the config option handling
    
    ugit now supports a flag to enable saving window settings:
    ugit.savewindowsettings
    
    whether to save these settings at exit is controlled by:
    ugit.saveatexit
    
    The git config interaction was also refactored so that the config
    parsing is done entirely within the git module.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 33cbe8a6444bd4a3253ac50b57f9bccb0e09b711
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 03:37:06 2008 -0700

    gui: remove splitters and add a dockable layout
    
    The main gui now has a fluid layout with widgets that can be
    arranged and docked/undocked at runtime.  Support for saving
    layouts will need to be reimplemented.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 8d9e90e5aca9bbbf3a460df93595927590660a6b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 03:02:41 2008 -0700

    git: update 'git config' to use the refactored command line handler
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c0162c39f0663ecd5a1ab30cf551f414c6063e78
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 01:22:50 2008 -0700

    release: version up to 0.8.8
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 27b02d903863f57c01563b2cf72e09b3eeb7b337
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 01:21:37 2008 -0700

    model + controllers: fix bugs from run_cmd refactor
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit f2a8d5b38d7997e8769cf2812f14f8b0573ef409
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 00:22:20 2008 -0700

    model+controllers: renamed changed to modified to match git terminology
    
    model.get_modified() should make more sense than get_changed() since
    modified is how git refers to these files in the documentation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 285e83072644836c2172a824eae476a8b38e9d41
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 00:17:17 2008 -0700

    git: simplify command line interaction by refactoring run_cmd
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4d68fd54cae011f04e294b6336cdbed2df826204
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Mar 24 00:16:09 2008 -0700

    controllers: fix reselect-on-rescan logic
    
    The initial version of reselect-on-rescan was using the modified items
    from the model instead of modified + untracked.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 64836d720d52c674f88f9236bf5c9b8f941121c1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 23 20:30:02 2008 -0700

    Teach the release scripts about ugitlibs/defaults.py
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 5061f1642ab3c605ecbc1ac9bac23f981cd543ca
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 23 20:16:32 2008 -0700

    build: teach the system to use defaults.py for version info
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e00be9bc9f0918ad71fa1c18ae30f4ffef5bc929
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 23 14:15:37 2008 -0700

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

commit 75633bebde7faacaf591a886b89c8d35ed311bd4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Mar 23 05:48:14 2008 -0700

    Increment ugit version to 0.8.7
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit fcd011021de89b1d0f59f4e83aa926fa4a243d2b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 22 03:04:56 2008 -0700

    controllers: save and restore listview selection on rescan
    
    We now restore the active selection when rescans occur.  Previously we would
    lose the selection list and the scrollbar positioning.  All of these are now preserved.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 74a65e1247b7e6f49374f9002dd3202b6f7a243a
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 22 03:03:34 2008 -0700

    controllers: trigger actions when listview item icons are clicked
    
    Clicking a file's icon in the listview will now trigger the same action that
    would happen if the row were double-clicked.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 00c49f2d3342824b4f8c0565b4f972d7915e76ef
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Mar 22 02:55:36 2008 -0700

    views: set alternating row color in main list widgets
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit e455dddd21fd935ae0aca257e17b7e727188c093
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 25 01:30:07 2008 -0800

    Increment ugit version to v0.8.6
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit d98bf524ed031a98a3730c587e166a2ef6e549aa
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 25 01:20:14 2008 -0800

    Add a context menu to the unstaged item list
    
    Right-clicking on the unstaged item list now displays two menu choices:
    Stage Selected
    Undo Local Changes
    
    "Undo Local Changes" checks the file out from HEAD, thus dropping all
    uncommitted changes.  The user is prompted before proceeding with
    this action.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 0c42bd8dc50702f51fa1283a57782b2fea8e6a69
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 25 01:13:04 2008 -0800

    Allow git.checkout to take accept arbitrary arguments
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 9a4d530126234ecc808427a3c310294356778c02
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Feb 21 03:01:39 2008 -0800

    Updated build scripts to use the version defined in the wscript
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit c5edd7b961c6c583dc5946ba2b4407d23599b88b
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Feb 20 23:44:18 2008 -0800

    Fix the non-ffwd push operation
    
    This fixes a bug where a non-ffwd push cannot be performed when local_branch == remote_branch.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>

commit 4993d66235aa9c23660137aa8eed681bd6bd6afb
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Feb 4 23:41:06 2008 -0800

    Fix signoff message

commit 24e3823390c6c6f2761d975a3a1b7158a60eacd8
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 27 01:33:01 2008 -0800

    Use more robust regexes in the status parser
    
    The 'git status' parser now uses regexes that are not dependent on
    the variable whitespace present in git's output.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 2e990b99381f9b00f31e9e54a53ff3bdb2a34079
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 27 00:57:20 2008 -0800

    Properly handle newly added files
    
    This fixes the incorrect "new file: " regex.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit ad06fa452366b85c061439923d1be72d3f016bc9
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Jan 21 17:04:56 2008 -0800

    Added support for py2exe thanks to Sebastian Schuberth
    
    ugit.py was adjusted to account for __file__ not being available when
    using py2exe.  The py2exe setup scripts were provided by Sebastian for
    inclusion with the win32 release.  scripts/build-win32.sh was adjusted
    accordingly.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit c66b09440f26fb99923dff60d4b3774db2c7e65f
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 20 17:22:14 2008 -0800

    Refactored the QObserver API
    
    Subclasses are no longer required to call model_to_view.  If the convention of naming
    view widgets the same as the model's parameters is followed, then a lazier
    add_observables call can be used.  This is now used consistently throughout ugit.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 2d033e1a3a9c0ef72b8d9a799aa62c372cc12eda
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 20 17:09:55 2008 -0800

    Renamed controller.log_output(...) to controller.log(...)
    
    Renaming this method makes the naming consistent between the
    controller and qtutils module.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit a5c54b49ca3ec321c662b3925ae19dc6195849f5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 20 14:01:50 2008 -0800

    Improved Windows support thanks to Sebastian Schuberth
    
    script-ugit-cygwin.sh had a typo.  A better solution (that works on both cygwin and msys)
    was proposed and added as ugit-win32.sh.  That script replaces both of the old ones.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit f7a752918d48257116a59f331c3bfb5eb759f368
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 05:02:35 2008 -0800

    Increment ugit version and enable the default icon
    
    ugit v0.8.2
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b2196287089a59882efdd0761812a4a8e7621b04
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 05:02:00 2008 -0800

    Don't enable the diff gui when displaying the index
    
    The interactive diff gui menu actions were still enabled when displaying a diffstat or
    index.  The controller now tracks whether it's ok to enable patch selection,
    and disables it for diffstats/index views.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 4c541ad1d70427cedc19416c8a49cc1ef453f822
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 04:42:30 2008 -0800

    Add a "Show Index" menu action
    
    This action displays the current state of the index in the diff window.
    Basically, a syntax-highlighted view of git diff --cached --unified=<n> --stat
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 777588a38e033205840d8c30816ccfc3e9ade7af
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 04:37:09 2008 -0800

    Always close the logging window on exit
    
    Previously the logging window had to be closed independently of the main dialog.
    This fixes that.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 1dd228f2f7f7f332ad1993735f6255916ccf4bcc
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 02:57:39 2008 -0800

    Add syntax highlighting for diffstats
    
    This patch teaches the DiffSyntaxHighlighter to highlight git diffstats.
    This was purely done by adding a new rule to the highlighter.
    The GenericSyntaxHighlighter was also fixed to allow empty matches.
    Some of the format variable names were changed to improve readability.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 11a2afa6a17dfaaa5f72ebf702fd131b4f1b3cb7
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 15 01:41:00 2008 -0800

    Refactored QObserver class and removed lots of code
    
    Any invocation of add_callbacks or model_to_view will now automatically handle
    add_signals invocation for the widget of interest.  This removes almost every
    explicit call to add_signals.  autoconnect() methods were added to the QObserver
    to help facilitate this functionality.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit cb85b72bda7b280345d4c114a7e617b7be37be85
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 05:26:57 2008 -0800

    Update the controllers to use the action dispatcher
    
    Now that the action dispatcher properly behaves, update the controllers to use it
    instead of using direct Qt signal/slot connections.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit ddd433a3021451db379ed992a75af0869606db8c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 05:25:28 2008 -0800

    Properly undo changes when cancelling out of the options gui using the ESC key
    
    Previously, hitting ESC to exit out of the options gui was not properly notifying
    the main app about needing to update/revert the fonts back to their original values.
    This fixes that problem and removes some code by specifying the connection between
    the optionsgui.cancel_button signal and the optionsgui.reject slot in the ui file.
    We then catch the reject signal in the controller and handle that.  The reason it
    didn't work previously is that we were only handling the case were cancel was pressed
    instead of explicitly handling the rejected() signal.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit f653ab09ed2d288b96a9a5c2dfaafb0a9c7678c1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:33:06 2008 -0800

    Use default font names that are recognized across more platforms
    
    Using "helvetica" and "*mono" as the font names is better since
    those are understood and translated into their native variants
    on both Linux and OSX.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 51291e33f49edfd33484857a5765c4a8ecefad9c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:21:18 2008 -0800

    Fixed the QObserver's action dispatcher
    
    Previously, actions were only launched when there was a mapping between a model
    parameter and a view widget.  Now, it is only  necessary to register an action
    with add_actions--model->view mapping is optional.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b1346208726f608caefebe7f2887c2ad27cd0731
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:17:58 2008 -0800

    Use the preferred monospace font in the commit text widget
    
    This makes the commit text widget and the diff display widget use the same,
    user-specified, font.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b543bf36144a144847762c89208a9a2588762d0d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:16:37 2008 -0800

    Log the failure to import inotify instead of notifying the user with a messagebox
    
    Previously, if python-pyinotify was not installed we would we present the user
    with a messagebox informing them of this fact everytime the app is launched.
    This changes it so that the nag message is only printed to log only.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 2f4959f80a1a5bb22dc23c58510b4a0e1a882ea4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:13:35 2008 -0800

    Set window sizes and default fonts
    
    If no font is specified for the font combo box then no font will be listed for
    the diff font.  Set a selected font so that the field is always populated.
    This only affects the case where a user has never previously selected a font.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit f49cfa34532307ff579fd6819db979c2bafa073b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 13 04:07:38 2008 -0800

    Change the log window's font colors
    
    Use bold+black for informational: lines.  This makes it easier to see the note versus
    the informational text.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 0d7acc37d3797b390a6426781b7730c21def2028
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 9 04:55:35 2008 -0800

    Never return HEAD as a remote branch name
    
    Listing 'remote/HEAD' as a valid branch is not very useful,
    so let's remove it from the gui.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 51534988df10653b371463eaac7fa9ba843448a4
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 9 04:45:48 2008 -0800

    Removed line-wrapping from the commit text field
    
    Removed the line-wrapping so that it's obvious that the commit
    text editor is WYSIWYG wrt commit messages.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 843a46874244e647173627daf8e0fa051da969c7
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 9 04:30:59 2008 -0800

    Add a gui for displaying arbitrary commits/blobs/trees
    
    Added Repository->Show Revision
    
    This menu item lets you search for revisions using a text input.  The first revision matching the query string is displayed in the gui.  If the sha1 doesn't match any commits, we look for a blob or tree that matches the sha1 and display it.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 4c1e003497fb7452eda42e8e5691233daeae4a1f
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Jan 9 01:54:24 2008 -0800

    use \n instead of os.linesep (unix wins the crlf battle)
    
    After the crlf fervor dies down we can add support for whatever crazy scheme is needed on windows.  until then, unix wins (and so does \n).
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 56f529b0285ad812b073a196f14dbee3a16bf5f5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Jan 6 04:01:21 2008 -0800

    Make the gui friendlier to tiny displays/resolutions.
    
    Without a minimum size set qt wouldn't allow the diff display to size itself down too far.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 8dd5033daf19a19d6dc22b8c5d04718819427129
Author: Marco Costalba <mcostalba@gmail.com>
Date:   Sat Jan 5 10:30:55 2008 +0100

    Add a missing space in 'inotify support' message
    
    Signed-off by: Marco Costalba <mcostalba@gmail.com>

commit eebdf4a3c6241771fdb1e06d057757a00b7b4637
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 4 04:28:18 2008 -0800

    Tweak the log output colors, add a window title
    
    Changed the info:message color to be blue:green
    Ensured that the command output window is titled.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit dc1f431728a2ccc74238eb610a6b403c3dd8747b
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 4 04:16:45 2008 -0800

    Change the qobserver's notification order.  This fixes a bug and removes code made unnecessary by this design.
    
    We now change the disabling of model notification in when setting Qt widget params instead of when setting model params.  This undoes a previous fix that was added to the options controller that would refresh the historybrowser line in the options gui.  That code is no longer needed with this change.  An added benefit is that the interactive font updating is fixed/enabled with this fix.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 0009e8ecd3f9bdc00b61a2c5f508157f2eaea2a3
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 4 04:12:25 2008 -0800

    Prevent users from selecting "HEAD" as a remote branch target.
    
    We should never push to HEAD, so prevent selecting it in the push gui.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6ecc99d4c22063806ce1b95c1f0f4a057c5696e3
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 4 03:31:50 2008 -0800

    Add a read-only browse commits option and set window titles for export patch and cherry pick guis.
    
    Previously all of the commit-browsing guis (export patch/cherry-pick) would have the title of "git commit browser".  The title is now set to the current action.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 9449ff8185125386a01afcc0967811073429ad74
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Jan 4 03:28:24 2008 -0800

    Fix layout for maximized windows
    
    We now set minimum sizes for many widgets so that the gui can be sized smaller than before (if desired).
    Marco noticed some layout issues when maximized.  These were fixed by changing the size policies for the widgets.  Overall, the design is better in that widgets are being used  to contain layouts instead of using nested layouts.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 03e8c1f68e20dfa67b8f520d49f1884cade5b9c5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 04:37:34 2008 -0800

    Make the historybrowser config setting show on restart
    
    Renamed the historybrowser config name to match the other config names.
    Added the historybrowser parameter to the allowed list so that it is serialized into git config.
    Added the historybrowser param to the refreshview method of the optionscontroller so that it is properly read on startup.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 34661f0550f20c475ca293492f25401ae042a3f1
Author: Marco Costalba <mcostalba@gmail.com>
Date:   Thu Jan 3 13:08:17 2008 +0100

    Allow user to choose history browser tool
    
     Instead of hard linking gitk let the user set
     the preferred history visualization tool in settings dialog.
    
    Signed-off by:  Marco Costalba <mcostalba@gmail.com>

commit c69f7ac51fcd6631509e71b203a06dce6b64834d
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 04:10:01 2008 -0800

    Better/more logging
    
    More commands report information in the log window now.
    Disabled whitespace checks in the commit browser.  They're always turned on in the diff gui, which is where it really matters.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 3130210f09e5351c2fc65288d53ad3d3006f6dc8
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 03:15:50 2008 -0800

    Log window improvements
    
    Added onthefly search to the logwindow
    Better maingui ui for the splitters
    Another unittest
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit e466fa79e6d620e4059b4433a64d1c220bba4e81
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 01:09:20 2008 -0800

    Updated release scripts to account for the new homepage
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 99a9dabd965ecd31a385ef8d447184c650acf42b
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 01:07:31 2008 -0800

    Make the OutputGUI's log method always put the cursor at the end of the document
    
    We previously made it so that the OutputGUI's log method always sets the cursor at the beginning of the document.  This isn't that nice since the side-effect is that the document gets scrolled to the end.  Let's keep the cursor at the end so that users will see the end of the log (which is where the most recent/useful information is found).
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 342ca06050d2fef527493eb8e008af2f8228f249
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Jan 3 01:02:04 2008 -0800

    Added a log output window for use anywhere where output is presented to the user.
    
    Squashed commit of the following:
    
    commit 06f4dc70817f9178ca4086c0ee52c9fee41852bb
    Author: David Aguilar <davvid@gmail.com>
    Date:   Thu Jan 3 01:00:11 2008 -0800
    
        Fixed some corner cases in the log find functionality
    
        When logging output the cursor defaults to the end of the document.  This made the search method hit the end of the document before ever trying any searches.  When doing OutputGUI().log(..) we now reset the cursor to the beginning of the document.
    
    commit 17858c1367fe8ce9e1760ec7055edbd128db210a
    Author: David Aguilar <davvid@gmail.com>
    Date:   Thu Jan 3 00:35:44 2008 -0800
    
        Add a syntax highlighter for the log window
    
        * Generalized the syntax highlighting logic into a GenericSyntaxHighlighter class.
    
        * Refactored the DiffSyntaxHighlighter to use the new generic highlighter as a base class.
    
        * Added a new LogSyntaxHighlighter which is also based on GenericSyntaxHighlighter.
    
    commit 41c6a104bbaa9d5eb4f556692c66e40307346179
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 21:42:20 2008 -0800
    
        Removed line wrapping in the diff display
    
    commit 1f72566562c90170667b43ef8d2a67bdbd8eb77a
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 21:30:12 2008 -0800
    
        Added an output log window
    
    commit 8bedf5b90b9e3fcf8a06a97e526c22f8456f498c
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 19:00:36 2008 -0800
    
        Updated README
    
    commit 108744ec87a197749d478c7a4bd62a05d7e79095
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 05:48:05 2008 -0800
    
        Added a first draft of the logging window
    
    commit d5c78d616b6f9656a7df063a6bd97477ae5d76c5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 05:07:58 2008 -0800
    
        Renamed GUI attributes so that everything follows a names_with_underscores style.
    
    commit 713a88a125ebb84b607675ff1c3840d691812f65
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 00:54:44 2008 -0800
    
        Ensure the toolbar defaults to the bottom of the screen, but allow nesting at the top
    
    commit 2e905b798ef251f4aef30cb957c61fceb3e1537f
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Jan 2 00:29:15 2008 -0800
    
        Removed the statusbar, replaced with toolbar for the log window
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 4c248fb61613d8faded5c857753ab78f3fa84438
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 1 09:10:12 2008 -0800

    Mac OS X UI tweaks
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b96cc16811d7ede2c495321d437747f6e881f222
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 1 09:01:07 2008 -0800

    removed model.clone(init=False) hack
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7952b401e0cbab4b113263a68d97ba55d2d6fd11
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Jan 1 08:32:02 2008 -0800

    Added option edit/save support via git config.
    
    Squashed commit of the following:
    
    commit ed32c76a8fb4164d93198503c791ff3ed56850a4
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Jan 1 08:28:22 2008 -0800
    
        Remove model.clone(init=False) hack
    
    commit 2c3518bd55648c23ea86d1165945f4cd398b6049
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Jan 1 08:17:37 2008 -0800
    
        Use the preferred diff font in the export patch gui as well
    
    commit caf530dac6ad625b9f74ff34bedfae7cc0925f9e
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Jan 1 08:17:06 2008 -0800
    
        make the repo browser look a little nicer
    
    commit 4e14d807e8e50af8326cea67c15490435b734887
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Jan 1 08:16:35 2008 -0800
    
        Improve the syntax highlighter
    
    commit 499d03d78ade84f37705fe60232c39e069054893
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Jan 1 07:49:51 2008 -0800
    
        Implemented an option save/restore interface to git config
    
    commit ca7c0fc78b54fa05f18ee0c90fdba0d8cf8f081f
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 31 22:40:05 2007 -0800
    
        More config system updates

commit 8f452cb1f7054bd7c8a6c2467989986163502ad4
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 21:47:39 2007 -0800

    Added interactive font selection and update

commit 16d606baa37f2aa6bc36b15aa230d70b0010937f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 20:37:08 2007 -0800

    QFont handling for the qobserver class

commit 49f433209e507e045974e35ffd2276c31d3ee6cb
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 19:22:29 2007 -0800

    core improvements for config handling

commit a39223afb78acc6a4af67c419e5ecb8a031810b1
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 15:12:27 2007 -0800

    i18n for the options dialog

commit 87ef0c5732a0327abf59bfb63f4ad3f2edc049e9
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 06:36:26 2007 -0800

    Model improvements for config load/save

commit 713b5eef4099a98c0f46086affd2acd36c4854e8
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 06:19:44 2007 -0800

    Remove some unused data and small fixups

commit 40ca7b3caafe8c338acf7ce75cbfb2a555fd59fd
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 04:10:48 2007 -0800

    Update model classes and add a model testcase

commit f2023d0cb52dd0922aa924b3d7b9e30692055128
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 01:45:33 2007 -0800

    Simplified inotify

commit 8fe35787d44390ef8562264965b4aa8b2ab44c46
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 01:29:21 2007 -0800

    Revamp the models for config reading

commit fa2820c4f68c767978b4eaa2ffa8a51fd8696361
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 31 01:28:45 2007 -0800

    Rename a couple of controller methods

commit 7f004fac1b7aa78a9255918f1570969808a82d91
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 22:13:36 2007 -0800

    Fixed inotify so that all events are dispatched back to the main thread via QCoreApplication.postEvent()

commit 0927008f84e77cec431b015ccb3fa196b14cb2a8
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:34:09 2007 -0800

    Make most of the guis modal
    
    All of the guis (except for the repo browser) are now application-modal.

commit eeae5d3db70c4ad9e51bc9d224305bdfc9b16f2c
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:31:59 2007 -0800

    Update ugit version in the makefile

commit bc1b89d3c2d75456e96450294eb62da9ba066159
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:31:31 2007 -0800

    Add itemclicked callback to the push and createbranch controllers

commit 52def8364a62d93161818e44d5d85c6fd63a19cb
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:24:01 2007 -0800

    Avoid raising an exception when a child cannot be started.

commit 4b6f10231ee6db3720f34a8ad613e2d8647dbf52
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:23:11 2007 -0800

    Accept a nicer syntax on the callee side for qobserver.add_callbacks
    
    Add_callbacks originally required a dictionary as its input.  Now, it uses **kwargs as its dictionary so that the key=value pairs can be specified directly.

commit 6f8a6a6c5cb4fb713a4acdbafd47f9e65ce99938
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 21:05:25 2007 -0800

    Start separating global and local config settings

commit c84b05142de9fd1086e4a8754772d4bd8c585ff5
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 20:52:12 2007 -0800

    Finished the option gui

commit fd99b7389f2c268b76850af1830c9bdc3e9b473f
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 20:50:09 2007 -0800

    Changed the create_new_branch method's signature to be consistent
    
    The calling order was changed to create_new_branch(model,view) which is consistent with the other gui helper methods.

commit e9c39890172dce985d98894cc64623e3f7f91d49
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 18:24:17 2007 -0800

    Prep for options menu
    
    Renamed some gui classes so that all gui classes have a GUI suffix.  e.g. PushGUI.
    Added a stub options menu
    Enabled options menu callback

commit 5a36ec6752758722341fe96a340bfa6f9cd23f00
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 16:17:31 2007 -0800

    nice ui tweak

commit e5c8f2df82a901970c9bc0dd8d9c504024422fb4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 15:28:18 2007 -0800

    build fix

commit 98c52056e5a0d74f72a855b95e4f16c3af8802c1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 14:19:43 2007 -0800

    patch export enhancements for merge commits
    
    Selecting a merge commit in the patch export gui will now export all of the merge's individual commits.  Selecting any of the individual commits exports just that patch.
    We get this by always passing format-patch a rev .. range expression.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 66c92acb3d5a0f60b3e6edd006161191dbd53f60
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 30 12:36:43 2007 -0800

    Make the commit browser properly handle merge commits
    
    The commit browser was not properly checking if a commit was a merge.  In those cases, it would not display the entire contents of the commit.  A new method was added to handle this case and hooked into the utilcontroller.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 992e810a478dfe9670a4161830883d21035cb1d9
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 29 18:13:42 2007 -0800

    Refactored several methods out of the main controller.
    
    Added a utilcontroller module to own simple dialogs such as choose_branch
    Moved select_commits into utilcontroller
    Moved browse_git_branch into the repobrowsercontroller
    Removed lots of view classes from the controller module
    Sped up the push dialog's init time by asking the config system for the remote url
    Speed up cloning by passing constructor args to model.clone()
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit ea83cae50b64a75c6f215ceeb43100fb2c487cf1
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 29 07:57:04 2007 -0800

    Refactor methods to allow more delegation to the model and view
    
    Removed all dependencies on non-model modules from the controllers.
    Removed usage of python's commands module.
    Moved several model-centric methods into the model.
    Added some helpers to the view classes.
    Pushed most of the diff analysis/processing into utils.DiffParser.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 95060895766cf05c9936c0d4067c8c1674975b38
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 29 07:03:12 2007 -0800

    rename cmds to git, refactor git calls
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit a29151bc4790500b6f4f61ed2d86213d83a123a7
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 29 03:21:04 2007 -0800

    Speed up push/createbranch dialog startup time by re-using existing data
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7a71feea5ae11c33eaced1a1e937874f2cb3411b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 29 02:57:42 2007 -0800

    Renamed classes to remove unnecessary prefix.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6a0f0302494579edd4f4ab0ebc571c8a102cd2db
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 20:42:00 2007 -0800

    Use os.listdir intead of ls
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 02c1ecd6ae37a22a979446d934dd2250f227ac65
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 20:41:12 2007 -0800

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

commit c16dfea4a9da51f558a7ec3446caf78b774c8318
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 18:56:26 2007 -0800

    Properly handle merge commits in the export/cherry-pick guis
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit d3ee251795fb96888f42e50ff1068b1e81115a56
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 18:36:30 2007 -0800

    Rescan when calling the unstage_all action
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit fa332572dc8011d1dc09c23c0519232aaf49a381
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 18:35:39 2007 -0800

    Reworked cmds to use cmds.git()
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 8cf09aa29f80aec94b30e76f4a4998edfa8c56f1
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 18:34:46 2007 -0800

    Exclude a line from inclusion in a diff if the selection only contains its trailing newline.
    
    Reworked cmds.git_diff to make filename an optional parameter.
    Changed controllers to pass filename to git_diff
    Removed some unused vars from the controller's process_diff_selection().
    Changed utils.DiffParser's logic so that including the previous line's newline in the selection will not include that line.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit a7b25a7e9d87d373cd4977474f5849f206eb9b9f
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 16:08:30 2007 -0800

    UI cleanup in the push dialog
    
    i18n cleanups and reordered the UI to minimize mouse clicks
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit a5abccd2afd4ecd50f130983a212f09037d42b53
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 28 14:04:53 2007 -0800

    Make unstaging a silent operation.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 01efa2d79e24278fc83f13f255367f941d54afa5
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 23:57:05 2007 -0800

    oops, forgot to call model.apply_diff during selected diff staging.

commit 3bb791f32003c7cbc1bba4ef5417f31db05e5869
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 18:54:02 2007 -0800

    Simplified controllers by using qtutils.set_items/add_items
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 478e8d6b2cb2c0a93d4fb8a7bfc1b584ee715880
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 18:52:58 2007 -0800

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

commit 165213bd16534ac14c92da5d9dc1516bad210091
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 18:30:28 2007 -0800

    Update win32 build script for documentation
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b584a72a2c106e5e309a083ae89a32c175ecfea1
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 07:15:09 2007 -0800

    Removed dead diff-gui code
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit cbc29c77716724d04c2771f5f7c46fb21294ffdd
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 07:06:21 2007 -0800

    Fixed win32 build script
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7b01aa042ec77d44322003e6b3c15557f26984b2
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 06:57:19 2007 -0800

    Add fine-grained patch/hunk selection
    
    With this integration, it is now possible to select sub-hunks in the diff gui.
    It is now possible to select individual lines and stage those lines only.
    To allow per-line selections use the "Stage/Unstage selected lines" context menus.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 3117a54441636375059fcf65ce74d077f42a0529
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 06:54:53 2007 -0800

    Keep the staged/unstaged lists vertically aligned
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 3e895e4ca193919273dc58e55958e2d3581848c1
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 00:22:31 2007 -0800

    Renamed the splitter callbacks
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6415d98a2488fdb96ef6deb43c989709c338498d
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 00:22:16 2007 -0800

    Add ability to unstage specific patch hunks
    
    TODO: allow per-line (versus per-hunk) selections
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 1100800e7fed161a9afc2aaaa3d98cfc93418e2d
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 00:20:08 2007 -0800

    Removed unecessary UI items
    
    This commit enforces that ugit will only ever commit what is already staged (and thus in the stagedList).  Partial commits are not allowed, since that prevents partial commits.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7c81d3b9faa4c0f96a1b28bad52c366a01b68aa1
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 27 00:15:59 2007 -0800

    fork+exec when launching standalone apps
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 0eeeba63cf7a75d5da995c40bdd2a609e4f2d8a3
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 20:46:55 2007 -0800

    A few more i18n fixes
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit ea861628d48e52e8669dfe1620ae332dc0ad6b2e
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 20:11:06 2007 -0800

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

commit 2e64634ba5e77b5139875107de0fcfe07754950d
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 19:47:54 2007 -0800

    Guard against inotify floods (such as when running make or switching branches)
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit af3d5d7163e69a8461835da276af494f3f42c64a
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 19:27:11 2007 -0800

    Removed dead code from the syntax highlighter
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 48a3dfacfab7a2dd4a0d86b63cec6b51784d46ee
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 19:18:33 2007 -0800

    Updated build scripts to match the latest/greatest waf api
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b04d83347e7b49e96310f3f3fe81daa2dd2d3683
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 16:59:17 2007 -0800

    Default to ffwd updates only in the push dialog
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit a4f6903655cf41ae18c4921613ed7fc2985764bd
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 16:56:24 2007 -0800

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

commit 9317d78fdabd5c35ae2b3340496b21ea63953ea6
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 16:55:48 2007 -0800

    Simplified actions by sending along widgets of interest
    
    When a model's parameters change, and the system knows about a corresponding view widget, the mediator's action callback will now receive a reference to the view's widget when the action is called.  This simplifies a common pattern in the action methods.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 1507c4e51f5fed9dc11c0e7cd96dbe4855d71b8f
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 06:37:18 2007 -0800

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

commit 51c00650757d38865b0ee29adfe4e488d6311703
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 05:11:14 2007 -0800

    Updated TODO

commit be397d33541312b5a182577cec5576d8f568edfe
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 04:37:51 2007 -0800

    Updated win32 build script to accomodate translation files
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6e6230c28d30392a14eb1494eb5ae43425485918
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 04:24:01 2007 -0800

    Add internationalization support to ugit
    
    Renamed a few UI items to align with git-gui's existing translations.
    Added the QApplication calls to setup the translator.
    Started using self.tr() in the controllers.

commit 038198f41a1128367b51dd201315c44b5d6658cf
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 04:17:39 2007 -0800

    Updated default colors for pyuic4/po2qm build objects
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 9083f05d61f57c949fb9822a3ad26a14f03b9b16
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 26 01:22:00 2007 -0800

    Prepared ugit for i18n support
    
    Imported git-gui's .po translation files.
    Added a po2qm build object
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 681518f151f4e858df439a600faa3b2c9509a7ae
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 25 19:02:40 2007 -0800

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

commit 4408e0ae775a4875ebde699135fad677bfddf9a4
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 25 04:31:41 2007 -0800

    Don't include .pyc/.pyo files in released tarballs
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 56b674f283dc3450c46fb5565ac3c955f669c5bc
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 24 09:29:19 2007 -0800

    Refactored model/view classes to pass around less data
    
    commit 50f517616a5e0b3391911a9f8dcb5037a1ecf4c7
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 09:25:48 2007 -0800
    
        Updated TODO to reflect latest updates
    
    commit 0fcfd488d56f8918e18768988d7bddcd6bc3e1b5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 09:11:31 2007 -0800
    
        Updated ugit controllers for the model/view refactoring
    
    commit ef847b22072db6c2103a902d53e5852b71cef2f1
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 09:09:58 2007 -0800
    
        Refactored model/view classes to avoid passing around the model
    
    commit 86dbbb74334bfc8371461d2304ad7281ff56bd8c
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 09:07:19 2007 -0800
    
        Simplify utils.grep's usage and implementation
    
    commit 13cfb22f286124a4cb18eb8f1c04bef5c317668c
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 09:02:28 2007 -0800
    
        Simplify view imports
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit acdb8d3120d740ba7ec373aa00f3eecc2361a7d2
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 24 05:26:42 2007 -0800

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

commit 8ea60c2317a08f386fa5278da76cb2d8562fad6f
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 24 05:12:36 2007 -0800

    Added a push dialog and a some UI niceties
    
    Squashed commit of the following:
    
    commit 1f5a6e4c6b4dd47500a2a26c50334b8d1f57997b
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 05:10:15 2007 -0800
    
    Store splitter geometry so that settings are remembered across sessions
    
    commit b0d249887a76fb01d14d5e241b5b0bbb895feaed
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:46:57 2007 -0800
    
    Separated out the info display from the diff display
    
    commit 59660cec1b28b1a0703092974f3303a05befba70
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:25:45 2007 -0800
    
    Added proper cut/copy/paste/delete/undo/redo for the commit text
    
    commit f16f7fa212e88829ce88a749d07e9dc116c2a728
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:25:16 2007 -0800
    
    Removed unused fetch+rebase menu action (TODO later)
    
    commit 2a05bb7b66175fd14592789a513a4d735097fb0f
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:01:49 2007 -0800
    
    Show the remote URL in the push dialog
    
    commit 30c59974cb5a5305eb7a4ef1291ddc3df9333d13
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:01:05 2007 -0800
    
    Added a convenient grep function
    
    commit bf7a9144632d9ed4a61edb2ce6cb2115b85a8230
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 04:00:14 2007 -0800
    
    Correctly handle temp build files when creating tarballs
    
    commit c5bf345be573a1e6d851a22e1bab5bb5682512bd
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 24 03:38:31 2007 -0800
    
    Make ugit remember window geometry settings
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 03d7f6feb9e84e63aee36c2050e122b3e1bda54b
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 22 04:45:17 2007 -0800

    Added a "git push" dialog
    
    commit 84353b6fd7afeeda44a8233611286b6d2b71ca88
    Author: David Aguilar <davvid@gmail.com>
    Date:   Sat Dec 22 04:43:52 2007 -0800
    
        Added a Git Push dialog
    
    commit bd69f7975dc3662042099af8e3d89ee8741cc683
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 23:49:46 2007 -0800
    
        Display project/branch in titlebar
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 1a7ad1b99bd071ed85229263c60b3df06474402a
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 23:23:30 2007 -0800

    Added commit message menu, other fixes
    
    commit 4e80caa2b8d06571640b1351956e60118194460b
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 23:20:17 2007 -0800
    
        Load commit message menu
    
    commit 7aed0d0e110f699bfd02316c641eb5baaca39b15
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 22:53:23 2007 -0800
    
        Cleanup model names
    
    commit bd123a0dcb8a63a72c683b4dc70a010156cb64fb
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 22:53:06 2007 -0800
    
        Dir dialog
    
    commit b4fe4ff48f66660a3952c06c4fce144d39e3a6e6
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 22:13:52 2007 -0800
    
        fix for mktar script
    
    commit 1c85af2ab70f76a7523e5c4ac7a670e34f1df3e6
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 22:04:41 2007 -0800
    
        Build dir shuffle
    
    commit ea12a220cb33124eb2c2ed57353a5e2582046705
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 21:51:33 2007 -0800
    
        style cleanup
    
    commit 6b71609035b35f0a23a9d6c492def3757e2ebb1e
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 21:15:01 2007 -0800
    
        style cleanup
    
    commit bb3b90d53ee2d166356c11a87f63d2ea8adcf219
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 20:53:42 2007 -0800
    
        Removed a few lambda's
    
    commit c883104cda9ade3644c5ff5162c2996ab338feeb
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 20:47:46 2007 -0800
    
        Less output for common tasks, simplified callbacks
    
    commit 9f75684588fcf92e33a97dd8182e957114bc3b07
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 21 20:12:02 2007 -0800
    
        script for creating tarballs
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 4144137d411909922707353639cf11931f911510
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 05:47:54 2007 -0800

    Added interactive diff gui
    
    Right-clicking on the diff display now allows you to stage selected hunks from an unstaged diff.  This was one of the main pieces of functionality missing from git-gui that is now supported by ugit.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit bdfb60d4babd81a743993887a365c07c33a1e641
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 03:37:00 2007 -0800

    Added diff parser for use by the interactive diff gui
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6f0d02ab65c05f2dbabf333e6cea93478450fb20
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 03:09:12 2007 -0800

    Show whitespace errors in the diff display
    
    This mimicks what command-line git does by highlighting extraneous whitespace with a red background.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit aa44509af26bb0dc3b6c6b219c6e47df5be2c1bc
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 02:20:13 2007 -0800

    Move model-centric rescan logic into the model class
    
    Simplified a few things and moved most of the rescan logic into the main model class.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 0dfbfcc6714665802a7489180e97c8c440349880
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 02:06:56 2007 -0800

    Allow launching multiple copies of the repo browser
    
    Use a cloned model when browsing the repo browser.  This lets you several modeless repobrowsers, each viewing a different branch.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit fa4b9d848deb969a52e3f0d84b345c49f0c14c7e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 01:57:21 2007 -0800

    Consolidated model classes into a single class
    
    All views now share the same model.
    Added obligatory qobserver destructor to handle unregistering observers from their subjects.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b4a399f4650b85a27f3ca1b4172d2c73dbd51ff4
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 21 01:03:55 2007 -0800

    Change default window sizes to accomodate courier font
    
    Updated the main window to display a visible cursor
    Allow selection with the keyboard in the diff textedit
    Ensured that utils.header() is always 80 columns wide
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 552662eb96c4e9956bed734961e9b9416f3221b8
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 19 23:38:32 2007 -0800

    Make things look nicer on MacOS
    
    Tweaked the layout a bit
    Removed the shell_quote stuff from run_cmd (since QProcess doesn't need it)
    Make the "export file" functionality not rely on shell redirection (this should help when running on win32)
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 1a375df3fad195ff772d70b011cba775369f5e72
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 19 02:47:14 2007 -0800

    Better Win32 support
    
    We now support msysgit.  The environment is still kind of frankenstein
    since we're using Python (native win32) + PyQt4 (native win32) + Git (msys), but somehow most of it still works.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit e8beb56f30f582c98631c6d83a1266806d11aa7b
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 17 02:18:22 2007 -0800

    Win32 README, build scripts
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit dbca023099e8260f9ae8ce9291c1fe1e164730ea
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 17 02:05:25 2007 -0800

    Fixes to allow win32 packages
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 06730ad42467aec46d42d0a486102cb41b6f7c47
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 17 01:22:24 2007 -0800

    Updated scripts for win32-style installation

commit d6fa62438cd2a2843ff915e66e181e58f5a68757
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 16 18:02:41 2007 -0800

    Ensure run_cmd also gets stderr, cleaned up usage of shell_quote
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit d1c922bd755b9d21243dbcfb563eccd1667dc6c2
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 16 15:45:50 2007 -0800

    Explicitly catch ImportErrors only when importing inotify
    
    Change the import test to try importiny inotify from ugitlibs instead of the system's pyinotify module.  Only catch ImportErrors to avoid catching real mistakes.  If we're on linux, recommend installing the python-inotify module.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 6afbf39187ebdd8705b39e80fa3c80e3d6a24568
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 16 13:40:20 2007 -0800

    Moved the inotify import after the try/except import of pyinotify
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit d1a2392211b044af4d80d12898a96f0688d46329
Merge: 0d679d9 a5d9007
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 16 13:36:48 2007 -0800

    Merge branch 'for-david' of git://repo.or.cz/ugit/ugit-sp into next

commit 0d679d92b742b0c50bd706630b5b8807c25386e1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 16 13:36:39 2007 -0800

    gitignores

commit a5d90073d68a8be3fda040ae726199f0eac3fa56
Author: Steffen Prohaska <prohaska@zib.de>
Date:   Sun Dec 16 16:14:49 2007 +0100

    cmds: Include command in return value of git_add()
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>

commit d96f9eb2bb75dfe637db2d1a5d4d0b3c11c6708e
Author: Steffen Prohaska <prohaska@zib.de>
Date:   Sun Dec 16 16:18:14 2007 +0100

    cmds: Fix spurios IOErrors by using QProcess to run commands
    
    Python's commands module sometimes raises IOErrors, which may be related to
    signal handlers set by Qt.  It is likely that Qt manipulates Unix signals,
    though I did not find a reference clearly stating this.  Certain signals,
    notably signals related to child process handling, may cause read calls to
    be interrupted.  Such an interruption seems to be transformed into an
    IOError by Python's commands module.
    
    The spurious errors are know to occure on Mac OS X with
        Python 2.3.5 (#1, Jan 13 2006, 20:13:11)
        [GCC 4.0.1 (Apple Computer, Inc. build 5250)] on darwin
    
    Using QProcess as a replacement fixes the error.  Qt knows about its own
    signal handler manipulations.  The spurious errors are gone.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>

commit 0dbdfcec432a1475d7c7a8da4bb9311e4b3d7844
Author: Steffen Prohaska <prohaska@zib.de>
Date:   Sun Dec 16 14:54:30 2007 +0100

    cmds: Refactor commands.getoutput to run_cmd()
    
    Direct calls to commands.getoutput() are wrapped in the function
    run_cmd().
    
    This is in preparation for replacing commands.getoutput with
    QProcess to avoid spurious IOErrors.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>

commit 60dab63b96d912549d303c01e4b4f8b90c9cf4af
Author: Steffen Prohaska <prohaska@zib.de>
Date:   Sun Dec 16 14:42:17 2007 +0100

    controllers: Remove global import of inotify
    
    Not all systems support inotify.  Hence, it should not be imported
    globally, but only if needed.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>

commit d9b5136e7f2c082ff70eeb05ae8b4c23f0cc7fc4
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 15 06:03:47 2007 -0800

    Optimize the diff display by using QSyntaxHighlighter
    
    Squashed commit of the following:
    
    commit 469d388327218fa015de74b9e3ec99933847e501
    Author: David Aguilar <davvid@gmail.com>
    Date:   Sat Dec 15 06:01:46 2007 -0800
    
        Vastly improved the diff/repo display
    
        Added GitSyntaxHighlighter
        Changed dialogs to use the GitSyntaxHighlighter
        Removed all HTML-related junk
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 7d8a52e25f5049a0d14c20e9009bd283c1452cff
    Author: David Aguilar <davvid@gmail.com>
    Date:   Sat Dec 15 04:15:15 2007 -0800
    
        Context menu

commit c40fd604af09237af0b8fbd7bae8982b9eccdf24
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 15 04:08:29 2007 -0800

    Make ugit not require PYTHONPATH when installed to random prefixes
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 271d4d1caf0bb60c0a93e395dd6763d1b8209172
Author: David Aguilar <davvid@gmail.com>
Date:   Sat Dec 15 04:07:45 2007 -0800

    Updated README, .gitignore for ugit-patches
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 29927d41f30006ad0b69f609aa15080ce93ee98c
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 14 02:00:49 2007 -0800

    Updated README and added scripts/just-build-it.sh for the impatient.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 8ac7284b5c5f2ae6854ccf3396f792e35e2eb869
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 13 02:07:57 2007 -0800

    shell_quote bugfix
    
    Oops!  We were using rstrip()/lstrip() to remove repeated single-quotes when really we should have just taken a substring.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 14c68f403274be81351005fb20313c0bccb06743
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 13 02:01:48 2007 -0800

    Speed up the diff display by using cStringIO
    
    Previously we were joining large chunks of text using temporary arrays.
    Using a cStringIO object noticably faster.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 36a0c83812289fefeca11e2705492fa5b645b9cc
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 22:01:20 2007 -0800

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

commit 30dfcfc569ce4023b3f219c443266063b6b89a30
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 21:36:25 2007 -0800

    Merged inotify branch into master: added inotify support
    
    Squashed commit of the following:
    
    commit 3ca04bff83504d4aa9cc14ee7511d121679b2f12
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Dec 12 21:33:38 2007 -0800
    
        Removed the rescan button since there's no use for it anymore
    
        Removed the rescan button.  The Commit -> Rescan action still exists for those without inotify.  Ctrl-R, as always, is still wired to the rescan action as well.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 50a14f03229a6f2d4c8b8536fc4d246481f4a104
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Dec 12 21:30:17 2007 -0800
    
        Added inotify support
    
        Creating, deleting, moving or modifying files known to git now triggers
        inotify events.  ugit watches these events and rescans for changes
        automatically.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit a675fbdfa87ad72d8803843e39f00505850191cf
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Dec 12 09:47:12 2007 -0800
    
        ugit-notify.py for interfacing with inotify

commit 158ba54885ae03394ccf98e1e7128b727e9325e9
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 09:38:44 2007 -0800

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

commit d676ffce26917e2220ce0a4b6be0f096e6586c62
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 01:17:08 2007 -0800

    checkout branch menu items
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit f42b503ae3891199aa1864023e753bbfe5adb74f
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 00:27:24 2007 -0800

    ...

commit e8e8e5d30b9664f3f9c3d3cb79d6339ef6c0a9a3
Author: David Aguilar <davvid@gmail.com>
Date:   Wed Dec 12 00:16:13 2007 -0800

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

commit f8d101cc76dff81b7800414cb15735615cb85832
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 11 23:29:17 2007 -0800

    Steffen Prohaska <prohaska@zib.de>

commit e0589d6fa89f89f2a4e3afba9eb1e926b3c569f8
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 11 05:16:09 2007 -0800

    Merged branchmenu into master
    
    Squashed commit of the following:
    
    commit d163fe6a8e22f3d7a2fab643fe1c0940c03a9b86
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 05:12:09 2007 -0800
    
        Creating branches works, but some options are not implemented
    
        The fastforward and fetch options are not implemented, but creating local and remote-based branches now works.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit b2d4215f92d6b1341c7f267c7b38174d47eea743
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 04:41:13 2007 -0800
    
        UI updates: changed hotkeys
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 8213aeb641257e9493a97802790f742126d5714b
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 03:50:36 2007 -0800
    
        Don't use os.path.basename for remote branches -> local branch name translation since that won't work on win32
    
        model and controller now use os.sep.  I don't have a windows installation on which to test this, but it /should/ work there. YMMV.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 9de5409b6f3dd603b9f5cf5689acf09f6aec54a0
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 03:44:00 2007 -0800
    
        Added copyright notices
    
        ugit is gplv2+.  Reflect that in the README.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 0413b053d9fcf9317be85ba75ba249330b30f6b5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 01:51:14 2007 -0800
    
        Use more screen real-estate
    
        Most screens these days are at least 1024x768.  Let's use a little more of that and give more prominence to the diff/content display.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 5cb6e0d9f1f7bebe220c0818932bc69aedfe0e25
    Author: David Aguilar <davvid@gmail.com>
    Date:   Tue Dec 11 00:12:00 2007 -0800
    
        Improved GitCreateBranch interaction behavior.
    
        Renamed some model attributes.
        Branch name auto-setting now only happens when interacting with remote branches.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit ed46dd0d7e7164feb287e60aec6c82bfd38feb33
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 14:43:26 2007 -0800
    
        Create branch WIP
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit cb9be7cf07239696f83b5855e360df78fbd43917
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 14:16:38 2007 -0800
    
        Removed superfluous *args from most callbacks
    
        Callbacks that respond to parameter-less signals all had a superfluous *args argument that was never being used.
        With the exception of GitController's cb_rescan, these were all
        removed.  cb_rescan needs it because it also responds to the
        untracked checkbox's stateChanged(int) signal which passes in
        the current state of the checkbox.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 8e5388ad7af5d5a4b930dee5ae9933e7d3801da0
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 14:05:39 2007 -0800
    
        Simplified GitCreateBranchController.__get_branch_sources()
    
        Removed superfluous method and moved logic checks inline.
        Added a stub version of cb_create_branch.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 2928637b09707cfef48541c0bc1e2a03ddce60b1
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 13:58:19 2007 -0800
    
        Updated GitCreateBranchController with user-interaction callbacks
    
        Interacting with the branchRootList will now update the model's revision_id and branch_name values.  The branch_name value is not updated when tags are selected.  When updated, the branch_name value is run through os.path.basename to translate "origin/foo" to just "foo."
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 74321561172014ee5b1beb3784c481ae7d18949f
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 04:18:17 2007 -0800
    
        Added the first version of the GitCreateBranch dialog
    
        - Added CreateBranchDialog.ui
        - Added subclass in views
        - Updated models with GitCreateBranchModel
        - Moved a few model-centric methods from the controllers to the models
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 6234d93bb2f3089dc6f62d4dc3698822129e96e7
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 10 01:32:59 2007 -0800
    
        Moved the __set_branch_ui_items() call into cb_rescan
    
        Signed-off by: David Aguilar <davvid@gmail.com>

commit 0067cca128cfad159302cf21aedf911089423106
Merge: 1037665 8bbb074
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 11 05:14:51 2007 -0800

    Merge branch 'master' of david@pixies:/shared/pub/ugit

commit 103766573cd4e6799d3ee792bcd632b92cf7c6c0
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 11 05:13:21 2007 -0800

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

commit 8bbb07465788f18538765a6508cc391286a29b49
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 10 01:53:50 2007 -0800

    Updated tooltips
    
    Edited Window.ui's tooltips to use multiple lines for easier readability.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 14325ef551f2121bf028cba4855adadd4000e38c
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 10 01:41:52 2007 -0800

    Updated build scripts to follow coding standards
    
    Fixed a few style nitpicks to make the wscripts use the same conventions as the rest of ugit.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 394ffee4145448a0bf7f39aa3c6df06f3a979b5b
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 14:26:43 2007 -0800

    qobserver subclasses do not need to import SIGNAL
    
    - Updated qobserver to override connect() and so that subclasses can pass in the signal string only and thus do not have to import QtCore.SIGNAL.  Passing in a QtCore.SIGNAL is still supported.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 942367df3e06f48ce72c3ea23a37c93e014076c6
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 13:46:54 2007 -0800

    README updates
    
    - Updated the README to contain a standard copyright notice
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 0fed8c03a25a15315fefc5e802940ced43791bdb
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 13:46:24 2007 -0800

    Updated q/observer to follow coding conventions
    
    - Fixed a few small style nitpicks in q/observer so that they are consistent with the rest of ugit
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 62c2ca14d5fbf7d6565c07d980562741d58de9c1
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 13:24:59 2007 -0800

    Added observer.py in preparation for the first ugit public release
    
    - observer.py was originally part of a different (private) repo so I've moved it in here for public consumption
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit ae843c8aadfa530742e95f1c4c8e1f449fe84d01
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 13:22:19 2007 -0800

    Added support for renamed file detection in cmds.git_status()
    
    - cmds.git_status now includes a regex for renamed files
    - renamed files are listed twice in the staged list: once for the deleted file and once for the new filename
    - cmds.git_status's other regexes were also fixed to not require the filename to be lstrip()'d
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 2e7366c86d8fc02d48536c933841f9b7c305c8e3
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 04:50:26 2007 -0800

    Added waf script and configure wrapper in preparation for public release
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit fbb1929a7c37839903a793ce818190762f51ef10
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 04:26:10 2007 -0800

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

commit d342135c14eb05f61a79e6fb47ffb8e49d1ada0d
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 04:06:17 2007 -0800

    Added buildutils and model/observer modules
    
    - These were previously part of another (private) repo but they should live here if this is going to be consumed by the public.
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b90ab11119f38dba0de241ef8d76b62a332e29c4
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 03:32:42 2007 -0800

    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>

commit 90dc4111dc3529770697f6ed502dfa2f52cab4fd
Author: David Aguilar <davvid@gmail.com>
Date:   Sun Dec 9 03:14:07 2007 -0800

    Added the GPL3 license, updated README
    
    ugit is distributed under the GPL v3
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit b77cffd1783c1ee7544d8dbf24620d8fb5ac83ca
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 7 15:53:27 2007 -0800

    Finalized api rename
    
    - Renamed all modules from ugit* to just *
    - All libs are now under ugitlibs
    
    Signed-off by: David Aguilar <davvid@gmail.com>

commit 7a381c92d909a3427ae714896869a4234b505a38
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 7 15:28:31 2007 -0800

    Renamed files in preparation for api changes
    
    - We're going to put all ugit modules under ugit.$(module)
    - This removes the need for api/ugitapi.py
    - This also allows for nicer filenames
    - The next commit updates the class names and adds __init__.py

commit 5eb98942843e23cc45211e7c4310aa26787eba55
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Dec 7 15:14:37 2007 -0800

    Merged cherrypick into master and added copy/paste handling to GitCommitBrowser
    
    - Renamed cb_export_selected to cb_commit_sha1_selected
    - Added clipboard handling in cb_commit_sha1_selected
    
    Squashed commit of the following:
    
    commit c57aa13ad6bdbde8faa1a59cc748e249f1ef3e99
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 7 03:39:17 2007 -0800
    
        Added cherry-pick functionality
    
        - Added cb_cherry_pick to ugitcontroller
        - Added git_cherry_pick to ugitcmds
        - Added cherry pick items to ugitWindow's menus
        - Other minor ugitWindow cleanups
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit c1934b0685135daca0e94543c58b5ca904035adf
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 7 02:37:29 2007 -0800
    
        Added ability to fetch the latest commit message
    
        - Added cb_get_commit_msg to ugitcontroller
        - Modified git_show to be able to return ansi-less output
        - Modified ugitWindow's keybindings to prefer commit-all
        - Made the CommandDialog's default size slightly wider
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 8b8b9b1adbc2f133355dd52df74773034444147e
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 7 02:17:33 2007 -0800
    
        Fixed a couple of small bugs in utils/controller
    
        - Added background color support for diff output
        - Updated controller to account for the renamed unstageSelected action
        - Added commitSelected, commitAll callbacks
        - Updated ugitWindow's diff display font size
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 6e29a439543563f65665a08b12f78654119adf81
    Author: David Aguilar <davvid@gmail.com>
    Date:   Fri Dec 7 01:57:45 2007 -0800
    
        Added export patch functionality
    
        - Added cb_export_patch to the ugitcontroller
        - Added git_format_patch to ugitcmds
        - Added html_document to ugitutils for proper diffstat display
        - Updated commit browser UI and tab order
        - Updated ugitWindow tab order and palette
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 1646572529d9beaed49c04ae9b3df95fd8f226cb
    Author: David Aguilar <davvid@gmail.com>
    Date:   Thu Dec 6 21:01:10 2007 -0800
    
        Tightened up the layout and added double-click handlers for staged/unstaged widget lists.
    
        - Added a stub commit browser
        - Tightened up ugitWindow's layout
        - Added stub commit browser class in ugitview
        - Added shortcut keybindings for several menu items
    
        Signed-off by: David Aguilar <davvid@gmail.com>

commit 23e7eab4ba2c94e3155f5d261c693ccac1342eb9
Author: David Aguilar <davvid@gmail.com>
Date:   Thu Dec 6 18:59:20 2007 -0800

    Merged diffdisplay into master
    
    Squashed commit of the following:
    
    commit d4017437c36649507cd5af1ab74e0230cc516760
    Author: David Aguilar <davvid@gmail.com>
    Date:   Thu Dec 6 01:45:08 2007 -0800
    
        Added diffstat functionality
    
        -Reordered all ugitcmds and ugitcontroller methods so that the methods are grouped by type and listed alphabetically
        - Added stageSelected, stageChanged and stageUntracked menu actions
        - Added showDiffstat menu action
        - Added ugitcmds.git_diffstat()
        - Removed Advanced menu for now and moved items to commit and repository
        - Added the first version of the README
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 609fd9efed3d83c61ef6e885e3b24989e3062da5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Dec 5 17:19:26 2007 -0800
    
        Added HTML escaping to the diff viewer.
    
        - Added scripts/html2py.pl for dumping Perl's HTML::Entities
          as a Python dictionary.
        - Added ugitutils.html_encode (ansi) for encoding
          HTML entities.
        - Updated ugitcmds and ugitcontroller to support the new
          diff output format.
        - Tabs are now displayed as eight HTML spaces (&nbsp;) in the
          diff display.  The diff display is HTML-based and since
          there is no HTML tab-equivalent this is the best compromise.
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit 7d4836200473b387c0bfea4f49dfbba255581afc
    Author: David Aguilar <davvid@gmail.com>
    Date:   Wed Dec 5 05:29:47 2007 -0800
    
        Implemented visual diffs
    
        Added support for untracked files in ugitmodel
        Added ansi_to_diff in ugitutils
        Added git_diff in ugitcmds
        Added icon for untracked files
        Added diff handling in ugitcontroller
    
        Signed-off by: David Aguilar <davvid@gmail.com>

commit f4fb8fd5baaa55d9b41faca79be289bb4407281e
Author: David Aguilar <davvid@gmail.com>
Date:   Tue Dec 4 03:14:56 2007 -0800

    Squashed commit of the following:
    
    commit ac0da11af74e386706a8404e0829b8a8466bb4e7
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 3 17:43:54 2007 -0800
    
        Added support for "git commit"
    
        Added ugitcmds.git_commit
        Added ugitutils.shell_quote
        Updated ugitutils and ugitcmds to use shell_quote throughout
    
        Signed-off by: David Aguilar <davvid@gmail.com>
    
    commit bf81b69cbd4fe28336b4dd855a8b4cb7953f4f6f
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 3 15:20:56 2007 -0800
    
        Show current branch in the status bar
    
    commit 8b2614edd7d84b8dc3ffb5df142532e38d00efe5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 3 14:56:16 2007 -0800
    
        updated icons and split out separate staged/unstaged icon sets

commit e3f5a2d0248de6197d6e0e63c901810b8a9af2f8
Author: David Aguilar <davvid@gmail.com>
Date:   Mon Dec 3 02:36:06 2007 -0800

    Merged qlistwidgets into master.
    
    Squashed commit of the following:
    
    commit 594d3fcf20efeb8f0f3b72e5de0865dbc8f450e5
    Author: David Aguilar <davvid@gmail.com>
    Date:   Mon Dec 3 02:32:36 2007 -0800
    
        Added staging/unstaging support
    
        Moved most python libs to site_packages/ugit
        Added ugitapi.py to manage sys.path
        Added icons for several file types
        Added git add / reset capability
        Added an option for showing untracked files
    
    commit f82c1f309ef972d9c91b57f1aac643ca9210d834
    Author: David Aguilar <davvid@gmail.com>
    Date:   Sun Dec 2 02:27:22 2007 -0800
    
        unstaged is now found on rescan

commit fa5ad6c38be603e2ffd1f9b722a3a5c675f63de2
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 30 05:19:05 2007 -0800

    Avoid multiple signoffs

commit 1ba04ad185cf9f04c56c8482e9a73ef1bd35c695
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 30 05:07:47 2007 -0800

    updated model/view/controller api

commit ad454b189fe5785af397fd6067cf103268b6626e
Author: David Aguilar <davvid@gmail.com>
Date:   Fri Nov 30 00:03:28 2007 -0800

    first cut of ugit
