Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
clpm
clpm
Commits
87ca6e5e
Commit
87ca6e5e
authored
Jun 08, 2020
by
Eric Timmons
Browse files
Sort more things when serializing contexts.
Should prevent excessive noise in bundle lock files.
parent
374b5048
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.org
View file @
87ca6e5e
...
...
@@ -4,6 +4,8 @@
+ Fix bug in client where =activate-context= did not ignore inherited source
registries for bundles.
+ Sort more things serializing contexts. Should prevent excessive noise in
bundle lock files.
* v0.3.1 - 2020-06-04
...
...
clpm/context.lisp
View file @
87ca6e5e
...
...
@@ -16,6 +16,7 @@
#:clpm/repos
#:clpm/requirement
#:clpm/source
#:clpm/utils
#:do-urlencode
)
(
:export
#:context
#:context-add-requirement!
...
...
@@ -563,8 +564,8 @@ in place with the same name. Return the new requirement if it was modified."
;; Releases
(
write-section-header
"releases"
stream
)
(
format
stream
":releases~%"
)
(
dolist
(
release
(
s
ort
(
copy-lis
t
(
context-releases
context
)
)
#'
string<
:key
(
compose
#'
project-name
#'
release-project
)))
(
dolist
(
release
(
s
afe-sor
t
(
context-releases
context
)
#'
string<
:key
(
compose
#'
project-name
#'
release-project
)))
(
format
stream
"~S~%"
(
context-release-to-form
release
(
assoc-value
(
context-system-releases
context
)
release
))))
...
...
@@ -574,8 +575,8 @@ in place with the same name. Return the new requirement if it was modified."
;; Reverse Dependencies
(
write-section-header
"reverse-dependencies"
stream
)
(
format
stream
":reverse-dependencies~%"
)
(
dolist
(
reverse-dep
(
s
ort
(
copy-lis
t
(
context-reverse-dependencies
context
)
)
#'
string<
:key
(
compose
#'
project-name
#'
release-project
#'
car
)))
(
dolist
(
reverse-dep
(
s
afe-sor
t
(
context-reverse-dependencies
context
)
#'
string<
:key
(
compose
#'
project-name
#'
release-project
#'
car
)))
(
format
stream
"~S~%~%"
(
context-reverse-deps-to-form
reverse-dep
))))))
;; ** Releases
...
...
@@ -597,7 +598,7 @@ in place with the same name. Return the new requirement if it was modified."
`
(
,
(
project-name
(
release-project
release
))
:version
,
(
release-version
release
)
:source
,
(
source-name
(
release-source
release
))
:systems
,
system-names
))
:systems
,
(
safe-sort
system-names
#'
string<
)
))
(
defun
context-reverse-deps-to-form
(
release-and-reverse-deps
)
(
destructuring-bind
(
release
.
reverse-deps
)
release-and-reverse-deps
...
...
@@ -609,14 +610,14 @@ in place with the same name. Return the new requirement if it was modified."
:key
#'
requirement-why
))
(
let
((
project
(
release-project
release
))
reverse-dep-forms
)
(
dolist
(
reverse-dep
(
s
ort
(
copy-lis
t
reverse-deps
)
(
lambda
(
x
y
)
(
cond
((
eql
x
t
)
t
)
((
eql
y
t
)
nil
)
(
t
(
string<
(
system-name
(
system-release-system
x
))
(
system-name
(
system-release-system
y
))))))
:key
#'
requirement-why
))
(
dolist
(
reverse-dep
(
s
afe-sor
t
reverse-deps
(
lambda
(
x
y
)
(
cond
((
eql
x
t
)
t
)
((
eql
y
t
)
nil
)
(
t
(
string<
(
system-name
(
system-release-system
x
))
(
system-name
(
system-release-system
y
))))))
:key
#'
requirement-why
))
(
push
(
reverse-dep-to-form
reverse-dep
)
reverse-dep-forms
))
`
(
,
(
project-name
project
)
,@
reverse-dep-forms
))))
...
...
clpm/sources/fs.lisp
View file @
87ca6e5e
...
...
@@ -13,7 +13,8 @@
#:clpm/requirement
#:clpm/session
#:clpm/sources/defs
#:clpm/sources/dotted-versioned-project
)
#:clpm/sources/dotted-versioned-project
#:clpm/utils
)
(
:export
#:fs-source
#:fs-source-register-asd
#:fs-release
))
...
...
@@ -128,7 +129,7 @@ can be relative or absolute."
(
let*
((
system-files
(
hash-table-keys
(
fs-source-projects-by-namestring
source
))))
`
(
,
(
source-name
source
)
:type
:file-system
:system-files
,
system-files
)))
:system-files
,
(
safe-sort
system-files
#'
string<
)
)))
(
defmethod
sync-source
((
source
fs-source
))
nil
)
...
...
clpm/sources/vcs.lisp
View file @
87ca6e5e
...
...
@@ -17,7 +17,8 @@
#:clpm/repos
#:clpm/requirement
#:clpm/session
#:clpm/sources/defs
)
#:clpm/sources/defs
#:clpm/utils
)
(
:export
#:*vcs-project-override-fun*
#:ensure-vcs-release-installed!
#:make-vcs-release
...
...
@@ -127,7 +128,7 @@ source using VCS-SOURCE-REGISTER_PROJECT!."))
(
vcs-source-projects-by-name
source
))
(
list
(
source-name
source
)
:type
:vcs
:projects
projects
)))
:projects
(
safe-sort
projects
#'
string<
:key
#'
car
)
)))
(
defmethod
sync-source
((
source
vcs-source
))
nil
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment