Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpcdf
obs
osc-plugins
Commits
d56ab3f8
Commit
d56ab3f8
authored
Jan 15, 2020
by
Lorenz Huedepohl
Browse files
Update with new repo path
parent
061034b7
Pipeline
#67079
passed with stage
in 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
mpcdf_common.py
View file @
d56ab3f8
...
...
@@ -68,7 +68,7 @@ def check_for_update():
git_dir
=
os
.
path
.
join
(
plugin_dir
,
".git"
)
local_rev
=
check_output
([
"git"
,
"--git-dir"
,
git_dir
,
"rev-parse"
,
"HEAD"
],
**
set_encoding
).
strip
()
url
=
"https://gitlab.mpcdf.mpg.de/mpcdf/osc-plugins.git"
url
=
"https://gitlab.mpcdf.mpg.de/mpcdf/
obs/
osc-plugins.git"
def
update_server_rev
():
server_rev
,
_
=
check_output
([
"git"
,
"ls-remote"
,
url
,
"master"
],
**
set_encoding
).
split
(
None
,
1
)
...
...
@@ -96,13 +96,13 @@ def check_for_update():
server_rev
=
fd
.
read
().
strip
()
if
server_rev
!=
local_rev
:
print
(
"Note from MPCDF osc plugins:"
,
file
=
sys
.
stderr
)
if
call
([
"git"
,
"--git-dir"
,
git_dir
,
"merge-base"
,
"--is-ancestor"
,
server_rev
,
"HEAD"
])
==
0
:
print
(
file
=
sys
.
stderr
)
print
(
"You have unpushed commits in"
,
plugin_dir
,
"- consider pushing them"
,
file
=
sys
.
stderr
)
print
(
" You have unpushed commits in"
,
plugin_dir
,
"- consider pushing them"
,
file
=
sys
.
stderr
)
print
(
file
=
sys
.
stderr
)
else
:
print
(
file
=
sys
.
stderr
)
print
(
"
Your plugin directory is out-of-date, new commits available on"
,
url
,
file
=
sys
.
stderr
)
print
(
" Your plugin directory is out-of-date, new commits available on"
,
url
,
file
=
sys
.
stderr
)
print
(
"
(careful: the repo has been moved, update your path to point to the new URL)"
,
file
=
sys
.
stderr
)
print
(
file
=
sys
.
stderr
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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