[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable multiple git revisions (Jun 2024) : final, using commit ID in repo localPath #5089

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
7d027ec
Multiple revisions 1st: AssetManager, Cmd Clone Pull Run
marcodelapierre Jan 15, 2024
106e8df
removed revision paramter from clone pull run
marcodelapierre Jan 16, 2024
0a9e6f8
updated unit tests for AssetManager
marcodelapierre Jan 16, 2024
37d332e
Merge branch 'master' into add/mult_revisions
marcodelapierre Jan 16, 2024
5a9b159
AssetManager provider.revision assigned at AssetManager object creation
marcodelapierre Jan 16, 2024
94d34f3
Codespell typo in changelog
marcodelapierre Jan 16, 2024
4744774
AssetManager: removed checkout method
marcodelapierre Jan 16, 2024
d9e7b2b
Merge branch 'master' into add/mult_revisions
marcodelapierre Jan 17, 2024
08718ef
assetmanager: fixed build signature, and unit tests
marcodelapierre Jan 17, 2024
242a600
assetmanager: one more build signature fix
marcodelapierre Jan 17, 2024
35ad1e9
AssetManager: fix for multi revs in find() method
marcodelapierre Jan 17, 2024
463b6f1
Multiple revisions: added for Cmds Drop, View, Config, Info
marcodelapierre Jan 17, 2024
2d3273e
minor fixes to log outputs in CmdRun
marcodelapierre Jan 17, 2024
d2e5ffe
AssetManager: documented new localPath schema
marcodelapierre Jan 18, 2024
60c3c5e
K8sDriverLauncher : added revision support
marcodelapierre Jan 18, 2024
4bf1e37
updates to AssetManagerTest
marcodelapierre Jan 18, 2024
7e32111
edit to AssetManagerTest, git.pull for TAGS does not output result of…
marcodelapierre Jan 18, 2024
3b2d461
minor fix in GitlabRepositoryProvider: using DEFAULT_BRANCH instead o…
marcodelapierre Jan 18, 2024
2e6461e
Minor edits
bentsherman Jan 23, 2024
a8d2dee
Merge branch 'master' into add/mult_revisions
marcodelapierre Feb 5, 2024
eaf45d8
[ci fast] Merge branch 'master' into add/mult_revisions
pditommaso Feb 10, 2024
ed17284
Merge branch 'master' into add/mult_revisions
marcodelapierre Feb 23, 2024
b3f141d
parametrised revision delimiter
marcodelapierre Feb 28, 2024
6706bd9
nf pull: option to list or not revs for each project
marcodelapierre Feb 28, 2024
e62f543
nicer output for nf list -r
marcodelapierre Feb 28, 2024
bd19877
minor edit to CmdList
marcodelapierre Feb 29, 2024
c0268af
AssetManager: adding listRevisions method (work in progress)
marcodelapierre Feb 29, 2024
aae2afc
small tune to CmdList
marcodelapierre Feb 29, 2024
268ec79
minor tweak to CmdList
marcodelapierre Feb 29, 2024
ac8d755
AssetManager: listRevisions method now working
marcodelapierre Feb 29, 2024
70c8bcc
CmdDrop option to drop all revisions of given project
marcodelapierre Feb 29, 2024
8bcd717
AssetManagerTest: added test for method listRevisions
marcodelapierre Mar 4, 2024
4616e7f
docs - cli: add -a options for list and drop
marcodelapierre Mar 4, 2024
e4b9d78
docs - cli: add/update -r option for relevant commands
marcodelapierre Mar 4, 2024
958955a
CmdInfo: now also prints info on pulled revisions
marcodelapierre Mar 4, 2024
f220e98
CmdInfo made smarter when non only non default revisions pulled
marcodelapierre Mar 4, 2024
2ad9a24
CmdInfoTest updated
marcodelapierre Mar 4, 2024
35ea812
CmdInfoTest fix
marcodelapierre Mar 4, 2024
80ecacd
CmdInfo: added code comment
marcodelapierre Mar 4, 2024
5e4b45f
AssetManager: default revision recognised correctly if specified in m…
marcodelapierre Mar 4, 2024
aa94d7b
small CLI Docs update
marcodelapierre Mar 4, 2024
d965ee5
added a couple of comments
marcodelapierre Mar 6, 2024
f6e6174
Merge branch 'master' into add/mult_revisions
marcodelapierre Mar 11, 2024
ca48a97
Merge branch 'master' into add/mult_revisions
pditommaso Mar 17, 2024
12d31a2
fix merge conflicts
marcodelapierre Mar 21, 2024
9aacb2b
Review: REVISION_DELIM and added comments
marcodelapierre Mar 21, 2024
12718c7
review: added method getProjectWithRevision
marcodelapierre Mar 21, 2024
0b57262
updated method getBaseNameWithRevision
marcodelapierre Mar 21, 2024
17067ea
docs/sharing: added paragraph on multiple revisions, with caveat on r…
marcodelapierre Mar 21, 2024
67dc5d5
cmd info: removed sticky current revision, updated docs
marcodelapierre Mar 21, 2024
7716416
fixed unit tests in CmdInfoTest
marcodelapierre Mar 21, 2024
45be84b
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 4, 2024
2af4ba7
merged from master
marcodelapierre Apr 8, 2024
afa8a1c
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 12, 2024
dc4bdee
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 15, 2024
4c93b3e
Merge branch 'master' into add/mult_revisions_apr_revision_path
marcodelapierre Jun 17, 2024
561a59f
docs update/fix
marcodelapierre Jun 17, 2024
48cf800
multi revs: consistent usage of manager.getProjectWithRevision() in Cmds
marcodelapierre Jun 17, 2024
6070273
AssetManager: undo redirect of default revision to null (circular man…
marcodelapierre Jun 17, 2024
da159d9
AssetManager: removed chicken n egg between hubprovider and localpath
marcodelapierre Jun 17, 2024
1824952
AssetManager: new location for revisions
marcodelapierre Jun 17, 2024
c2db132
Using new Asset location for CmdDrop and CmdList
marcodelapierre Jun 17, 2024
32fe348
Using new Asset location for CmdPull
marcodelapierre Jun 18, 2024
8411c2e
CmdDrop and CmdList: got rid of REVISION_DELIM
marcodelapierre Jun 18, 2024
c190dac
Using new Asset location for CmdInfo
marcodelapierre Jun 18, 2024
55868c7
updated CmdClone
marcodelapierre Jun 18, 2024
05ac8c9
AssetManager: reverted to original find() method
marcodelapierre Jun 18, 2024
0dbc77d
fixed revisionSubdir and unit tests
marcodelapierre Jun 18, 2024
e3cfec4
docs updates
marcodelapierre Jun 18, 2024
b6352c4
AssetManager: REVISION_DELIM not needed any more
marcodelapierre Jun 18, 2024
db4903a
AssetManagerTest: further fixes
marcodelapierre Jun 18, 2024
90f8f1d
AssetManager: revert back to set revision in checkValidRemoteRepo()
marcodelapierre Jun 18, 2024
a3d5557
AssetManager: using existing revision map
marcodelapierre Jun 19, 2024
0f29320
using DEFAULT_REVISION_DIRNAME
marcodelapierre Jun 19, 2024
93db4ee
AssetManager: add checkLocalBarePath
marcodelapierre Jun 19, 2024
71a5b2f
rename checkLocalBarePath to checkBareRepo
marcodelapierre Jun 19, 2024
70847e7
AssetManager: added revisionToCommitWithBareRepo, work in progress
marcodelapierre Jun 19, 2024
9c68166
minor update
marcodelapierre Jun 19, 2024
0a3d4a6
AssetManager: updateRevisionMap ok, overall work in progress
marcodelapierre Jun 20, 2024
920f8aa
final updateProjectDir ; fixed cmddrop
marcodelapierre Jun 20, 2024
be2b84f
in localPath, use commitId, plus related fixes in listRevisions
marcodelapierre Jun 20, 2024
8da7bea
list command can also show commits
marcodelapierre Jun 20, 2024
d7c2f30
updated docs/sharing.md commit in localpath
marcodelapierre Jun 20, 2024
f27b115
remove use of getPulledRevisions
marcodelapierre Jun 20, 2024
3d45ef3
fix for CmdDrop: use of DEFAULT_REVISION_DIRNAME
marcodelapierre Jun 20, 2024
06a2229
CmdList: better output for default revision
marcodelapierre Jun 20, 2024
a77bd59
AssetManager, CmdDrop : some method signature updates
marcodelapierre Jun 20, 2024
28fe569
Merge branch 'master' into add/mult_revisions_jun_revision_map
marcodelapierre Jun 24, 2024
3b9978b
AssetManager.download(): using bareRepo for pulling, plus related cha…
marcodelapierre Jun 24, 2024
20e6edc
CmdList and CmdPull: no need for manager.close()
marcodelapierre Jun 24, 2024
2199974
AssetManagerTest: updated list tests
marcodelapierre Jun 24, 2024
36dab4d
AssetManagerTest: fixed manifest test 1
marcodelapierre Jun 24, 2024
2375bda
AssetManagerTest: fixed all executed tests
marcodelapierre Jun 24, 2024
ae835e8
CmdPullTest fixed
marcodelapierre Jun 24, 2024
6769307
AssetManagerTest: fixed tests that need github token
marcodelapierre Jun 24, 2024
2cf9942
AssetManagerTest: add test for checkBareRepo
marcodelapierre Jun 24, 2024
0c140de
AssetManagerTest: added various tests for revToCommit methods
marcodelapierre Jun 25, 2024
923e200
AssetManagerTest: updated listRevs tests
marcodelapierre Jun 25, 2024
bac8797
AssetManager: update to revisionToCommitWithBareRepo
marcodelapierre Jun 25, 2024
5de01cc
AssetManagerTest: removed unneeded variable
marcodelapierre Jun 25, 2024
b061203
UpdateModuleTest: small makeup
marcodelapierre Jun 25, 2024
5a81758
UpdateModuleTest: fixed all unit tests
marcodelapierre Jun 25, 2024
3052994
UpdateModuleTest: minor edit
marcodelapierre Jun 25, 2024
6d6d7ae
AssetManager: set revision and localPath outside constructor as separ…
marcodelapierre Jun 25, 2024
69416fc
CmdPull: allow -a as equivalent to -all
marcodelapierre Jun 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
minor fixes to log outputs in CmdRun
Signed-off-by: Dr Marco Claudio De La Pierre <marco.delapierre@gmail.com>
  • Loading branch information
marcodelapierre committed Jan 17, 2024
commit 2d3273e63ae074093837e7c1f83e1842861b1b43
4 changes: 2 additions & 2 deletions modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ class CmdRun extends CmdBase implements HubOptions {
boolean checkForUpdate = true
if( !manager.isRunnable() || latest ) {
if( offline )
throw new AbortOperationException("Unknown project `$repo` -- NOTE: automatic download from remote repositories is disabled")
throw new AbortOperationException("Unknown project `$repo${revision ? ':'+revision : ''}` -- NOTE: automatic download from remote repositories is disabled")
log.info "Pulling $repo${revision ? ':'+revision : ''} ..."
def result = manager.download(deep)
if( result )
Expand All @@ -544,7 +544,7 @@ class CmdRun extends CmdBase implements HubOptions {
throw e
}
catch( Exception e ) {
throw new AbortOperationException("Unknown error accessing project `$repo` -- Repository may be corrupted: ${manager.localPath}", e)
throw new AbortOperationException("Unknown error accessing project `$repo${revision ? ':'+revision : ''}` -- Repository may be corrupted: ${manager.localPath}", e)
}

}
Expand Down