Bugzilla – Full Text Bug Listing
| Summary: | Need an equivalent releng tool for git | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Paul Webster <pwebster> | ||||||
| Component: | UI | Assignee: | Project Inbox <egit.ui-inbox> | ||||||
| Status: | VERIFIED WONTFIX | QA Contact: | |||||||
| Severity: | normal | ||||||||
| Priority: | P3 | CC: | aniefer, bluesoldier, caniszczyk, daniel_megert, david_williams, dj.houghton, gunnar, irbull, john.arthorne, kim.moir, mkempka, ob1.eclipse, thatnitind, tomasz.zarna | ||||||
| Version: | 0.10.0 | ||||||||
| Target Milestone: | --- | ||||||||
| Hardware: | PC | ||||||||
| OS: | Linux | ||||||||
| Whiteboard: | |||||||||
| Bug Depends on: | 343320, 357061 | ||||||||
| Bug Blocks: | 345668 | ||||||||
| Attachments: |
|
||||||||
|
Description
Paul Webster
In the egit-pde repo, we have a org.eclipse.egit.relengtools plug-in that functionality can be added to. At the moment, Gunnar only had some code there to handle updating copyrights. Created attachment 181762 [details]
Skeletal EGit release wizard
This is a skeletal releng tool. It supports picking a map project, selecting map file entries/projects to update, and replacing lines in the mapfile with the new tag entry.
Equvalent EGit or JGit steps that I need before I can finish the algorithm (based on bash files):
1) find the git repo for a project
2) git tag $BUILD_TAG :tag the repo with the tag
3) git rev-list HEAD -- <project> :to get the last commit that effected that project
4) git tag --contains $LAST_COMMIT :to get the list of tags that contain the commit
5) git log ${LATEST_SUBMISSION}..${BUILD_TAG} :so I can scan for bug numbers for the build notes.
PW
Created attachment 181771 [details]
Skeletal EGit release wizard v03
Same as the last patch, but includes the Build Notes page and the operation (that currently does nothing).
PW
Pushed first change: http://egit.eclipse.org/r/#change,1826 Running CTRL+3 Show Info with org.eclipse.e4.core.deeplink and org.eclipse.e4.core.deeplink.handler will show the failures in the algorighm I have coded so far. repo under test: git://git.eclipse.org/gitroot/e4/org.eclipse.e4.deeplink.git All of the relevent code is in org.eclipse.egit.relengtools/src/org/eclipse/egit/relengtools/internal/ShowInfoHandler.java in runTest(). PW (In reply to comment #4) > Pushed first change: http://egit.eclipse.org/r/#change,1826 I still can't get the jGit API to work correctly (as per the test handler). Chris, any luck? PW I still can't get the JGit algorithms described in http://egit.eclipse.org/r/#patch,sidebyside,1826,2,org.eclipse.egit.relengtools/src/org/eclipse/egit/relengtools/internal/ShowInfoHandler.java to work correctly. Both of these still don't work: 3) git rev-list HEAD -- <project> :to get the last commit that effected that project 4) git tag --contains $LAST_COMMIT :to get the list of tags that contain the commit PW Are you still trying to find out if the qualifier needs to be increased? (In reply to comment #7) > Are you still trying to find out if the qualifier needs to be increased? Yes, those are the steps I need to find a way to do with jgit, so I can determine if a bundles tag needs increasing. PW I still can't get the algorithm described in http://egit.eclipse.org/r/#patch,sidebyside,1826,2,org.eclipse.egit.relengtools/src/org/eclipse/egit/relengtools/internal/ShowInfoHandler.java to work correctly. PW (In reply to comment #6) > Both of these still don't work: > 3) git rev-list HEAD -- <project> :to get the last commit that effected that > project > > 4) git tag --contains $LAST_COMMIT :to get the list of tags that contain the > commit We still need those 2 pieces to get moving on this. Alternatively, someone could look at the code mentioned in comment #9 and suggest a better way (any way that worked would be better :) PW Your tests now pass in ShowInfoHandler Paul, sorry for the wait. Can you please clean things up and get what you need so you can drop the shell scripts when you release? I'd like to get this in for 0.12 (In reply to comment #11) > Can you please clean things up and get what you need so you can drop the shell > scripts when you release? I'll try and get to it this week. PW I made two changes that are in http://egit.eclipse.org/r/#change,3167 The first change is to MapEntry/MapFile to do a better job ignoring non-GIT map entries since we don't know how to parse them in general. The second change is to GetBugsOperation to get the bug numbers associated with each commit since the last tag. I may have screwed up my branching and push to gerrit, not sure if the changeset will need to be abdandoned and resubmitted. (In reply to comment #14) > I made two changes that are in http://egit.eclipse.org/r/#change,3167 Thanx Andrew. Chris, does that mean that none of the other Patch1 changes were merged in from Patch2 ? PW They were both rebased and combined into one commit. They should be merged in. Missing pieces are 1) Reviewing the list of changes, see bug 343320 2) Actually tagging the projects 3) Reviewing the map file change, and commiting that change. I pushed a few more changes to gerrit. Added a page to compare and review the map file changes. Also code to do the actual tag. This came through as 3 change sets http://egit.eclipse.org/r/3205 http://egit.eclipse.org/r/3206 http://egit.eclipse.org/r/3207 I had hoped it would just all be consolidated into one. (In reply to comment #18) > I pushed a few more changes to gerrit. > > Added a page to compare and review the map file changes. Also code to do the > actual tag. > > This came through as 3 change sets > http://egit.eclipse.org/r/3205 > http://egit.eclipse.org/r/3206 > http://egit.eclipse.org/r/3207 > > I had hoped it would just all be consolidated into one. Ok, I think I managed to squash all three of these together into http://egit.eclipse.org/r/#change,3205 (In reply to comment #19) > Ok, I think I managed to squash all three of these together into > http://egit.eclipse.org/r/#change,3205 I separated your three changesets into one. Please abandon 3205. Is there anywhere I can download the current org.eclipse.egit.relengtools plugin from? I tried this site: http://www.eclipse.org/external/egit/pde/updates-nightly/ But it seems to contain only the .10 version from last year. I found the source code for 0.12 in your git repository but consumers having to build this manually isn't optimal. Bug 345668 in Platform/Releng for modifying the tool to work with git has been marked as WONTFIX. See the last comment there for the rationale. Does it mean this one can be closed as well? Please note that we still need to update Copyright Checker (bug 345669). I'm not sure if it was meant to be a part of this bug. (In reply to comment #22) > Does it mean this one can be closed as well? Guys? Anyone interested in having this fixed? I can't speak for other projects but Eclipse platform no longer uses map files so we don't need this. In practice we replaced such a tool long ago with automated tagging scripts. See John's comment above. |