##// END OF EJS Templates
fix line/statys typo in utils.submodule
MinRK -
Show More
@@ -1,96 +1,96 b''
1 """utilities for checking submodule status"""
1 """utilities for checking submodule status"""
2
2
3 #-----------------------------------------------------------------------------
3 #-----------------------------------------------------------------------------
4 # Copyright (C) 2013 The IPython Development Team
4 # Copyright (C) 2013 The IPython Development Team
5 #
5 #
6 # Distributed under the terms of the BSD License. The full license is in
6 # Distributed under the terms of the BSD License. The full license is in
7 # the file COPYING, distributed as part of this software.
7 # the file COPYING, distributed as part of this software.
8 #-----------------------------------------------------------------------------
8 #-----------------------------------------------------------------------------
9
9
10 #-----------------------------------------------------------------------------
10 #-----------------------------------------------------------------------------
11 # Imports
11 # Imports
12 #-----------------------------------------------------------------------------
12 #-----------------------------------------------------------------------------
13
13
14 import os
14 import os
15 import subprocess
15 import subprocess
16 import sys
16 import sys
17
17
18 #-----------------------------------------------------------------------------
18 #-----------------------------------------------------------------------------
19 # Globals
19 # Globals
20 #-----------------------------------------------------------------------------
20 #-----------------------------------------------------------------------------
21
21
22 pjoin = os.path.join
22 pjoin = os.path.join
23
23
24 #-----------------------------------------------------------------------------
24 #-----------------------------------------------------------------------------
25 # Code
25 # Code
26 #-----------------------------------------------------------------------------
26 #-----------------------------------------------------------------------------
27
27
28 def ipython_parent():
28 def ipython_parent():
29 """return IPython's parent (i.e. root if run from git)"""
29 """return IPython's parent (i.e. root if run from git)"""
30 from IPython.utils.path import get_ipython_package_dir
30 from IPython.utils.path import get_ipython_package_dir
31 return os.path.abspath(os.path.dirname(get_ipython_package_dir()))
31 return os.path.abspath(os.path.dirname(get_ipython_package_dir()))
32
32
33 def ipython_submodules(root):
33 def ipython_submodules(root):
34 """return IPython submodules relative to root"""
34 """return IPython submodules relative to root"""
35 return [
35 return [
36 pjoin(root, 'IPython', 'html', 'static', 'components'),
36 pjoin(root, 'IPython', 'html', 'static', 'components'),
37 ]
37 ]
38
38
39 def is_repo(d):
39 def is_repo(d):
40 """is d a git repo?"""
40 """is d a git repo?"""
41 return os.path.exists(pjoin(d, '.git'))
41 return os.path.exists(pjoin(d, '.git'))
42
42
43 def check_submodule_status(root=None):
43 def check_submodule_status(root=None):
44 """check submodule status
44 """check submodule status
45
45
46 Has three return values:
46 Has three return values:
47
47
48 'missing' - submodules are absent
48 'missing' - submodules are absent
49 'unclean' - submodules have unstaged changes
49 'unclean' - submodules have unstaged changes
50 'clean' - all submodules are up to date
50 'clean' - all submodules are up to date
51 """
51 """
52
52
53 if hasattr(sys, "frozen"):
53 if hasattr(sys, "frozen"):
54 # frozen via py2exe or similar, don't bother
54 # frozen via py2exe or similar, don't bother
55 return 'clean'
55 return 'clean'
56
56
57 if not root:
57 if not root:
58 root = ipython_parent()
58 root = ipython_parent()
59
59
60 if not is_repo(root):
60 if not is_repo(root):
61 # not in git, assume clean
61 # not in git, assume clean
62 return 'clean'
62 return 'clean'
63
63
64 submodules = ipython_submodules(root)
64 submodules = ipython_submodules(root)
65
65
66 for submodule in submodules:
66 for submodule in submodules:
67 if not os.path.exists(submodule):
67 if not os.path.exists(submodule):
68 return 'missing'
68 return 'missing'
69
69
70 # Popen can't handle unicode cwd on Windows Python 2
70 # Popen can't handle unicode cwd on Windows Python 2
71 if sys.platform == 'win32' and sys.version_info[0] < 3 \
71 if sys.platform == 'win32' and sys.version_info[0] < 3 \
72 and not isinstance(root, bytes):
72 and not isinstance(root, bytes):
73 root = root.encode(sys.getfilesystemencoding() or 'ascii')
73 root = root.encode(sys.getfilesystemencoding() or 'ascii')
74 # check with git submodule status
74 # check with git submodule status
75 proc = subprocess.Popen('git submodule status',
75 proc = subprocess.Popen('git submodule status',
76 stdout=subprocess.PIPE,
76 stdout=subprocess.PIPE,
77 stderr=subprocess.PIPE,
77 stderr=subprocess.PIPE,
78 shell=True,
78 shell=True,
79 cwd=root,
79 cwd=root,
80 )
80 )
81 status, _ = proc.communicate()
81 status, _ = proc.communicate()
82 status = status.decode("ascii", "replace")
82 status = status.decode("ascii", "replace")
83
83
84 for line in status.splitlines():
84 for line in status.splitlines():
85 if status.startswith('-'):
85 if line.startswith('-'):
86 return 'missing'
86 return 'missing'
87 elif status.startswith('+'):
87 elif line.startswith('+'):
88 return 'unclean'
88 return 'unclean'
89
89
90 return 'clean'
90 return 'clean'
91
91
92 def update_submodules(repo_dir):
92 def update_submodules(repo_dir):
93 """update submodules in a repo"""
93 """update submodules in a repo"""
94 subprocess.check_call("git submodule init", cwd=repo_dir, shell=True)
94 subprocess.check_call("git submodule init", cwd=repo_dir, shell=True)
95 subprocess.check_call("git submodule update --recursive", cwd=repo_dir, shell=True)
95 subprocess.check_call("git submodule update --recursive", cwd=repo_dir, shell=True)
96
96
General Comments 0
You need to be logged in to leave comments. Login now