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
Commits
2486c08e1be6
Commit
cf742bd9
authored
May 24, 2019
by
Aurélien Campéas
Browse files
log: stop returning a list of names
... since we only get one at a time.
parent
d4e2605c761e
Changes
3
Hide whitespace changes
Inline
Side-by-side
test/test_tsio.py
View file @
2486c08e
...
...
@@ -673,17 +673,17 @@ def test_history(engine, tsh):
{
'author'
:
'aurelien.campeas@pythonian.fr'
,
'meta'
:
{},
'date'
:
pd
.
Timestamp
(
'2017-02-01 00:00:00+0000'
,
tz
=
'UTC'
),
'name
s
'
:
[
'smallserie'
]
'name'
:
'smallserie'
},
{
'author'
:
'aurelien.campeas@pythonian.fr'
,
'meta'
:
{},
'date'
:
pd
.
Timestamp
(
'2017-02-02 00:00:00+0000'
,
tz
=
'UTC'
),
'name
s
'
:
[
'smallserie'
]
'name'
:
'smallserie'
},
{
'author'
:
'aurelien.campeas@pythonian.fr'
,
'meta'
:
{},
'date'
:
pd
.
Timestamp
(
'2017-02-03 00:00:00+0000'
,
tz
=
'UTC'
),
'name
s
'
:
[
'smallserie'
]
'name'
:
'smallserie'
}
]
==
[{
k
:
v
for
k
,
v
in
log
.
items
()
if
k
!=
'rev'
}
for
log
in
logs
]
...
...
tshistory/cli.py
View file @
2486c08e
...
...
@@ -36,13 +36,13 @@ date: {date}
def
format_rev
(
rev
):
fmt
=
REVFMT
+
'
\n
'
if
rev
.
get
(
'diff'
):
fmt
+=
'series: {name
s
}
\n\n
'
fmt
+=
'series: {name}
\n\n
'
lines
=
[]
for
ts
in
rev
[
'diff'
].
values
():
lines
.
append
(
ts
.
to_string
())
fmt
+=
'
\n
'
.
join
(
lines
)
else
:
fmt
+=
'series: {name
s
}'
fmt
+=
'series: {name}'
return
fmt
.
format
(
**
rev
)
...
...
@@ -129,7 +129,7 @@ def log(db_uri, limit, serie, from_rev, to_rev,
for
rev
in
tsh
.
log
(
engine
,
limit
=
limit
,
names
=
serie
,
fromrev
=
from_rev
,
torev
=
to_rev
,
fromdate
=
from_insertion_date
,
todate
=
to_insertion_date
):
rev
[
'name
s
'
]
=
','
.
join
(
rev
[
'names'
])
#
rev['name'] = ','.join(rev['names'])
print
(
format_rev
(
rev
))
print
()
...
...
tshistory/tsio.py
View file @
2486c08e
...
...
@@ -512,7 +512,7 @@ class timeseries(SeriesServices):
log
.
append
({
'rev'
:
csetid
,
'author'
:
author
,
'date'
:
pd
.
Timestamp
(
revdate
).
tz_convert
(
'utc'
),
'meta'
:
meta
or
{},
'name
s
'
:
self
.
_changeset_series
(
cn
,
csetid
)})
'name'
:
self
.
_changeset_series
(
cn
,
csetid
)})
log
.
sort
(
key
=
lambda
rev
:
rev
[
'rev'
])
return
log
...
...
@@ -715,16 +715,17 @@ class timeseries(SeriesServices):
).
scalar
()
def
_changeset_series
(
self
,
cn
,
csid
):
sql
=
(
'select seriename '
f
'from "
{
self
.
namespace
}
".registry as reg, '
f
' "
{
self
.
namespace
}
".changeset_series as css '
'where css.serie = reg.id '
'and css.cset = %(csid)s'
)
q
=
sqlq
(
'seriename'
).
relation
(
f
'"
{
self
.
namespace
}
".registry as reg'
,
).
join
(
f
'"
{
self
.
namespace
}
".changeset_series as css on css.serie = reg.id'
).
where
(
'css.cset = %(csid)s'
,
csid
=
csid
)
return
[
row
.
seriename
for
row
in
cn
.
execute
(
sql
,
csid
=
csid
).
fetchall
()
]
return
q
.
do
(
cn
).
scalar
()
def
_previous_cset
(
self
,
cn
,
seriename
,
csid
):
tablename
=
self
.
_serie_to_tablename
(
cn
,
seriename
)
...
...
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