On Sun, Feb 1, 2009 at 10:00 PM, Steve Borho <[email protected]> wrote:
> I've pushed a bit more work on the status/commit dialog.  I spent some time
> cleaning up variable names and providing enumerations for the file model
> fields.  That made the code a lot more readable, to make it easier for others
> to contribute.
>
> I then added support for 'partially rejected' files in the file treeview.  The
> gtk.CellRendererToggle() class has two states.  There's 'active' which sets
> the check mark on or off.  Then there's an 'inconsistent' state which changes
> the check mark to a short line.  This seems to match pretty closely to our
> purposes so I've wired it up.
>
> I'm not convinced anymore we need to strikethrough the diff headers in the
> diff view when the entire file is rejected since there are two visualizations
> already:  the file will be 'unchecked' in the file list and it's diff hunks 
> will
> be invisible if 'show rejected' is disabled (it is disabled by default).
>
> I'm still leaning towards at least hiding the shelve functionality when the
> dialog is launched in commit mode, just to avoid confusing new users.
> But I'm waiting to hear from TK about this.

I just pull from you repo, but got a ImportError when trying to run commit.py:

   ImportError: cannot import name ParseError

------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to