projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GitRepo.vala
[gitlive]
/
GitRepo.vala
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
2c406dd
..
5c866c3
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-206,10
+206,15
@@
public class GitRepo : Object
public string get_config(string key) {
public string get_config(string key) {
- return this.git({ "config" , "gitlive." + key });
+ try {
+ return this.git({ "config" , "gitlive." + key });
+ } catch (Error e) {
+ return ""; // happens when there is nothing set...
+ }
+
}
}
- public
string
set_config(string key, string value) {
-
return
this.git({ "config" , "gitlive." + key, value });
+ public
void
set_config(string key, string value) {
+ this.git({ "config" , "gitlive." + key, value });
}
public bool is_managed()
}
public bool is_managed()
@@
-410,11
+415,8
@@
public class GitRepo : Object
public void loadActiveTicket()
{
this.activeTicket = null;
public void loadActiveTicket()
{
this.activeTicket = null;
- if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
- return;
- }
- string ticket_id;
- FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
+ var ticket_id = this.get_config("ticket");
+
if (ticket_id.length < 1) {
return;
}
if (ticket_id.length < 1) {
return;
}
@@
-427,14
+429,11
@@
public class GitRepo : Object
public bool setActiveTicket(RooTicket? ticket, string branchname)
{
public bool setActiveTicket(RooTicket? ticket, string branchname)
{
+ this.set_config("ticket", "");
if (!this.createBranchNamed(branchname)) {
return false;
}
if (!this.createBranchNamed(branchname)) {
return false;
}
- if (ticket != null) {
- FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
- } else {
- FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
- }
+ this.set_config("ticket", ticket == null ? "": ticket.id);
this.activeTicket = ticket;
return true;
}
this.activeTicket = ticket;
return true;
}
@@
-778,6
+777,8
@@
public class GitRepo : Object
// may throw error...
var sp = new Spawn(cfg);
// may throw error...
var sp = new Spawn(cfg);
+ //GLib.debug( "GOT result: %d" , sp.result);
+
// diff output is a bit big..
if (args_in[0] != "diff") {
GLib.debug( "GOT: %s" , sp.output);
// diff output is a bit big..
if (args_in[0] != "diff") {
GLib.debug( "GOT: %s" , sp.output);
@@
-879,7
+880,9
@@
public class GitRepo : Object
repo.loadStatus();
update_all_total--;
repo.loadStatus();
update_all_total--;
+ GLib.debug("calls remaining = %d", update_all_total);
if (update_all_total > 0 ) {
if (update_all_total > 0 ) {
+
return;
}
switch (update_all_after) {
return;
}
switch (update_all_after) {