Thread: [Codestriker-user] branch on some files only
Brought to you by:
sits
From: Clendenan, D. <dav...@po...> - 2004-10-23 16:53:27
|
In our development we have long-lived branches on some files for a few projects, where the rest are taken from the tip. Using the branch tag in codestriker shows that all the files not on the branch have been deleted, which makes for large, messy review sets. Sending 'rdiff -f' solves this problem, so I was thinking I'd add the option to select this behavior to the 'create new topic' page. I'm also planning on writing a simple script that'll add a tag to a repository, and generate a codestriker topic comparing that tag with the one from the previous run. This will be used for daily code comparisons, in conjunction with a scheduled nightly build. If anyone has comments on how this should be done (or if it's already done somewhere and I missed it :) please let me know. thanks -- Dave Clendenan Software Developer Polycom Canada da...@po... (604) 982-3438 Any sufficiently advanced bug is indistinguishable from a feature. -- Rich Kulawiec |
From: Jason R. <jre...@ya...> - 2004-10-25 02:23:48
|
Hi, --- cod...@li... wrote: > Send Codestriker-user mailing list submissions to > cod...@li... > > To subscribe or unsubscribe via the World Wide Web, visit > https://lists.sourceforge.net/lists/listinfo/codestriker-user > or, via email, send a message with subject or body 'help' to > cod...@li... > > You can reach the person managing the list at > cod...@li... > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Codestriker-user digest..." > > > Today's Topics: > > 1. branch on some files only (Clendenan, Dave) > > --__--__-- > > Message: 1 > Date: Sat, 23 Oct 2004 09:53:25 -0700 > From: "Clendenan, Dave" <dav...@po...> > To: cod...@li... > Subject: [Codestriker-user] branch on some files only > > > In our development we have long-lived branches on some files for a few > projects, where the rest are taken from the tip. > > Using the branch tag in codestriker shows that all the files not on > the branch have been deleted, which makes for large, messy review > sets. Sending 'rdiff -f' solves this problem, so I was thinking I'd > add the option to select this behavior to the 'create new topic' page. > I assume you are using CVS? It sounds like it may be that reasonable default for everybody. Do you have situations that you want the current behavior. In general it is felt that the new topic screen is already pretty confusing to new users, so I think it would be a good thing if a new option on that page could be avoided. > I'm also planning on writing a simple script that'll add a tag to a > repository, and generate a codestriker topic comparing that tag with > the one from the previous run. This will be used for daily code > comparisons, in conjunction with a scheduled nightly build. > > If anyone has comments on how this should be done (or if it's already > done somewhere and I missed it :) please let me know. David has just finished a cvs trigger script that makes a new topic on every check in. I think this would fit the bill nicely. It was in the new 1.8.4 release that just came out a couple of weeks ago. Thanks Jason. > > thanks > > > -- > Dave Clendenan > Software Developer > Polycom Canada > da...@po... > (604) 982-3438 > > Any sufficiently advanced bug is indistinguishable from a feature. > -- Rich Kulawiec > > > > --__--__-- > > _______________________________________________ > Codestriker-user mailing list > Cod...@li... > https://lists.sourceforge.net/lists/listinfo/codestriker-user > > > End of Codestriker-user Digest > _______________________________ Do you Yahoo!? Declare Yourself - Register online to vote today! http://vote.yahoo.com |
From: David S. <si...@us...> - 2004-10-25 11:53:57
|
> > Using the branch tag in codestriker shows that all the files not on > > the branch have been deleted, which makes for large, messy review > > sets. Sending 'rdiff -f' solves this problem, so I was thinking I'd > > add the option to select this behavior to the 'create new topic' page. > > I assume you are using CVS? It sounds like it may be that reasonable > default for everybody. Do you have situations that you want the current > behavior. In general it is felt that the new topic screen is already > pretty confusing to new users, so I think it would be a good thing if a > new option on that page could be avoided. Yes, the current create topic screen is very confusing. It would be great to avoid adding any new controls, I agree. I don't think "rdiff -f" it is a reasonable default however. If I am working on a branch, and I have deleted some files between tag1 and tag2, I would want to know that. It would be very confusing to suddenly get file differences based on what is currently in HEAD. Does it make more sense for you to define a custom CVS module which consists of just these "branched files", and then to use this in the module argument in the create topic screen? That way, you only need to see diffs for files you are really interested in. -- Cheers, David |
From: Clendenan, D. <dav...@po...> - 2004-10-25 15:59:53
|
On Mon, Oct 25, 2004 at 05:45:51PM +1000, David Sitsky wrote: > > Does it make more sense for you to define a custom CVS module which > consists of just these "branched files", and then to use this in the > module argument in the create topic screen? That way, you only need to > see diffs for files you are really interested in. > I think that'd complicate things more than adding the checkbox would. My goal is to make it as painless as possible for our users... I think I was a bit unclear in my needs, the review case I was discussing is changes between the HEAD rev and the branch. This would be used both for review prior to updating long-lived branches with HEAD changes, and review prior to reeling development branches back into the HEAD. In the short-term I've changed the default to have '-f' but I don't want too keep it that way for the reasons you mentioned. As to the automated review generation, I decided that a scheduled tagging is a bit redundant, since the dates are embedded in our nightly builds already, so one can just get with the correct date specification. I derived a script from the codestriker-modified log_accum.pl that does what I need. This is easier for our management group than going through a pile of reviews generated by each commit, since we have a large, distributed dev team. The review is generated via cron each night, for their review in the morning. This uses a very slightly simplified clone of the codestriker_create_topic function from log_accum.pl I'll happily post the entire script if others might find it useful. The meat of it is: foreach(@modules) { my @diffs = `$diffcmd $_`; ;# if we actually made changes, document them if($diffs[1]) { codestriker_create_topic('da...@po...', "$_ $day", \@diffs); } } One problem is that there are a few rtf files sprinkled through our source. They're in text-mode under cvs, to allow using $Keywords$, but I'd as soon not see the raw rtf diffs in my generated review sets. Is there a way to do filetype-exclusions in codestriker? Or are there tricks I could do with cvsignore? -- Dave Clendenan Software Developer Polycom Canada da...@po... (604) 982-3438 Any sufficiently advanced technology is indistinguishable from magic. -- Arthur C. Clarke |
From: David S. <si...@us...> - 2004-10-24 23:41:03
|
Hi Dave, On Sun, 24 Oct 2004 02:53, Clendenan, Dave wrote: > In our development we have long-lived branches on some files for a few > projects, where the rest are taken from the tip. > > Using the branch tag in codestriker shows that all the files not on > the branch have been deleted, which makes for large, messy review > sets. Sending 'rdiff -f' solves this problem, so I was thinking I'd > add the option to select this behavior to the 'create new topic' page. This is an interesting option, I've never seen it before. Makes perfect sense in your case. I guess a new checkbox for this option with a (?) link explaining what it means would be good. I wonder if other SCM systems have a similar option. > I'm also planning on writing a simple script that'll add a tag to a > repository, and generate a codestriker topic comparing that tag with > the one from the previous run. This will be used for daily code > comparisons, in conjunction with a scheduled nightly build. > > If anyone has comments on how this should be done (or if it's already > done somewhere and I missed it :) please let me know. Make sure you use/extend the CodestrikerClient.pm module that lives in bin/. This is used by CVS commit scripts for automatically creating topics for each commit (see the commit_prep.pl and log_accum.pl files in the bin directory). This should give you a good head start. You'll need to modify CodestrikerClient.pm so that it can create topics usings tags. At the moment, it only creates topics from a file. It shouldn't be too hard to extend this. -- Cheers, David |