var rev = r.name + '..' + w.name;
this.release = r.name;
+ this.working = w.name;
// this takes some time, lets. try and dialog it..
//.... commit!!!
imports.GitMonitor.GitMonitor.pause();
-
- Merger.repo.checkout(model.release);
-
- Merger.repo.applyPatch(diff);
-
- var author = Merger.repo.parseAuthor(ce.author);
-
- // add all the files..
- Merger.repo.add(files);
- Merger.repo.commit({
- name : author.name,
- email : author.email,
- author : ce.author,
- changed : ce.changed,
- reason : ce.message
+ try {
- });
-
+ Merger.repo.checkout(model.release);
+
+ print("Call apply patch");
+
+ Merger.repo.applyPatch(diff);
+
+ var author = Merger.repo.parseAuthor(ce.author);
+
+ print("Add new files.");
+ // add all the files..
+ Merger.repo.add(files);
+
+ print("Commit changes.");
+ Merger.repo.commit({
+ name : author.name,
+ email : author.email,
+ author : ce.author,
+ changed : ce.changed,
+ reason : ce.message,
+ files : files
+
+ });
+
+
+ } catch (e) {
+ //message..
+
+ var msg = new Gtk.MessageDialog({
+ message_type: Gtk.MessageType.ERROR,
+ buttons : Gtk.ButtonsType.OK,
+ text: e.message
+ });
+ msg.run();
+ msg.destroy();
+ Merger.repo.stash(); // revert change.. - so we can go back...
+ }
Merger.repo.checkout(model.working);
-
- imports.GitMonitor.GitMonitor.resume();
+ imports.GitMonitor.GitMonitor.resume();