| public Merge ( string branch, GitUpdateOptions options, IProgressMonitor monitor ) : void | ||
| branch | string | |
| options | GitUpdateOptions | |
| monitor | IProgressMonitor | |
| Résultat | void | |
public static void ShowMergeDialog (GitRepository repo)
{
MergeDialog dlg = new MergeDialog (repo);
try {
if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
dlg.Hide ();
using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) {
repo.Merge (dlg.SelectedBranch, monitor);
}
}
} finally {
dlg.Destroy ();
}
}
public static void ShowMergeDialog (GitRepository repo, bool rebasing)
{
var dlg = new MergeDialog (repo, rebasing);
try {
if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
dlg.Hide ();
if (rebasing) {
using (ProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Rebasing branch '{0}'...", dlg.SelectedBranch))) {
if (dlg.IsRemote)
repo.Fetch (monitor, dlg.RemoteName);
repo.Rebase (dlg.SelectedBranch, dlg.StageChanges ? GitUpdateOptions.SaveLocalChanges : GitUpdateOptions.None, monitor);
}
} else {
using (ProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) {
if (dlg.IsRemote)
repo.Fetch (monitor, dlg.RemoteName);
repo.Merge (dlg.SelectedBranch, dlg.StageChanges ? GitUpdateOptions.SaveLocalChanges : GitUpdateOptions.None, monitor, FastForwardStrategy.NoFastForward);
}
}
}
} finally {
dlg.Destroy ();
dlg.Dispose ();
}
}
public static void ShowMergeDialog (GitRepository repo, bool rebasing)
{
MergeDialog dlg = new MergeDialog (repo, rebasing);
try {
if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
dlg.Hide ();
if (rebasing) {
using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Rebasing branch '{0}'...", dlg.SelectedBranch))) {
if (dlg.IsRemote)
repo.Fetch (monitor);
repo.Rebase (dlg.SelectedBranch, dlg.StageChanges, monitor);
}
} else {
using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) {
if (dlg.IsRemote)
repo.Fetch (monitor);
repo.Merge (dlg.SelectedBranch, dlg.StageChanges, monitor);
}
}
}
} finally {
dlg.Destroy ();
}
}
