Bug 490602
| Summary: | git-cvsimport got noisy | ||
|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | David Woodhouse <dwmw2> |
| Component: | git | Assignee: | Todd Zullinger <tmz> |
| Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
| Severity: | medium | Docs Contact: | |
| Priority: | low | ||
| Version: | 10 | CC: | bkearney, chrisw, jwboyer, tmz |
| Target Milestone: | --- | ||
| Target Release: | --- | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Fixed In Version: | 1.6.0.6-4.fc10 | Doc Type: | Bug Fix |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2009-06-24 19:17:29 UTC | Type: | --- |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
|
Description
David Woodhouse
2009-03-17 09:12:09 UTC
These appear to come from cvsps and were added in cvsps-2.2b1 (F-9 still ships 2.1). I think you can quiet them by using the -q flag to cvsps (I think more fine grained control can be had with the cvsps --debuglvl flag, though the documentation on that is pretty sparse, so you might have trawl through the source a bit for details). Options to cvsps can be passed with git-cvsimport using the -p flag. Might that help restore your cron mail output to a more reasonable level? cvsps is already passed the -q option. The UNKNOWN LINE output comes from git-cvsimport, not from cvsps, and that's the majority of what I'm now seeing. I'll file a separate bug for the '#CVSPS_NO_BRANCH' one. [dwmw2@bombadil ~]$ cvsps --norc -q -q --cvs-direct -u -A --root :pserver:anonymous.cam.ac.uk:/repo exim/exim-src > cvsps-output [dwmw2@bombadil ~]$ git-cvsimport -A ~/exim-cvs-authors -i -o master -d :pserver:anonymous.cam.ac.uk:/repo exim/exim-src -P cvsps-output * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: * UNKNOWN LINE * Branches: ... Hmm, that's caused by one of the changes in cvsps-2.2b1. Someone asked about this on the git list last May and it gathered very little response:
http://thread.gmane.org/gmane.comp.version-control.git/81426
I'm not sure what the best plan would be. I have little desire to do a lot of work on git-cvsimport.perl, and it seems no one upstream does either. But cvsps seems to be in even worse shape.
Perhaps we should at least patch git-cvsimport.perl to ignore the new Branches: lines, until someone gets the urge to make cvsimport parse them or converts it to something other than cvsps. Something like this maybe?
diff --git i/git-cvsimport.perl w/git-cvsimport.perl
index e439202..d020f1a 100755
--- i/git-cvsimport.perl
+++ w/git-cvsimport.perl
@@ -952,7 +952,7 @@ while (<CVS>) {
} elsif (/^-+$/) { # end of unknown-line processing
$state = 1;
} elsif ($state != 11) { # ignore stuff when skipping
- print STDERR "* UNKNOWN LINE * $_\n";
+ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /;
}
}
commit() if $branch and $state != 11;
git-1.6.0.6-4.fc10 has been submitted as an update for Fedora 10. http://admin.fedoraproject.org/updates/git-1.6.0.6-4.fc10 git-1.6.0.6-4.fc9 has been submitted as an update for Fedora 9. http://admin.fedoraproject.org/updates/git-1.6.0.6-4.fc9 git-1.6.0.6-4.fc9 has been pushed to the Fedora 9 stable repository. If problems still persist, please make note of it in this bug report. git-1.6.0.6-4.fc10 has been pushed to the Fedora 10 stable repository. If problems still persist, please make note of it in this bug report. |