}
public bool createBranchNamed(string branchname)
- {
-
- try {
+ {
+
+
if (this.branches.has_key(branchname)) {
// this is where it get's tricky...
-
- string[] cmd = { "ls-files" , "-m" }; // list the modified files..
- var ret = this.git(cmd);
- var stash = ret.length> 1 ;
-
-
- cmd = { "stash" };
- if (stash) { this.git(cmd); }
-
- cmd = { "checkout", branchname };
- this.git(cmd);
-
- cmd = { "merge", "master" };
- this.git(cmd);
-
- cmd = { "stash", "pop" };
- if (stash) { this.git(cmd); }
-
+ try {
+ string[] cmd = { "ls-files" , "-m" }; // list the modified files..
+ var ret = this.git(cmd);
+ var stash = ret.length> 1 ;
+
+
+ cmd = { "stash" };
+ if (stash) { this.git(cmd); }
+
+ cmd = { "checkout", branchname };
+ this.git(cmd);
+ } catch(Error e) {
+ GitMonitor.gitmonitor.pauseError(e.message);
+ return false;
+
+ }
+ try {
+ cmd = { "merge", "master" };
+ this.git(cmd);
+ } catch(Error e) {
+ try {
+ cmd = { "mergetool" };
+ this.git(cmd);
+ cmd = { "commit" "-m" "Fix merge conflicts from master" };
+ this.git(cmd);
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return false;
+ }
+ }
+ try {
+ cmd = { "stash", "pop" };
+ if (stash) { this.git(cmd); }
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return false;
+ }
+
} else {
- string[] cmd = { "checkout", "-b" , branchname };
- this.git(cmd);
+ try {
+
+ string[] cmd = { "checkout", "-b" , branchname };
+ this.git(cmd);
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return false;
+ }
+
}
var notification = new Notify.Notification(
"Changed to branch %s".printf(branchname),
this.set_name("gitlive");
this.set_visible(true);
- var menu = new MenuA();
+ var menu = new GitliveMenu();
menu.ref();
this.button_press_event.connect( ( ev ) =>{
print("button press event called\n");
-
+ menu.updateMerges();
menu.show_all();
if (this.paused) {
//print(Array.prototype.slice.call(arguments).join(','));
print("menu activiate called\n");
+ menu.updateMerges();
//var menu = this.get('menu');
menu.show_all();
}
- class MenuA : Gtk.Menu
+ class GitliveMenu : Gtk.Menu
{
public ImageMenuItem pause;
public ImageMenuItem resume;
+ public Gtk.MenuItem before_seperator;
+ public Gtk.MenuItem after_seperator;
+
- public MenuA()
+ public GitliveMenu()
{
- this.pause = new ImageMenuItemA();
+ this.pause = new MenuItemPause();
this.append(this.pause);
- this.resume = new ImageMenuItemB();
+ this.resume = new MenuItemStartCommits();
this.append(this.resume);
- this.append(new ImageMenuItemC());
- this.append(new ImageMenuItemD());
- this.append(new ImageMenuItemE());
- this.append(new ImageMenuItemF());
- this.append(new ImageMenuItemG());
-
-
-
+ this.append(new MenuItemPullAll());
+ this.before_seperator = new Gtk.SeparatorMenuItem();
+ this.append(this.before_seperator);
+
+ this.after_seperator = new Gtk.SeparatorMenuItem();
+ this.append(this.after_seperator);
+ //this.append(new MenuItemUpdateTimesheet());
+ this.append(new MenuItemManageClones());
+ this.append(new MenuItemAbout());
+ this.append(new MenuItemQuit());
+ this.merge_items = new Gee.ArrayList<Gtk.MenuItem>();
}
+ public Gee.ArrayList<Gtk.MenuItem> merge_items;
- class ImageMenuItemA : ImageMenuItem {
+ public void updateMerges()
+ {
+ // show a list of possible merges on the menu.
+ foreach (var m in this.merge_items) {
+ this.remove(m);
+ }
+ foreach(var r in GitRepo.singleton().cache.values ) {
+ GLib.debug("checking %s for branch = %s", r.name, r.currentBranch.name);
+ if (!r.is_wip_branch()) {
+ continue;
+ }
+ GLib.debug("checking for activeTicket");
+ var t = r.activeTicket;
+ if (t == null) {
+ continue;
+ }
+ var mi = new MergeMenuItem(r,t);
+ this.insert (mi,4); //backwards.
+ this.merge_items.add(mi);
+
+ }
+
+ }
+
+
+ class MergeMenuItem : Gtk.MenuItem {
+
+ GitRepo repo;
+ RooTicket ticket;
+
+ public MergeMenuItem(GitRepo r, RooTicket t)
+ {
+ this.repo = r;
+ this.ticket = t;
+
+ this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary));
+
+ this.activate.connect(() => {
+ MergeBranch.singleton().show(this.ticket);
+ // show merge dialog..
+ });
+
+ }
+
+ }
+
+
+ class MenuItemPause : ImageMenuItem {
- public ImageMenuItemA()
+ public MenuItemPause()
{
//this.set_from_stock( Gtk.Stock.MEDIA_PAUSE );
}
- class ImageMenuItemB : ImageMenuItem {
+ class MenuItemStartCommits : ImageMenuItem {
- public ImageMenuItemB()
+ public MenuItemStartCommits()
{
var image = new Gtk.Image();
}
- class ImageMenuItemC : ImageMenuItem {
+ class MenuItemPullAll : ImageMenuItem {
- public ImageMenuItemC()
+ public MenuItemPullAll()
{
var image = new Gtk.Image();
}
- class ImageMenuItemD : ImageMenuItem {
+ class MenuItemUpdateTimesheet : ImageMenuItem {
- public ImageMenuItemD()
+ public MenuItemUpdateTimesheet()
{
var image = new Gtk.Image();
image.set_from_stock(Gtk.Stock.SAVE,Gtk.IconSize.MENU );
- this.set_image (image);
+ this.set_image (image);
this.label= "Update Timesheet";
this.always_show_image = true;
this.accel_group = null;
}
- class ImageMenuItemE : ImageMenuItem {
+ class MenuItemManageClones : ImageMenuItem {
- public ImageMenuItemE()
+ public MenuItemManageClones()
{
var image = new Gtk.Image();
}
- class ImageMenuItemF : ImageMenuItem {
+ class MenuItemAbout : ImageMenuItem {
- public ImageMenuItemF()
+ public MenuItemAbout()
{
var image = new Gtk.Image();
}
- class ImageMenuItemG : ImageMenuItem {
+ class MenuItemQuit : ImageMenuItem {
- public ImageMenuItemG()
+ public MenuItemQuit()
{
var image = new Gtk.Image();
projects / gitlive / commitdiff