Skip to content
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -1071,14 +1071,26 @@ namespace Scratch {
if (git_manager.clone_repository.end (res, out workdir, out error)) {
open_folder (workdir);
clone_dialog.destroy ();
var primary_text = "";
if (error == null) {
primary_text = _("Repository %s successfully cloned").printf (uri);
} else {
// e.g. Problem updating submodules
primary_text = _("Repository %s cloned with error").printf (uri);
}
var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (
_("Repository %s successfully cloned").printf (uri),
primary_text,
_("Local repository working directory is %s").printf (workdir.get_uri ()),
"dialog-information",
Gtk.ButtonsType.CLOSE
) {
transient_for = this
};

if (error != null) {
message_dialog.show_error_details (error);
}

message_dialog.response.connect (message_dialog.destroy);
message_dialog.present ();
} else {
Expand Down
10 changes: 8 additions & 2 deletions src/Services/GitManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,13 @@ namespace Scratch.Services {
folder_file,
clone_options
);

new_repo.submodule_foreach ((submodule, name) => {
submodule.update (true, null);
Comment thread
jeremypw marked this conversation as resolved.
Outdated
return 0;
});
} catch (Error e) {
e_message = e.message;
new_repo = null;
}

Idle.add ((owned)callback);
Expand All @@ -155,7 +159,9 @@ namespace Scratch.Services {
yield;
if (new_repo != null) {
repo_workdir = new_repo.get_workdir ();
} else {
}

if (e_message != "") {
error = e_message;
}

Expand Down