The return of cms-rmpkg

kpedro88 commented 6 years ago

cms-rmpkg was originally introduced in #80, but then removed in #83. The problems were:

rmpkg can be used to delete a package which was part of a cms-merge-topic. In this case things can fail.

when we delete a package (after it has been built once) then it leaves the newly generated files e.g. package/python/*.pyc files in the area. This can also cause problems.

SCRAM/build rules also needs update to support rmpkg as it still create lib/$SCRAM_ARCH/.poisonededmplugincache file for the deleted plugins.

This PR addresses the first two concerns by:

making a list of packages modified after the tag corresponding to $CMSSW_VERSION and stopping if any requested packages are on it
making a list of packages containing untracked files (e.g. .pyc) and stopping if any requested packages are on it
allows overriding the stop with -o, --force (will delete untracked files in that case)

Other changes in this PR:

update documentation
simplify logic for handling input files (just convert to a space-separated package list right away, then the rest of the code doesn't have to care if it's an input file or not)

Questions for others (@smuzaffar, @fwyzard, @davidlange6, anybody else who cares):

Are the messages printed for the special cases sufficient? (see below)
Right now, if given packages A and B, cms-rmpkg won't remove A if B triggers an error (because nonexistent, containing untracked files, or modified). Should we try to make it more permissive (e.g. remove anything it can remove)?
I don't know how to fix the SCRAM build rules to deal with packages that were removed but not deleted. Any ideas?

Tested as follows:

cmsrel CMSSW_10_1_0_pre2
cd CMSSW_10_1_0_pre2/src
cmsenv
git cms-addpkg RecoEgamma/PhotonIdentification Configuration/PyReleaseValidation
scram b -j 8
(add random comment to file in Configuration/PyReleaseValidation, commit change)

First test:

git cms-rmpkg RecoEgamma Configuration/PyReleaseValidation

gives:


These packages contain untracked files
RecoEgamma
Configuration/PyReleaseValidation

These packages have been modified from the base release
Configuration/PyReleaseValidation

Second test:

git cms-rmpkg -o RecoEgamma Configuration/PyReleaseValidation

gives:


These packages contain untracked files
RecoEgamma
Configuration/PyReleaseValidation

These packages have been modified from the base release
Configuration/PyReleaseValidation

Removing packages
RecoEgamma
Configuration/PyReleaseValidation

cmsbuild commented 6 years ago

A new Pull Request was created by @kpedro88 (Kevin Pedro) for branch master.

@cmsbuild, @smuzaffar, @gudrutis, @mrodozov can you please review it and eventually sign? Thanks. You can sign-off by replying to this message having '+1' in the first line of your reply. You can reject by replying to this message having '-1' in the first line of your reply.

external issue cms-sw/cmsdist#3828

cmsbuild commented 6 years ago

Pull request #96 was updated.

external issue cms-sw/cmsdist#3828

kpedro88 commented 6 years ago

rebased on top of #95 due to doc/Makefile changes

cms-sw / cms-git-tools

The return of cms-rmpkg #96