Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Configuration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Libraries
Go
Application
Configuration
Compare revisions
v1.11.1 to v1.11.2
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
oss/libraries/go/application/configuration
Select target project
No results found
v1.11.2
Select Git revision
Swap
Target
oss/libraries/go/application/configuration
Select target project
oss/libraries/go/application/configuration
1 result
v1.11.1
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (3)
fix deleted files must not be removed from the watch list
· b83d77aa
Volker Schukai
authored
2 years ago
b83d77aa
Bump version to 1.11.2
· e65b57ad
Volker Schukai
authored
2 years ago
e65b57ad
Update changelog
· 394b5696
Volker Schukai
authored
2 years ago
394b5696
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.md
+7
-0
7 additions, 0 deletions
CHANGELOG.md
import.go
+2
-8
2 additions, 8 deletions
import.go
release.json
+1
-1
1 addition, 1 deletion
release.json
watch.go
+4
-4
4 additions, 4 deletions
watch.go
with
14 additions
and
13 deletions
CHANGELOG.md
View file @
394b5696
<a
name=
"v1.11.2"
></a>
## [v1.11.2] - 2022-10-23
### Bug Fixes
-
fix deleted files must not be removed from the watch list
<a
name=
"v1.11.1"
></a>
## [v1.11.1] - 2022-10-23
### Bug Fixes
...
...
@@ -119,6 +125,7 @@
<a
name=
"v1.0.0"
></a>
## v1.0.0 - 2022-09-18
[
v1.11.2
]:
https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.1...v1.11.2
[
v1.11.1
]:
https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.0...v1.11.1
[
v1.11.0
]:
https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.10.0...v1.11.0
[
v1.10.0
]:
https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.9.0...v1.10.0
...
...
This diff is collapsed.
Click to expand it.
import.go
View file @
394b5696
...
...
@@ -94,11 +94,7 @@ func (s *Settings[C]) importFiles() {
s
.
fileWatch
.
Lock
()
// new files may have been added
tmpWatchList
:=
make
(
map
[
string
]
bool
)
defer
func
()
{
s
.
fileWatch
.
watchList
=
tmpWatchList
s
.
fileWatch
.
Unlock
()
}()
...
...
@@ -122,9 +118,6 @@ func (s *Settings[C]) importFiles() {
r
:=
(
io
.
Reader
)(
f
)
s
.
importStream
(
reader
{
s
.
files
.
format
,
r
})
f
.
Close
()
tmpWatchList
[
fn
]
=
true
}
for
_
,
f
:=
range
s
.
files
.
files
{
...
...
@@ -135,10 +128,11 @@ func (s *Settings[C]) importFiles() {
r
.
Close
()
continue
}
s
.
importStream
(
reader
{
f
.
format
,
r
})
r
.
Close
()
tmpWatchList
[
f
.
path
]
=
true
}
}
...
...
This diff is collapsed.
Click to expand it.
release.json
View file @
394b5696
{
"version"
:
"1.11.
1
"
}
{
"version"
:
"1.11.
2
"
}
This diff is collapsed.
Click to expand it.
watch.go
View file @
394b5696
...
...
@@ -98,18 +98,18 @@ func (s *Settings[C]) Watch() *Settings[C] {
}
// add all files to the watch list
for
file
:=
range
s
.
fileWatch
.
watchList
{
for
file
Path
:=
range
s
.
fileWatch
.
watchList
{
fileInfo
,
err
:=
os
.
Stat
(
file
)
fileInfo
,
err
:=
os
.
Stat
(
file
Path
)
if
err
!=
nil
{
s
.
errors
=
append
(
s
.
errors
,
err
)
continue
}
if
fileInfo
.
IsDir
()
{
err
=
s
.
fileWatch
.
watcher
.
Add
(
file
)
err
=
s
.
fileWatch
.
watcher
.
Add
(
file
Path
)
}
else
{
err
=
s
.
fileWatch
.
watcher
.
Add
(
path
.
Dir
(
file
))
err
=
s
.
fileWatch
.
watcher
.
Add
(
path
.
Dir
(
file
Path
))
}
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.