Git_Ctrl.py 18 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419
  1. # -*- coding: <encoding name> -*-
  2. from git import Repo
  3. from os.path import split,exists
  4. import os
  5. import subprocess
  6. from time import time
  7. import random
  8. sys_seeting = dict(shell=True,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True)
  9. git_path = 'git'# git的地址,如果配置了环境变量则不需要修改
  10. stopKey = '【操作完成】'#存储stopKey的global变量
  11. passwd = '1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM'#stopKey的候选词库
  12. class git_Repo:#git的基类
  13. def __init__(self,Dic,*args,**kwargs):
  14. self.url = None
  15. try:
  16. if exists(Dic + r'/.git'): # 是否为git 仓库
  17. pass
  18. elif Dic[-4:] =='.git':
  19. Dic = Dic[:-5] # -5,得把/去掉
  20. else:raise Exception
  21. except:
  22. subprocess.Popen(f'{git_path} init',cwd=self.Repo_Dic,**sys_seeting).wait()
  23. self.Repo_Dic = Dic # 仓库地址(末尾不带/)
  24. self.repo = Repo(Dic)
  25. self.name = split(Dic)[-1]
  26. self.have_clone = True
  27. def make_stopKey(self):#生成一个随机stopKey
  28. global stopKey,passwd
  29. code = ''
  30. for _ in range(8):#八位随机数
  31. code += passwd[random.randint(0, len(passwd) - 1)]#时间戳+8位随机数
  32. stopKey = (str(time()) + code).replace('.','')
  33. return stopKey
  34. def Flie_List(self,file_list,is_file=True,pat=' '):
  35. if file_list == '.':
  36. file = '.'
  37. else:
  38. file_ = []
  39. for i in file_list:
  40. if i[:len(self.Repo_Dic)] == self.Repo_Dic:
  41. file_.append(i[len(self.Repo_Dic) + 1:]) # +1是为了去除/
  42. if not is_file:return file_
  43. file = pat.join(file_)
  44. return file
  45. def dir_list(self,all=True):
  46. listfile = []
  47. if all:
  48. listfile += [f'[当前分支] {self.repo.active_branch} 工作区{"不" if self.repo.is_dirty() else ""}干净 -> {self.name}']
  49. listfile += [f'{"[配置文件]" if i == ".git" else "[未跟踪]"if i in self.repo.untracked_files else "[已跟踪]"} {i}'
  50. for i in os.listdir(self.Repo_Dic)]
  51. return listfile
  52. def Add_File(self,file_list):
  53. file = self.Flie_List(file_list)
  54. return subprocess.Popen(f'echo 添加文件... && {git_path} add {file} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  55. def Reset_File(self,file_list):
  56. file = self.Flie_List(file_list)
  57. return subprocess.Popen(f'echo 撤销文件... && {git_path} reset {file} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  58. def Commit_File(self,m):
  59. return subprocess.Popen(f'echo 提交文件: && {git_path} commit -m "{m}" && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  60. def Status(self):#执行status
  61. return subprocess.Popen(f'echo 仓库状态: && {git_path} status && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  62. def Log(self,graph,pretty,abbrev):#执行log
  63. args = ''
  64. if graph:
  65. args += ' --graph'
  66. if pretty:
  67. args += ' --pretty=oneline'
  68. if abbrev:
  69. args += ' --abbrev-commit'
  70. return subprocess.Popen(f'echo 仓库日志: && {git_path} log{args} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  71. def refLog(self):#执行reflog
  72. return subprocess.Popen(f'echo 操作记录: && {git_path} reflog && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  73. def Diff_File(self,MASTER='HEAD'):#执行diff
  74. return subprocess.Popen(f'echo 文件日志: && {git_path} diff {MASTER} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  75. def reset(self,HEAD='HEAD~1'):
  76. return subprocess.Popen(f'echo 回退... && {git_path} reset --hard {HEAD} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  77. def checkout(self,file_list):
  78. if len(file_list) >= 1:#多于一个文件,不用--,空格
  79. file = self.Flie_List(file_list,pat=' ')
  80. return subprocess.Popen(f'echo 丢弃修改: && {git_path} checkout {file} && echo {self.make_stopKey()}',cwd=self.Repo_Dic,**sys_seeting)
  81. elif len(file_list) == 1:
  82. return subprocess.Popen(f'echo 丢弃修改: && {git_path} checkout -- {file_list[0]} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  83. else:
  84. return subprocess.Popen(f'echo 丢弃修改: && {git_path} checkout * && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  85. def rm(self,file_list):#删除版本库中的文件
  86. file = self.Flie_List(file_list)
  87. return subprocess.Popen(f'echo 删除... && {git_path} rm {file}', cwd=self.Repo_Dic,**sys_seeting)
  88. def check_Branch(self):#查看本地分支和远程分支
  89. return subprocess.Popen(f'echo 仓库分支: && {git_path} branch -a && echo 远程仓库信息: && {git_path} remote -v && '
  90. f'echo 分支详情: && {git_path} branch -vv && echo {self.make_stopKey()}',
  91. cwd=self.Repo_Dic,**sys_seeting)
  92. def new_Branch(self,branch_name, origin):#新建分支
  93. return subprocess.Popen(f'echo 新建分支... && {git_path} branch {branch_name} {origin} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  94. def switch_Branch(self,branch_name):#切换分支
  95. return subprocess.Popen(f'echo 切换分支... && {git_path} switch {branch_name} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  96. def del_Branch(self,branch_name,del_type):#删除分支
  97. return subprocess.Popen(f'echo 删除分支... && {git_path} branch -{del_type} {branch_name} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  98. def merge_Branch(self,branch_name,no_ff,m=''):#合并分支
  99. if no_ff:no_ff = f' --no-ff -m "{m}"'#--no-ff前有空格
  100. else:no_ff = ''
  101. return subprocess.Popen(f'echo 合并分支... && {git_path} merge{no_ff} {branch_name} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  102. def merge_abort(self):#退出冲突处理
  103. return subprocess.Popen(f'echo 冲突处理退出... && {git_path} merge --abort && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  104. def Save_stash(self):#保存工作区
  105. return subprocess.Popen(f'echo 保存工作区... && {git_path} stash && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  106. def Stash_List(self):#工作区列表
  107. return subprocess.Popen(f'echo 工作区列表: && {git_path} stash list && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  108. def Apply_stash(self,stash_num = '0'):#恢复工作区
  109. return subprocess.Popen(f'echo 恢复工作区... && {git_path} stash apply stash@{{{stash_num}}} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  110. def Drop_stash(self,stash_num = '0'):#删除工作区
  111. return subprocess.Popen(f'echo 删除工作区... && {git_path} stash drop stash@{{{stash_num}}} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  112. def cherry_pick(self,commit):#补丁
  113. return subprocess.Popen(f'echo 补丁... && {git_path} cherry-pick {commit} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  114. def Del_remote(self,remote_name):
  115. return subprocess.Popen(f'echo 删除远程仓库... && {git_path} remote remove {remote_name} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  116. def Add_remote(self,remote,remote_name):
  117. return subprocess.Popen(f'echo 添加远程仓库... && {git_path} remote add {remote_name} {remote} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  118. def Bind_remote(self,local_name,remote_name):
  119. return subprocess.Popen(f'echo 分支绑定... && {git_path} branch --set-upstream-to={remote_name} {local_name} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,
  120. **sys_seeting)
  121. def push_Tag(self,tag,remote_name):
  122. return subprocess.Popen(f'echo 推送标签... && {git_path} push {remote_name} {tag} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  123. def del_tag(self,tag):
  124. return subprocess.Popen(f'echo 删除本地标签... && {git_path} tag -d {tag} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  125. def Add_Tag(self,tag,commit,message=''):
  126. a = ' -a'
  127. if message != '':
  128. message = f' -m "{message}"'#自带空格
  129. else:
  130. a = ''
  131. if commit != '':
  132. commit = f' {commit}'#自带空格
  133. return subprocess.Popen(f'echo 添加标签... && {git_path} tag{a} {tag}{commit}{message} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,
  134. **sys_seeting)
  135. def Tag(self,condition=''):
  136. if condition != '':
  137. condition = f' -l {condition}'
  138. return subprocess.Popen(f'echo 标签列表: && {git_path} tag{condition} && echo {self.make_stopKey()}', cwd=self.Repo_Dic,**sys_seeting)
  139. def show_new(self,condition):
  140. return subprocess.Popen(f'echo 查询结果: && {git_path} show {condition} && echo {self.make_stopKey()}', cwd=self.Repo_Dic, **sys_seeting)
  141. def Pull_Push_remote(self,Pull_Push=0,remote='',remote_branch='',local='',allow=False,u=False):
  142. #处理逻辑
  143. # 1)remote去斜杠第一个作为主机名字
  144. # 2) 从remote分离主机名(如果没指定)
  145. # 3) 如果local为空,用HEAD填充
  146. # 4) 如果以上后,主机名仍为空,则local和分支均为空
  147. split = remote.split('/')
  148. try:
  149. remote_name = split[0]#获取主机名 1)
  150. except:
  151. remote_name = ''#没有主机名 1)
  152. branch_split = remote_branch.split('/')
  153. if len(branch_split) >= 2 and remote_name == '':
  154. remote_name = branch_split[0]# 2)
  155. remote_branch = '/'.join(branch_split[1:])# 2)
  156. if local.replace(' ','') == '':local = 'HEAD'# 3)
  157. if remote_name == '':# 4)
  158. branch = ''
  159. else:
  160. if Pull_Push == 1:
  161. # 注意,local不可以为空,也不会为空
  162. if remote_branch != '':branch = f'{local}:{remote_branch}'# git push <远程主机名> <本地分支名>:<远程分支名>
  163. else:branch = f'{local}'#要去掉冒号
  164. else:
  165. if remote_branch != 'HEAD':branch = f'{remote_branch}:{local}' # git push <远程主机名> <本地分支名>:<远程分支名>
  166. else:branch = f'{remote_branch}'
  167. if allow:
  168. history = ' --allow-unrelated-histories'
  169. else:
  170. history = ''
  171. push_pull = {0:"pull",1:f"push{' -u' if u else ''}"}
  172. return subprocess.Popen(f'''echo 与服务器连接... && {git_path} {push_pull.get(Pull_Push,"pull")}{history} {remote_name} {branch} && echo {self.make_stopKey()}''',
  173. cwd=self.Repo_Dic, **sys_seeting)
  174. def del_Branch_remote(self,remote,remote_branch):
  175. split = remote.split('/')
  176. try:
  177. remote_name = split[0] # 获取主机名 1)
  178. except:
  179. remote_name = '' # 没有主机名 1)
  180. branch_split = remote_branch.split('/')
  181. if len(branch_split) >= 2 and remote_name == '':
  182. remote_name = branch_split[0] # 2)
  183. remote_branch = '/'.join(branch_split[1:]) # 2)
  184. return subprocess.Popen(f'echo 删除远程分支... && {git_path} push {remote_name} :{remote_branch} && echo {self.make_stopKey()}',cwd=self.Repo_Dic, **sys_seeting)
  185. def del_Tag_remote(self,remote,tag):
  186. return subprocess.Popen(f'echo 删除远程标签... && {git_path} push {remote} :refs/tags/{tag} && echo {self.make_stopKey()}',cwd=self.Repo_Dic, **sys_seeting)
  187. def fetch(self,remote,remote_branch,local):
  188. # 处理逻辑
  189. # 1)remote去斜杠第一个作为主机名字
  190. # 2) 从remote分离主机名(如果没指定)
  191. # 3) 如果local为空,用HEAD填充
  192. # 4) 如果以上后,主机名仍为空,则local和分支均为空
  193. split = remote.split('/')
  194. try:
  195. remote_name = split[0] # 获取主机名 1)
  196. except:
  197. remote_name = '' # 没有主机名 1)
  198. branch_split = remote_branch.split('/')
  199. if len(branch_split) >= 2 and remote_name == '':
  200. remote_name = branch_split[0] # 2)
  201. remote_branch = '/'.join(branch_split[1:]) # 2)
  202. if local.replace(' ', '') == '': local = 'HEAD' # 3)
  203. if remote_name == '': # 4)
  204. branch = ''
  205. else:
  206. if remote_branch != 'HEAD':
  207. branch = f'{remote_branch}:{local}' # git push <远程主机名> <本地分支名>:<远程分支名>
  208. else:
  209. branch = f'{remote_branch}'
  210. return subprocess.Popen(f'''echo 更新远程仓库... && {git_path} fetch {remote_name} {branch} && echo {self.make_stopKey()}''', cwd=self.Repo_Dic, **sys_seeting)
  211. def Customize(self,command:str):
  212. return subprocess.Popen(command,cwd=self.Repo_Dic, **sys_seeting)
  213. def Clone(self,url):
  214. return subprocess.Popen(f'echo 克隆操作不被允许', cwd=self.Repo_Dic, **sys_seeting)
  215. class Clone_git(git_Repo):#Clone一个git
  216. def __init__(self, Dic, *args, **kwargs):
  217. self.Repo_Dic = Dic # 仓库地址
  218. self.url = None
  219. self.name = split(Dic)[-1]
  220. self.have_clone = False
  221. def Clone(self,url):
  222. if self.have_clone:super(Clone_git, self).Clone(url)
  223. self.have_clone = True
  224. return subprocess.Popen(f'echo 正在克隆... && {git_path} clone {url} {self.Repo_Dic}', cwd=split(self.Repo_Dic)[0], **sys_seeting)
  225. def after_Clone(self):
  226. self.repo = Repo(self.Repo_Dic)
  227. class git_Ctrol:
  228. def __init__(self):
  229. self.git_Dic = {}#名字-文件位置
  230. self.gitType_Dic = {}#名字-类型
  231. def Add_init(self,Dic,**kwargs):
  232. git = git_Repo(Dic)
  233. self.git_Dic[git.name] = git
  234. self.gitType_Dic[git.name] = 'init'
  235. return git.name
  236. def Clone_init(self,Dic,**kwargs):
  237. git = Clone_git(Dic)
  238. self.git_Dic[git.name] = git
  239. self.gitType_Dic[git.name] = 'clone'
  240. return git.name
  241. def get_git(self,name):
  242. return self.git_Dic[name]
  243. def get_git_Dic(self):
  244. return self.git_Dic.copy()
  245. def get_Dir(self,name):
  246. return self.get_git(name).dir_list()
  247. def add_File(self,name,dic_list):
  248. return self.get_git(name).Add_File(dic_list)
  249. def reset_File(self,name,dic_list):
  250. return self.get_git(name).Reset_File(dic_list)
  251. def commit_File(self,name,m):
  252. return self.get_git(name).Commit_File(m)
  253. def log(self,name,graph,pretty,abbrev):
  254. return self.get_git(name).Log(graph,pretty,abbrev)
  255. def reflog(self,name):
  256. return self.get_git(name).refLog()
  257. def status(self,name):
  258. return self.get_git(name).Status()
  259. def diff_File(self,name,MASTER):
  260. return self.get_git(name).Diff_File(MASTER)
  261. def back_version(self,name,HEAD):
  262. return self.get_git(name).reset(HEAD)
  263. def checkout_version(self,name,file):
  264. return self.get_git(name).checkout(file)
  265. def rm(self,name,file):
  266. return self.get_git(name).rm(file)
  267. def check_Branch(self,name):
  268. return self.get_git(name).check_Branch()
  269. def new_Branch(self,name, new_branch, origin):
  270. return self.get_git(name).new_Branch(new_branch, origin)
  271. def switch_Branch(self,name,branch_name):
  272. return self.get_git(name).switch_Branch(branch_name)
  273. def Del_Branch(self,name,branch_name,type_):
  274. d = {1:'d',0:'D'}.get(type_,'d')
  275. return self.get_git(name).del_Branch(branch_name,d)
  276. def merge_Branch(self,name,branch_name,no_ff,m):
  277. return self.get_git(name).merge_Branch(branch_name,no_ff,m)
  278. def merge_abort(self,name):
  279. return self.get_git(name).merge_abort()
  280. def Save_stash(self,name):
  281. return self.get_git(name).Save_stash()
  282. def Stash_List(self,name):
  283. return self.get_git(name).Stash_List()
  284. def Apply_stash(self,name,stash_num='0'):
  285. return self.get_git(name).Apply_stash(stash_num)
  286. def Drop_stash(self,name,stash_num='0'):
  287. return self.get_git(name).Drop_stash(stash_num)
  288. def cherry_pick(self,name,commit):
  289. return self.get_git(name).cherry_pick(commit)
  290. def Del_remote(self,name,remote_name):
  291. return self.get_git(name).Del_remote(remote_name)
  292. def Add_remote(self,name,remote,remote_name):
  293. return self.get_git(name).Add_remote(remote,remote_name)
  294. def Bind_remote(self,name,local_name,remote_name):
  295. return self.get_git(name).Bind_remote(local_name,remote_name)
  296. def Pull_remote(self,name,local_name,remote_name,remote_branch,allow=False,u=False):
  297. return self.get_git(name).Pull_Push_remote(0,remote_name,remote_branch,local_name,allow,u)
  298. def Push_remote(self,name,local_name,remote_name,remote_branch,allow=False,u=False):
  299. return self.get_git(name).Pull_Push_remote(1,remote_name,remote_branch,local_name,False,u)#push没有allow选项
  300. def Tag(self,name, condition=''):
  301. return self.get_git(name).Tag(condition) # push没有allow选项
  302. def show_new(self,name, condition):
  303. return self.get_git(name).show_new(condition) # push没有allow选项
  304. def Add_Tag(self,name,tag,commit,message=''):
  305. return self.get_git(name).Add_Tag(tag,commit,message) # push没有allow选项
  306. def push_Tag(self,name, tag, remoto):
  307. return self.get_git(name).push_Tag(tag, remoto)
  308. def push_allTag(self,name, remoto):
  309. return self.get_git(name).push_Tag('--tags', remoto)
  310. def del_Tag_remote(self,name , remote, tag):
  311. return self.get_git(name).del_Tag_remote(remote, tag)
  312. def del_Branch_remote(self,name , remote, remote_Branch):
  313. return self.get_git(name).del_Branch_remote(remote, remote_Branch)
  314. def del_tag(self,name,tag):
  315. return self.get_git(name).del_tag(tag)
  316. def Fetch(self,name,local_name,remote_name,remote_branch):
  317. return self.get_git(name).fetch(remote_name,remote_branch,local_name)
  318. def Customize(self,name,command:str):
  319. return self.get_git(name).Customize(command)
  320. def Clone(self,name,url):
  321. return self.get_git(name).Clone(url)
  322. def After_Clone(self,name):
  323. try:
  324. return self.get_git(name).after_Clone()
  325. except:
  326. return None