利用gitlab的API获取冲突文件以及冲突文件的信息

港控/mmm° 2022-03-11 00:56 935阅读 0赞

> 前提是gitlab0.8版本以后，要有TODO功能。

#### 工作流程 ####

> 我这是大致流程，其中有些细节需要自己完善  
> ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3UwMTQ2ODYzOTk_size_16_color_FFFFFF_t_70]

*  如果某个冲突文件在某一个分支发生了多次commit，上图的流程只能找到最后一个，如果想都找出来，可以利用上次成功合并的时间结合commit的API找出来
 *  其中TODO和commit的搜索可以利用查询参数进行缩小范围，具体可以查询官网的API
 *  如果A和B分支有两个文件，A删除了这个文件，B修改了这个文件， A合并到B的时候，通过我们现在的方法，得不到冲突文件。  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3UwMTQ2ODYzOTk_size_16_color_FFFFFF_t_70 1]

#### python的小DEMON ####

> 这个demon仅供参考，有许多需要完善的地方

class HookMergeOperate(View):
    
        def __handle_todo_content(self, content):
            conflict = {}
            try:
                for part in content:
                    conflict_key = part['target']['source_branch']+ '_' +part['target']['target_branch']
                    conflict[conflict_key] = {
                        'diff_refs': {
                            'head_sha': part['target']['diff_refs']['head_sha'],
                            'start_sha': part['target']['diff_refs']['start_sha']
                        },
                        'web_url': part['target']['web_url']
                    }
                return True, conflict
            except:
                return False, conflict
    
        def __handle_git_todos(self):
            todo_url = r"http://{0}/api/v4/todos?action=unmergeable&type=MergeRequest".\
                format(BASE_CONFIG['GITLAB'])
            response = requests.get(todo_url, headers={'PRIVATE-TOKEN': BASE_CONFIG['GIT_TOKEN']})
            if response.status_code == 200:
                status, conflict = self.__handle_todo_content(response.json())
                if status:
                    self.conflict = conflict
                else:
                    return status
                return True
            else:
                return False
    
        def __handle_commit_content(self, content, id):
            commit_info = {'author_name': '-', 'author_email': '-'}
            try:
                for part in content:
                    if part['id'] == id:
                        commit_info['author_name'] = part['author_name']
                        commit_info['author_email'] = part['author_email']
                return True, commit_info
            except:
                return False, commit_info
    
        def __handle_git_commit(self, branch, id):
            """
            这里的projects的ID，是我写死了，按理说这是要获取的
            """
            commit_url = r"http://{0}/api/v4/projects/2/repository/commits?ref_name={1}".\
                format(BASE_CONFIG['GITLAB'], branch)
            response = requests.get(commit_url, headers={'PRIVATE-TOKEN': BASE_CONFIG['GIT_TOKEN']})
            if response.status_code == 200:
                status, commit_info = self.__handle_commit_content(response.json(), id)
                if status:
                    return commit_info
                else:
                    return status
            else:
                return False
    
        def __handle_conflict_content(self, content):
            file_list = []
            try:
                for part in content['files']:
                    file_list.append({'old_path': part['old_path'], 'new_path': part['new_path']})
                return True, file_list
            except:
                return False, file_list
    
        def __handle_git_conflict(self, web_url):
            conflict_url = r"{0}/conflicts.json".format(web_url)
            response = requests.get(conflict_url, headers={'PRIVATE-TOKEN': BASE_CONFIG['GIT_TOKEN']})
            if response.status_code == 200:
                status, file_list = self.__handle_conflict_content(response.json())
                if status:
                    self.file_list = file_list
                else:
                    return status
                return True
            else:
                return False
    
        def handle_pull_operate(self, data):
            start_branch = data['start']
            end_branch = data['end']
            todo_key = start_branch+'_'+end_branch
            todo_status = self.__handle_git_todos()
            if not todo_status:
                print('todo_status', todo_status)
                return todo_status
            if todo_key not in self.conflict:
                print('todo_key', False)
                return False
            my_todo = self.conflict[todo_key]
            web_url = my_todo['web_url']
            file_status = self.__handle_git_conflict(web_url)
            if not file_status:
                print('file_status', file_status)
                return todo_status
            start = my_todo['diff_refs']['head_sha']
            end = my_todo['diff_refs']['start_sha']
            start_commit_info = self.__handle_git_commit(start_branch, start)
            if not start_commit_info:
                print('start_commit_info', start_commit_info)
                return start_commit_info
            end_commit_info = self.__handle_git_commit(end_branch, end)
            if not end_commit_info:
                print('end_commit_info', end_commit_info)
                return end_commit_info
            res_json = []
            for part in self.file_list:
                temp_part = {'name': part['old_path'], 'start': {'id': start, 'author': start_commit_info['author_name'],
                                                     'mail': start_commit_info['author_email']},
                             'end': {'id': end, 'author': end_commit_info['author_name'],
                                     'mail': end_commit_info['author_email']}}
                res_json.append(dict.copy(temp_part))
            return res_json
    
        def post(self, request, *args, **kwargs):
            body = json.loads(request.body)
            content = self.handle_pull_operate(body)
            if not content:
                response = JsonResponse({'result': 'not found', 'status': False})
            else:
                response = JsonResponse(content, safe=False)
            response['Access-Control-Allow-Headers'] = 'X-CSRF-Token,Content-Type'
            response['Access-Control-Allow-Methods'] = 'POST'
            # response['Access-Control-Allow-Origin'] = 'http://192.168.200.12:8000'
            return response

*  上面是django的代码片段，也是接收到请求后的处理逻辑
 *  Django接收post，参数如下  
    \{  
    “start”:“发起分支”，  
    “end”:“合并到的分支”  
    \}

--------------------

> 这种方法，没有经历过太多测试，有问题进QQ群630300475聊一聊，大家一起进步

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3UwMTQ2ODYzOTk_size_16_color_FFFFFF_t_70]: /images/20220311/c39110fb16ca44e2ab2df524e0195b91.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3UwMTQ2ODYzOTk_size_16_color_FFFFFF_t_70 1]: /images/20220311/2cbff44380324e34b5696ec08e905366.png