git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
module-tools & git clone : specify --depth only when necessary
[build.git]
/
module-tools.py
diff --git
a/module-tools.py
b/module-tools.py
index
a1d3ab1
..
aed29e3
100755
(executable)
--- a/
module-tools.py
+++ b/
module-tools.py
@@
-111,6
+111,7
@@
class Command:
print 'dry_run',self.command
return 0
if self.options.verbose:
print 'dry_run',self.command
return 0
if self.options.verbose:
+ print '>',os.getcwd()
print '+',self.command,' .. ',
sys.stdout.flush()
retcod=os.system(self.command + " &> " + self.tmp)
print '+',self.command,' .. ',
sys.stdout.flush()
retcod=os.system(self.command + " &> " + self.tmp)
@@
-179,7
+180,7
@@
class SvnRepository:
return "%s/%s" % (root, self.pathname())
@classmethod
return "%s/%s" % (root, self.pathname())
@classmethod
- def c
heckout
(cls, remote, local, options, recursive=False):
+ def c
lone
(cls, remote, local, options, recursive=False):
if recursive:
svncommand = "svn co %s %s" % (remote, local)
else:
if recursive:
svncommand = "svn co %s %s" % (remote, local)
else:
@@
-190,12
+191,12
@@
class SvnRepository:
return SvnRepository(local, options)
@classmethod
return SvnRepository(local, options)
@classmethod
- def remote_exists(cls, remote):
- return
os.system("svn list %s &> /dev/null" % remote) ==
0
+ def remote_exists(cls, remote
, options
):
+ return
Command ("svn list %s &> /dev/null" % remote , options).run()==
0
def tag_exists(self, tagname):
url = "%s/tags/%s" % (self.repo_root(), tagname)
def tag_exists(self, tagname):
url = "%s/tags/%s" % (self.repo_root(), tagname)
- return SvnRepository.remote_exists(url)
+ return SvnRepository.remote_exists(url
, self.options
)
def update(self, subdir="", recursive=True, branch=None):
path = os.path.join(self.path, subdir)
def update(self, subdir="", recursive=True, branch=None):
path = os.path.join(self.path, subdir)
@@
-213,11
+214,11
@@
class SvnRepository:
def to_branch(self, branch):
remote = "%s/branches/%s" % (self.repo_root(), branch)
def to_branch(self, branch):
remote = "%s/branches/%s" % (self.repo_root(), branch)
- SvnRepository.c
heckout
(remote, self.path, self.options, recursive=True)
+ SvnRepository.c
lone
(remote, self.path, self.options, recursive=True)
def to_tag(self, tag):
remote = "%s/tags/%s" % (self.repo_root(), branch)
def to_tag(self, tag):
remote = "%s/tags/%s" % (self.repo_root(), branch)
- SvnRepository.c
heckout
(remote, self.path, self.options, recursive=True)
+ SvnRepository.c
lone
(remote, self.path, self.options, recursive=True)
def tag(self, tagname, logfile):
tag_url = "%s/tags/%s" % (self.repo_root(), tagname)
def tag(self, tagname, logfile):
tag_url = "%s/tags/%s" % (self.repo_root(), tagname)
@@
-279,14
+280,15
@@
class GitRepository:
return line.split()[2]
@classmethod
return line.split()[2]
@classmethod
- def c
heckout(cls, remote, local, options, depth=0
):
+ def c
lone(cls, remote, local, options, depth=None
):
Command("rm -rf %s" % local, options).run_silent()
Command("rm -rf %s" % local, options).run_silent()
- Command("git clone --depth %d %s %s" % (depth, remote, local), options).run_fatal()
+ depth_option = "" if depth is None else " --depth {}".format(depth)
+ Command("git clone{} {} {}".format(depth_option, remote, local), options).run_fatal()
return GitRepository(local, options)
@classmethod
return GitRepository(local, options)
@classmethod
- def remote_exists(cls, remote):
- return
os.system("git --no-pager ls-remote %s &> /dev/null" % remote) ==
0
+ def remote_exists(cls, remote
, options
):
+ return
Command ("git --no-pager ls-remote %s &> /dev/null" % remote, options).run()==
0
def tag_exists(self, tagname):
command = 'git tag -l | grep "^%s$"' % tagname
def tag_exists(self, tagname):
command = 'git tag -l | grep "^%s$"' % tagname
@@
-392,17
+394,16
@@
class Repository:
break
@classmethod
break
@classmethod
- def has_moved_to_git(cls, module, config):
+ def has_moved_to_git(cls, module, config
,options
):
module = svn_to_git_name(module)
# check if the module is already in Git
module = svn_to_git_name(module)
# check if the module is already in Git
-# return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module))
- return GitRepository.remote_exists(Module.git_remote_dir(module))
+ return GitRepository.remote_exists(Module.git_remote_dir(module),options)
@classmethod
@classmethod
- def remote_exists(cls, remote):
+ def remote_exists(cls, remote
, options
):
for repo in Repository.supported_repo_types:
for repo in Repository.supported_repo_types:
- if repo.remote_exists(remote):
+ if repo.remote_exists(remote
, options
):
return True
return False
return True
return False
@@
-558,11
+559,11
@@
module-* commands need a fresh working dir. Make sure that you do not use
that for other purposes than tagging""" % options.workdir
sys.exit(1)
that for other purposes than tagging""" % options.workdir
sys.exit(1)
- def c
heckout
_build():
+ def c
lone
_build():
print "Checking out build module..."
remote = cls.git_remote_dir(cls.config['build'])
local = os.path.join(options.workdir, cls.config['build'])
print "Checking out build module..."
remote = cls.git_remote_dir(cls.config['build'])
local = os.path.join(options.workdir, cls.config['build'])
- GitRepository.c
heckout
(remote, local, options, depth=1)
+ GitRepository.c
lone
(remote, local, options, depth=1)
print "OK"
def store_config():
print "OK"
def store_config():
@@
-590,7
+591,7
@@
that for other purposes than tagging""" % options.workdir
print "Cannot find",options.workdir,"let's create it"
Command("mkdir -p %s" % options.workdir, options).run_silent()
cls.prompt_config()
print "Cannot find",options.workdir,"let's create it"
Command("mkdir -p %s" % options.workdir, options).run_silent()
cls.prompt_config()
- c
heckout
_build()
+ c
lone
_build()
store_config()
else:
read_config()
store_config()
else:
read_config()
@@
-605,12
+606,12
@@
that for other purposes than tagging""" % options.workdir
if old_layout:
Command("rm -rf %s" % options.workdir, options).run_silent()
Command("mkdir -p %s" % options.workdir, options).run_silent()
if old_layout:
Command("rm -rf %s" % options.workdir, options).run_silent()
Command("mkdir -p %s" % options.workdir, options).run_silent()
- c
heckout
_build()
+ c
lone
_build()
store_config()
build_dir = os.path.join(options.workdir, cls.config['build'])
if not os.path.isdir(build_dir):
store_config()
build_dir = os.path.join(options.workdir, cls.config['build'])
if not os.path.isdir(build_dir):
- c
heckout
_build()
+ c
lone
_build()
else:
build = Repository(build_dir, options)
if not build.is_clean():
else:
build = Repository(build_dir, options)
if not build.is_clean():
@@
-629,20
+630,20
@@
that for other purposes than tagging""" % options.workdir
print 'Checking for',self.module_dir
if not os.path.isdir (self.module_dir):
print 'Checking for',self.module_dir
if not os.path.isdir (self.module_dir):
- if Repository.has_moved_to_git(self.pathname, Module.config):
- self.repository = GitRepository.c
heckout
(self.git_remote_dir(self.pathname),
-
self.module_dir,
-
self.options)
+ if Repository.has_moved_to_git(self.pathname, Module.config
, self.options
):
+ self.repository = GitRepository.c
lone
(self.git_remote_dir(self.pathname),
+ self.module_dir,
+ self.options)
else:
remote = self.svn_selected_remote()
else:
remote = self.svn_selected_remote()
- self.repository = SvnRepository.c
heckout
(remote,
-
self.module_dir,
-
self.options, recursive=False)
+ self.repository = SvnRepository.c
lone
(remote,
+ self.module_dir,
+ self.options, recursive=False)
self.repository = Repository(self.module_dir, self.options)
if self.repository.type == "svn":
# check if module has moved to git
self.repository = Repository(self.module_dir, self.options)
if self.repository.type == "svn":
# check if module has moved to git
- if Repository.has_moved_to_git(self.pathname, Module.config):
+ if Repository.has_moved_to_git(self.pathname, Module.config
, self.options
):
Command("rm -rf %s" % self.module_dir, self.options).run_silent()
self.init_module_dir()
# check if we have the required branch/tag
Command("rm -rf %s" % self.module_dir, self.options).run_silent()
self.init_module_dir()
# check if we have the required branch/tag
@@
-1344,7
+1345,14
@@
def release_changelog(options, buildtag_old, buildtag_new):
os.system("cp -f /%s %s" % (specfile, tmpfile))
m = get_module(module, second)
os.system("cp -f /%s %s" % (specfile, tmpfile))
m = get_module(module, second)
- m.init_module_dir()
+ # patch for ipfw that, being managed in a separate repo, won't work for now
+ try:
+ m.init_module_dir()
+ except Exception,e:
+ print """Could not retrieve module %s - skipped
+{{{ %s }}}
+""" %( m.friendly_name(), e)
+ continue
specfile = m.main_specname()
if m.repository.type == "svn":
specfile = m.main_specname()
if m.repository.type == "svn":