Skip to content

Commit 46d3a61

Browse files
committed
Fixed Issue in Tags refresh
1 parent 6188410 commit 46d3a61

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

server/scm/Git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ def get_clone_cmd(self):
2121
def get_pull_cmd(self):
2222
return "cd %s; git pull"%self.workdir
2323
def get_list_tags_cmd(self):
24-
return self.get_pull_cmd()+";git tag -l"%self.workdir
24+
return "cd %s;git tag -l"%self.workdir
2525
def get_switch_to_tag_cmd(self,tag):
2626
return "cd %s; git checkout tags/%s"%(self.workdir,tag)
2727
def get_history_cmd(self):
28-
return self.get_pull_cmd()+'; git log --all --pretty=format:"%H,,%h,,%an,,%ar,,%s,,%cd" | cat -'
28+
return 'cd ' + self.workdir +'; git log --all --pretty=format:"%H,,%h,,%an,,%ar,,%s,,%cd" | cat -'
2929
def switch_to_histroy_cmd(self,commit):
3030
return 'cd %s; git reset --hard %s'%(self.workdir,commit)
3131
def commit_diff_cmd(self,commit):

webapp/autoDeploy/autodeploy/views.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ def deploy2(request):
133133
return HttpResponseRedirect("../deploy?project="+request.session["deploy_project"])
134134
else:
135135
server = Server.objects.get(name=request.session["deploy_server"])
136-
return listTags(request, server)
136+
if request.GET.get("refresh","False")=="True":
137+
project=Project.objects.get(name=request.session["deploy_project"])
138+
c=Client(str(project.repo_type),server.ip,server.port,project.sshKey.key)
139+
c.Pull(project.repo,project.working_dir,project.sshKey.key)
140+
return listTags(request, server)
137141

138142
@login_required(redirect_field_name="redirect")
139143
def listTags(request, server):
@@ -270,6 +274,7 @@ def listCommits(request):
270274
server = Server.objects.get(name=request.session["deploy_server"])
271275
project = Project.objects.get(name=request.session["deploy_project"])
272276
c = Client("git", server.ip, server.port,key=project.sshKey.key)
277+
c.Pull(project.repo,project.working_dir,project.sshKey.key)
273278
res = c.ListCommits(project.working_dir)
274279
request.session["commits"] = res
275280
else:

webapp/autoDeploy/checkUpdates.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
updateRequired=False
1313
print "Checking %s on %s"%(project.name,project.default_server.DNS)
1414
c=Client(str(project.repo_type),project.default_server.ip,project.default_server.port,project.sshKey.key)
15+
c.Pull(project.repo,project.working_dir,project.sshKey.key)
1516
if project.update_style=="commit":
1617
commits=c.ListCommits(project.working_dir)
1718
if project.lastCommit != commits[0]["Hash"]:

0 commit comments

Comments
 (0)