def test(self, args):
"""
发布到测试分支，只允许单个分支发布
:param args:
:return:
"""
# 当前工作空间是否干净
if not igit.workspace_is_clean():
raise exception.FlowException(u'工作区中尚有未保存的内容')
if not args:
branch = igit.current_branch()
else:
branch = args.pop(0)
branch = igit.real_branch(branch, self.cmd)
if branch != igit.current_branch():
# 切换分支
info(u'切换到分支%s' % branch)
ihelper.execute('git checkout ' + branch)
# 当前工作空间是否干净
if not igit.workspace_is_clean():
raise exception.FlowException(u'工作区中尚有未保存的内容')
igit.sync_branch()
# 切换到test分支
test_branch = igit.test_branch()
info(u'切换到分支%s' % test_branch)
ihelper.execute('git checkout ' + test_branch)
# 当前工作空间是否干净
if not igit.workspace_is_clean():
raise exception.FlowException(u'工作区中尚有未保存的内容')
# 合并
info(u'正在将%s合并到%s上...' % (branch, test_branch))
igit.merge(branch)
# 正常执行后，工作空间应该是干净的
if not igit.workspace_is_clean():
raise exception.FlowException(u'合并失败,请用git status查看工作空间详情')
# 将test推到远程
igit.push()
# 切换到原来的分支
info(u'切换回%s' % branch)
ihelper.execute('git checkout ' + branch)
ok(u'合并到' + test_branch + u'成功!')
def tag(self):
"""
在生产分支上打标签
:return:
"""
if not self.args:
return ihelper.execute('git tag')
#将要在该分支上打标签
tag_branch = igit.product_branch()
# 当前工作空间是否干净
if igit.current_branch() != tag_branch and not igit.workspace_is_clean(
):
raise exception.FlowException(u'工作区中尚有未保存的内容')
tag_name = None
comment = ''
while self.args:
c = self.args.pop(0)
if c == '-a':
tag_name = self.args.pop(0)
elif c == '-m':
while self.args:
if self.args[0].startswith('-'):
break
comment += self.args.pop(0) + ' '
if not comment:
raise exception.FlowException(u'请输入标签注释')
if not tag_name:
tag_name = igit.tag_name()
if not tag_name:
raise exception.FlowException(u'未设置tag name')
if ihelper.confirm(u'将在分支 %s 上打tag：%s, ok?' %
(tag_branch, tag_name)) != 'y':
warn(u'取消操作')
return
c_branch = igit.current_branch()
try:
#切换分支
if c_branch != tag_branch:
info(u'切换到分支 %s:' % tag_branch)
ihelper.execute('git checkout %s' % tag_branch)
#打tag
print igit.tag(tag_name, comment)
except exception.FlowException, e:
error(u'操作失败：')
raise e
def checkout(self, args):
"""
切换到某个特性/修复分支并拉取最新代码（如果工作空间是干净的）
:return:
"""
branch = None
sync_remote = False
while args:
c = args.pop(0)
if c == '-r' or c == '--remote':
sync_remote = True
else:
branch = igit.real_branch(c, self.cmd)
current_branch = igit.current_branch()
if not branch:
branch = current_branch
if branch == current_branch:
sync_remote = True
__error = False
if branch != current_branch:
# 检查当前分支下工作区状态
if not igit.workspace_is_clean():
raise exception.FlowException(
u'工作区中尚有未提交的内容，请先用commit提交或用git stash保存到Git栈中')
out = ihelper.execute('git checkout ' + branch, return_result=True)
# git的checkout指令输出在stderr中
if 'Switched to branch' not in out:
__error = True
if __error:
warn(u'checkout失败')
return
if sync_remote:
info('fetch from remote...')
igit.fetch(branch=branch)
if igit.workspace_at_status(
iglobal.GIT_BEHIND) or igit.workspace_at_status(
iglobal.GIT_BEHIND):
warn(u'远程仓库已有更新，请执行 git rebase 获取最新代码')
def create(self, args):
"""
创建特性/修复分支。一次只能创建一个，会推到远端，且切换到此分支
:return:
"""
if not args:
raise exception.FlowException(u'指令格式错误，请输入h %s查看使用说明' % self.cmd)
branch = None
auto_create_from_remote = False
push_to_remote = True
while args:
c = args.pop(0)
if c == '-y':
auto_create_from_remote = True
elif c == '--np' or c == '--no-push':
push_to_remote = False
else:
branch = c
if not branch:
raise exception.FlowException(u'请输入分支名称')
# 分支简称不可与项目、迭代名称相同(防止一些指令出现歧义)
simple_branch = igit.simple_branch(branch)
if simple_branch == iglobal.SPRINT or simple_branch in ihelper.projects(
):
raise exception.FlowException(u'分支简称不可与项目或迭代名同名')
branch = igit.real_branch(branch, self.cmd)
# 检查当前分支下工作区状态
if not igit.workspace_is_clean():
raise exception.FlowException(
u'工作区中尚有未提交的内容，请先用git commit提交或用git stash保存到Git栈中')
# 分支名称重复性检查
info(u'检查本地分支...')
if branch in igit.local_branches():
raise exception.FlowException(u'该分支名称已经存在')
# 本地没有但远程有
create_from_remote = False
info(u'检查远程分支...')
if branch in igit.remote_branches():
if not auto_create_from_remote and ihelper.confirm(
u'远程仓库已存在%s，是否基于该远程分支创建本地分支？' % branch) != 'y':
return
else:
create_from_remote = True
say(('white', u'正在创建分支'), ('sky_blue', branch), ('white', '...'))
if create_from_remote:
# 基于远程分支创建本地分支，会自动追踪该远程分支
ihelper.execute('git checkout -b ' + branch + ' origin/' + branch)
else:
# 切换到生产分支
p_branch = igit.product_branch()
ihelper.execute('git checkout ' + p_branch)
igit.pull()
# 基于本地生产分支创建新分支
ihelper.execute('git checkout -b ' + branch)
# 推送到远程
if push_to_remote:
ihelper.execute('git push -u origin ' + branch + ':' + branch)
if igit.workspace_is_clean():
#处理master更新检验，防止创建分支后执行master更新检查操作
igit.set_last_sync_master_date(branch)
ok(u'创建成功!已进入分支：' + branch)
else:
raise exception.FlowException(u'创建分支失败')
def publish_to_master(self, branches=None):
"""
发布分支到生产环境
:param branches: 待发布分支列表：[(proj_name, branch)]
"""
curr_p_branch = None
tag_list = []
if not branches:
#接着上次的继续发布
branches = ihelper.read_runtime('publish_branches')
tag_list = ihelper.read_runtime('publish_tags') or []
if not branches:
info(u'没有需要发布的分支')
return
orig_branches = list(branches)
try:
curr_proj = None
for index, item in enumerate(branches):
curr_p_branch = item
proj, branch = tuple(item)
if iglobal.PROJECT != proj:
info(u'进入项目%s' % proj)
extra.Extra('cd', [proj]).execute()
if not igit.workspace_is_clean():
raise exception.FlowException(
u'项目%s工作空间有未提交的更改，请先提交(或丢弃)后执行 %s p --continue 继续' %
(proj, self.cmd))
# 首次进入项目执行fetch获取本地和远程分支差异
if curr_proj != proj:
info('fetch...')
igit.fetch(useCache=False)
# 切换到将要合并的分支(如果不存在本地分支则会自动创建)
ihelper.execute('git checkout %s' % branch)
# 同步当前本地和远程分支(此处可能会出现冲突)
igit.sync_branch()
# 切换到master分支
ihelper.execute('git checkout %s' % igit.product_branch())
is_last_branch = index >= len(
branches) - 1 or proj != branches[index + 1][0]
# 合并
info(u'合并%s...' % branch)
igit.merge(branch,
need_pull=proj != curr_proj,
need_push=is_last_branch)
info(u'合并完成：%s' % branch)
# 完成
orig_branches.remove(curr_p_branch)
if proj != curr_proj:
curr_proj = proj
# 本项目发布完成后的一些操作
if is_last_branch:
self.__post_publish(proj, tag_list)
ok(u'发布完成！tag：')
# 打印tag信息
for (proj_name, tag_name) in tag_list:
info(' %s %s' % (proj_name, tag_name))
# 清空tag list
tag_list = []
except Exception, e:
error(e.message)
warn(u'处理完成后执行 %s p --continue 继续。或执行 %s p --abort 结束' %
(self.cmd, self.cmd))
def sql(args=None):
"""
获取项目下面的所有sql
:param args:
:return:
"""
dirs = []
old_proj = iglobal.PROJECT
for proj, info in iconfig.read_config('project').items():
if 'ignore_sql_file' in info and info['ignore_sql_file']:
continue
# 需要先将项目切换到相应的分支
sql_branch = info['branch']['sql_branch'] \
if info.has_key('branch') and 'sql_branch' in info['branch'] \
else iconfig.read_config('system', 'branch')['sql_branch']
# 进入项目
if iglobal.PROJECT != proj:
iprint.info(u'进入项目%s' % proj)
Extra.cd([proj])
curr_branch = igit.current_branch()
if curr_branch != sql_branch:
if not igit.workspace_is_clean():
raise exception.FlowException(u'项目的工作空间有尚未保存的修改，请先执行git commit提交或git clean -fd丢弃。处理后请再次执行sql指令')
# 切换分支
ihelper.system('git checkout %s' % sql_branch)
# 拉取
igit.pull()
base_dir = info['dir']
if 'sql_dir' in info:
rel_dir = info['sql_dir']
else:
rel_dir = iconfig.read_config('system', 'sql_dir')
dirs.append((proj, ihelper.real_path(str(base_dir).rstrip('/') + '/' + rel_dir)))
if iglobal.PROJECT != old_proj:
Extra.cd([old_proj])
sql_file_suffixes = [ele.lstrip('.') for ele in str(iconfig.read_config('system', 'sql_file_suffix')).split('|')]
if not dirs:
return
files = []
for proj, sql_path in dirs:
if not sql_path or not os.path.exists(sql_path):
continue
# 获取文件夹下所有的sql文件
for f in os.listdir(sql_path):
f = sql_path + f
if not os.path.isfile(f):
continue
if f.split('.')[-1] in sql_file_suffixes:
files.append(f)
if not files:
iprint.info(u'本次迭代没有sql需要执行')
return
# 排序
def __isort(x, y):
"""
:type x: str
:type y: str
:return:
"""
sp_date = isprint.get_date_from_sprint(iglobal.SPRINT).split('-')
year = sp_date[0]
month = sp_date[1]
x = os.path.basename(x)
y = os.path.basename(y)
if month == '12' and x.startswith('01'):
x = str(int(year) + 1) + x
else:
x = year + x
if month == '12' and y.startswith('01'):
y = str(int(year) + 1) + y
else:
y = year + y
if x < y:
return -1
return 1 if x > y else 0
files.sort(__isort)
print
iprint.warn(u'以下sql需要发布：')
for f in files:
iprint.info(' ' + os.path.basename(f))
print
out_file = iglobal.BASE_DIR + '/runtime/' + iglobal.SPRINT + '.sql'
if ihelper.confirm(u'是否导出sql？') == 'y':
out_handler = open(out_file, 'w')
out_handler.write('set names utf8;\n')
for f_name in files:
f_handler = open(f_name, 'r')
out_handler.write('\n\n-- ----------------------------------- %s -----------------------------------\n' % os.path.basename(f_name))
out_handler.write(f_handler.read())
f_handler.close()
out_handler.close()
print
iprint.ok(u'已写入到%s中' % out_file)
else:
return