rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Ignore untracked files or detached HEAD in the dirty repo check.

Browse Source 
Closes #2960.
This commit is contained in:
Chris Johns 2017-09-22 11:55:10 +10:00
parent e6d0a8bae6
commit 1519d11fce
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source-builder/sb/git.py
View File

@ -70,9 +70,9 @@ class repo:
if len(gvs) < 3: if len(gvs) < 3:
raise error.general('invalid version string from git: %s' % (output)) raise error.general('invalid version string from git: %s' % (output))
vs = gvs[2].split('.') vs = gvs[2].split('.')
if len(vs) != 4: if len(vs) not in [3, 4]:
raise error.general('invalid version number from git: %s' % (gvs[2])) raise error.general('invalid version number from git: %s' % (gvs[2]))
return (int(vs[0]), int(vs[1]), int(vs[2]), int(vs[3])) return tuple(map(int, vs))
def clone(self, url, _path): def clone(self, url, _path):
ec, output = self._run(['clone', url, path.host(_path)], check = True) ec, output = self._run(['clone', url, path.host(_path)], check = True)
@ -105,14 +105,28 @@ class repo:
def submodule(self, module): def submodule(self, module):
ec, output = self._run(['submodule', 'update', '--init', module], check = True) ec, output = self._run(['submodule', 'update', '--init', module], check = True)
def submodules(self):
smodules = {}
ec, output = self._run(['submodule'], check = True)
if ec == 0:
for l in output.split('\n'):
ms = l.split()
if len(ms) == 3:
smodules[ms[1]] = (ms[0], ms[2][1:-1])
return smodules
def clean(self, args = []): def clean(self, args = []):
if type(args) == str: if type(args) == str:
args = [args] args = [args]
ec, output = self._run(['clean'] + args, check = True) ec, output = self._run(['clean'] + args, check = True)
def status(self): def status(self, submodules_always_clean = False):
_status = {} _status = {}
if path.exists(self.path): if path.exists(self.path):
if submodules_always_clean:
submodules = self.submodules()
else:
submodules = {}
ec, output = self._run(['status']) ec, output = self._run(['status'])
if ec == 0: if ec == 0:
state = 'none' state = 'none'
@ -133,16 +147,22 @@ class repo:
if l[0].isspace(): if l[0].isspace():
l = l.strip() l = l.strip()
if l[0] != '(': if l[0] != '(':
if state not in _status:
_status[state] = []
l = l[1:]
if ':' in l: if ':' in l:
l = l.split(':')[1] l = l.split(':')[1]
_status[state] += [l.strip()] if len(l.strip()) > 0:
l = l.strip()
ls = l.split()
if state != 'unstaged' or ls[0] not in submodules:
if state not in _status:
_status[state] = [l]
else:
_status[state] += [l]
return _status return _status
def dirty(self): def dirty(self):
_status = self.status() _status = self.status()
_status.pop('untracked', None)
_status.pop('detached', None)
return not (len(_status) == 1 and 'branch' in _status) return not (len(_status) == 1 and 'branch' in _status)
def valid(self): def valid(self):
@ -200,13 +220,17 @@ class repo:
return hash return hash
if __name__ == '__main__': if __name__ == '__main__':
import os.path
import sys import sys
opts = options.load(sys.argv) defaults = path.join(path.dirname(path.dirname(path.shell(sys.argv[0]))), 'defaults.mc')
opts = options.load(sys.argv, defaults = defaults)
g = repo('.', opts) g = repo('.', opts)
print(g.git_version()) print('g.git_version():', g.git_version())
print(g.valid()) print('g.valid():', g.valid())
print(g.status()) print('g.submodules():', g.submodules())
print(g.clean()) print('g.status():', g.status())
print(g.remotes()) print('g.status():', g.status(True))
print(g.email()) print('g.dirty():', g.dirty())
print(g.head()) print('g.remotes():', g.remotes())
print('g.email():', g.email())
print('g.head():', g.head())