On Mon, Jan 12, 2009 at 2:32 AM, Steve Borho <[email protected]> wrote: > Hi TK, I've heard you mention a couple of times you've done some > preliminary work on this feature. Is this available for pulling?
The work need some updating due the changes tortoisehg has seen it I last worked on it. I will try update it in a couple of days and share it with the team. > I've been staring at the record.py extension that BOS wrote and I > think it would be fairly easy to support per-hunk change selection > using this code directly (a finer degree of control than the per-range > change selection dialog that Qct provides). > > I was amused that he used nearly the same method as Qct did to > manage the modified files and their backups, so that should port > easily to THG. > > The biggest remaining question is what the user interface should > look like. I think we still want to use the commit tool itself to select > entire files for inclusion into the changeset. I also think a separate > dialog for hunk/range selection is a good idea, since it modifies the > file in your working copy. You want it to be an explicit process. In my implementation, I populate the diff window, which has been converted into a multi-selection treeview window, with diff hunks that has been broken up through hg-shelve. Use can now select the desired hunks (or click on the file header to select all the hunks in the file), then click on the Shelve button to shelve them. Clicking on the Unshelve button will unshelve the changes. The 'record' function is achieved by shelving the selected hunks and commit the remaining ones. I don't like a separate dialog for this, it feel kinda awkward. Having all the shelve support 'in-place' feel more intuitive. The most significant problem new my existing design is that right now I can't copy-paste the diff hunks. But I think we can work this out. > So, how do we display all of the changes in a file in such a way that > individual changes can be "held out of the commit"? And how do we > display changes that have been held out? Do we allow hunks to be > edited? I don't think we should need to support editing the hunks. User can always edit the files as usual and refresh the status/commit window to pick up the new edits. > Curious what you all think about it. Bonus points for ideas that are > actually possible with PyGtk :) ------------------------------------------------------------------------------ Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
