Stephen Leake <[EMAIL PROTECTED]> writes: >> * git diff Vs git diff --cached : git diff shows you what you didn't >> add to the index yet, and git diff --cached what you're about to >> commit. You can use that to do intermediate validations of your code >> while writting a long patch : do something, check with "git diff" >> that it's OK, git add, and continue. I use that when I have several >> steps and when the intermediate steps do not deserve to be commited >> (regression or uncompilable code). > > Sounds like the index is almost a "lite local branch".
Used this way, yes, it's close to a lightweight branch, discarded after the fact. >> '(message "On branch ...") >> '(message "Changes to be committed:") >> '(file "file1" ....) >> '(file "another-file" ....) >> '(message "Changed but not updated") >> ... > > That makes sense, but since it is now possible for one file to be in > two places, it complicates managing the ewoc. > > I think I prefer Michael's approach of adding a marker of some sort to > a single file line. That will be simpler for the front-end to handle, > especially if I ever get dvc-fileinfo going (more structured ewoc > info). I didn't understand the meaning of this ? in the ewoc. Yes, I do like it, but we should probably find a way to make it easier for the user to understand its meaning. A tooltip saying "file differs from index" when the user puts his mouse on the "?" could be a way. Another advantage of this approach is that it's already implemented ;-). >>> And if the user calls xgit-add after dvc-status, how should the >>> display be updated? >> >> In that proposal, files should move from the bottom section to the top >> one. > > That also makes sense. Then, the question mark should disapear (and ideally, it should re-appear whenever one saves the file from Emacs. IIRC, PCL-CVS does this). -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
