projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial Fix #5560 - Gitlive - branching wip
[gitlive]
/
NewBranch.vala
diff --git
a/NewBranch.vala
b/NewBranch.vala
index
3ef225a
..
602922e
100644
(file)
--- a/
NewBranch.vala
+++ b/
NewBranch.vala
@@
-52,7
+52,6
@@
public class NewBranch : Object
//listeners
this.el.delete_event.connect( (self, event) => {
this.el.hide();
//listeners
this.el.delete_event.connect( (self, event) => {
this.el.hide();
- this.running = false;
return true;
//test
});
return true;
//test
});
@@
-62,7
+61,6
@@
public class NewBranch : Object
if (response_id == 0) {
_this.el.hide();
this.running = false;
if (response_id == 0) {
_this.el.hide();
this.running = false;
- GitMonitor.gitmonitor.start();
return;
}
return;
}
@@
-75,22
+73,18
@@
public class NewBranch : Object
// -- initial load can check the contents of the ticket files on first scan.
var ticket_id = _this.ticketsel.selectedTicketId();
// -- initial load can check the contents of the ticket files on first scan.
var ticket_id = _this.ticketsel.selectedTicketId();
- var success = true;
if (this.repo != null) {
var bn = _this.name.el.get_text();
if (ticket_id != "" ) {
if (this.repo != null) {
var bn = _this.name.el.get_text();
if (ticket_id != "" ) {
-
success =
this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
+ this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
} else {
} else {
-
success = this.repo.createBranchNamed(
bn);
+
this.repo.setActiveTicket( RooTicket.singleton().getById("-1"),
bn);
}
}
}
}
- if (success) {
- GitMonitor.gitmonitor.restoreQueue( this.queue );
- GitMonitor.gitmonitor.runQueue();
- GitMonitor.gitmonitor.start();
- }
- this.running = false;
- _this.el.hide();
+
+ this.running = false;
+
+ this.el.hide();