On Fri, Jan 23, 2009 at 11:37 PM, Douglas Philips <[email protected]> wrote: > > On or about 2009 Jan 24, at 12:24 AM, Steve Borho indited: > > I was thinking of showing the shelved changes as just another > > changeset/diff, > > but I can see what you're thinking. I can experiment with other > > methods for > > visualizing rejected chunks. Greyed out, sunken? > > > > I tried experimenting with the colors, but nothing I did seemed to > > convey 'not > > selected for commit' like the strikethrough does. Perhaps the font > > size can > > be made smaller? Perhaps the chunk could be "folded up" somehow, > > but it needs to be 'undoable' so the user can un-reject the chunk. > > > > Should the diff pane be 'tabbed' and allow you to move chunks from > > one tab to the > > other, then be able to commit/shelve the contents of either tab (the > > shelf itself could be a third tab)? > > > > Do any other tools offer similar functionality? > > > > Anyone have any brilliant ideas? > > It is definitely useful/desirable to be able to see both the to-be- > committed and to-be-shelved chunks in situ side by side. > Maybe a "hide shelved" and "hide commitable" (names are hard) check > boxes? > Of course as soon as anything is hidden/folded, there is a danger that > the user will forget and commit the wrong thing. > If there were a way to 'rollback' and try again, that would probably > not be too bad. > I guess I'd prefer not to have multiple panes. folding or hiding seems > like the right thing instead.
Perhaps toggles above the diff pane to 'show shelved' and 'show rejected'? If show shelved is enabled, patch chunks from the shelf are added to the end of the normal diffs but are not selectable (they aren't in the working copy until they are unshelved, so they cannot be committed). The 'show rejected' toggle would control visibility of the chunks which are currently rejected (strikethrough). Undo last commit is already supported. > > strike-through really depends on the font, etc. would the strike > through hide/obscure a hyphen/dash? I just checked this out, the strikethrough does not hide a dash, but it does go through the lower line of an equals character (only so many pixels there to chose from). > > kdiff3 uses configurable colors for these kinds of things... as well > as buttons to control showing the entire file or just the differing > areas. Maybe it has other options to consider? > that's worth investigating. -- Steve ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
