Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pony
tshistory_supervision
Commits
e102fd71c4f9
Commit
12a65965
authored
Jun 06, 2018
by
Aurélien Campéas
Browse files
tsio: adjust doc & comments to the reality
parent
98c2c27ba82c
Changes
1
Hide whitespace changes
Inline
Side-by-side
tshistory_supervision/tsio.py
View file @
e102fd71
...
...
@@ -39,7 +39,7 @@ class TimeSerie(BaseTS):
value.
We can explain the workflow like with a traditional DVCS graph,
with t
wo
branches: "automatic" and "synthetic".
with t
hree
branches: "automatic"
, "manual"
and "synthetic".
All automatic fetches go into the automatic branch (and thus are
diffed against each other).
...
...
@@ -49,7 +49,8 @@ class TimeSerie(BaseTS):
all the manual entries.
The manual editions can be computed as a diff between synthetic
and automatic series.
and automatic series, but for convenience we also store them
explicitly.
"""
def
insert
(
self
,
cn
,
ts
,
name
,
author
,
_insertion_date
=
None
,
manual
=
False
):
...
...
@@ -65,7 +66,7 @@ class TimeSerie(BaseTS):
diff
=
ts
else
:
# insert
into synthetic
& compute diff over automatic
# insert & compute diff over automatic
basetsh
=
BaseTS
(
namespace
=
'{}-automatic'
.
format
(
self
.
namespace
))
diff
=
basetsh
.
insert
(
cn
,
ts
,
name
,
author
,
...
...
@@ -74,7 +75,7 @@ class TimeSerie(BaseTS):
if
diff
is
None
:
return
# insert the diff over automatic into synthetic
# insert the diff over automatic
or the manual edit
into synthetic
a
=
super
().
insert
(
cn
,
diff
,
name
,
author
,
_insertion_date
=
_insertion_date
...
...
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