(note subject change) On Wed, 2009-02-04 at 08:16 +0100, Peter Arrenbrecht wrote: > On Tue, Feb 3, 2009 at 6:06 PM, Steve Borho <[email protected]> wrote: > >> Hmm. It could show the diff against the file it was before the rename. > >> This is, I believe, what `hg diff` does. Would be extremely nifty if I > >> could then even deselect hunks, so the commit would do the rename, but > >> not all of the changes in the renamed file. But even without > >> deselecting hunks it would be helpful to see the diff. > > > > Ahh, that explains it. Record and shelve do not support selecting changes > > from renamed files, so this would have to be added (not impossible). I > > suspect > > some people would find this a bit confusing, though. > > > > This is a general issue, do we show diff hunks that can't be selected? If > > we > > do, how do we differentiate them? > > We should. For me at least, the primary function of the diff hunks is > still _seeing_ what I'm about to commit. How about we don't > differentiate the hunks as such, but the file header? Differentiating > the hunks might make them harder to read.
There's three types of diff hunks that I do not want to show in the diff tree. 1) Binaries (add/remove/or modify) 2) New files (with one gigantic diff hunk) 3) Removed files (with one gigantic diff hunk) As I mentioned before, large hunks cause severe performance issues for the GTK TreeView, and there's not a lot to be gained by showing you those hunks anyway. New files you can open in an editor from the context menu, we could do the same for removed files. Renames? I think I'll just add support for hunk selection from rename targets. This isn't so bad. > Also, I find the strike-through font for deselected hunks when their > entire file is deselected rather irritating. I often deselect > everything, first, then select a file here, a file there and commit. > Etc. I could remove the hunks of deselected files from the diff tree entirely, but it makes it more difficult to select just one hunk out of a file with many changes. BTW: Do you prefer the new layout where all of the diff hunks are displayed together by default? Previously, it would only show you diffs for the file(s) selected in the file tree. -- Steve ------------------------------------------------------------------------------ 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-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
