Merge lp:~taktaktaktaktaktaktaktaktaktak/monodevelop-bzr/2.0 into lp:monodevelop-bzr

[Levi Bard]

[Levi Bard (taktaktaktaktaktaktaktaktaktak)]

Reduced errors when working with bzr-svn branches. Extra shininess.

[Robert Collins (lifeless)]

Looks ok to me, FWIW

review: Approve

=== modified file 'BazaarCLibClient.cs'
--- BazaarCLibClient.cs	2009-09-26 13:35:43 +0000
+++ BazaarCLibClient.cs	2009-10-21 21:25:16 +0000
@@ -18,10 +18,14 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+
 namespace MonoDevelop.VersionControl.Bazaar
 {
 	
@@ -61,6 +65,9 @@
 		[DllImport ("python2.5")]
 		private static extern void PyErr_Clear ();
 		
+		[DllImport ("python2.5")]
+		private static extern void PyEval_InitThreads ();
+		
 		private static Regex unicodeRegex = new Regex (@"^\s*u'(?<realString>.*)'\s*$", RegexOptions.Compiled);
 		private static string StringFromPython (IntPtr pystring)
 		{
@@ -160,6 +167,7 @@
 		
 		static BazaarCLibClient ()
 		{
+			PyEval_InitThreads ();
 			Py_Initialize ();
 			
 			pymain = PyImport_AddModule ("__main__");
@@ -190,7 +198,8 @@
 				"from bzrlib import annotate",
 				"from bzrlib import builtins",
 				"from bzrlib import commands",
-				"from bzrlib import errors"
+				"from bzrlib import errors",
+				"from bzrlib import foreign"
 			};
 			
 			foreach (string import in imports) {
@@ -336,60 +345,50 @@
 			return results.ToArray ();
 		}
 
-		// TODO: Rework concurrency
+		static Regex revisionRegex = new Regex (@"^(?<revision>\d+): (?<committer>.*) (?<date>\d{4}-\d{2}-\d{2}) (?<message>.*)", RegexOptions.Compiled);
 		public override BazaarRevision[] GetHistory (BazaarRepository repo, string localFile, BazaarRevision since)
 		{
 			localFile = Path.GetFullPath (localFile);
 			List<BazaarRevision> history = new List<BazaarRevision> ();
-			string[] revs = null;
 			string basePath = BazaarRepository.GetLocalBasePath (localFile);
-			string author = string.Empty, msg = string.Empty, timestamp = string.Empty;
-			double seconds = 0.0;
-			DateTime revTime;
-			
-			StringBuilder command = new StringBuilder ();
-			command.AppendFormat ("histtree,relpath = workingtree.WorkingTree.open_containing('{0}')\n", localFile);
-			command.AppendFormat ("id = histtree.path2id(relpath)\n");
-			command.AppendFormat ("revs = ''\n");
-			command.AppendFormat ("for rev in log.find_touching_revisions(histtree.branch, id):\n");
-			command.AppendFormat ("  revs = revs + repr(rev[0])+','\n");
-			
-			lock (lockme) {
-				IntPtr pyrevs = run (new List<string>{"revs"}, command.ToString ())[0];
-				revs = StringFromPython (pyrevs).Split (',');
-			}// lock
-			
-			List<IntPtr>  pyauthor = null;
-			foreach (string rev in revs) {
-				if (string.IsNullOrEmpty (rev)){ continue; }
-				
-				List<RevisionPath> paths = new List<RevisionPath> ();
-				foreach (LocalStatus status in Status (basePath, new BazaarRevision (repo, rev))) {
-					paths.Add (new RevisionPath (status.Filename, ConvertAction (status.Status), status.Status.ToString ()));
+			
+			string output = null;
+			
+			ProcessWrapper log = null;
+			try {
+				log = Runtime.ProcessService.StartProcess ("bzr",
+				                                           string.Format ("log --line -r {0}.. '{1}'", since.Rev, localFile),
+				                                           // string.Format ("log {0}", localFile),
+				                                           Path.GetDirectoryName (localFile), null);
+				log.WaitForExit ();
+				if (0 != log.ExitCode){ return null; }
+				output = log.StandardOutput.ReadToEnd ();
+			} finally {
+				if (null != log){ log.Dispose (); }
+			}
+			
+			Match match = null;
+			foreach (string line in output.Split (new char[]{'\r','\n'}, StringSplitOptions.RemoveEmptyEntries)) {
+				match = revisionRegex.Match (line);
+				if (null != match && match.Success) {
+					DateTime date;
+					DateTime.TryParse (match.Groups["date"].Value, out date);
+					history.Add (new BazaarRevision (repo, match.Groups["revision"].Value, date,
+					                                 match.Groups["committer"].Value, match.Groups["message"].Value,
+					                                 new RevisionPath[]{}));
 				}
-				
-				lock (lockme) {
-					run (null, "myrev = revisionspec.RevisionSpec.from_string('{0}').in_history(histtree.branch).get()\n", rev);
-					
-					try { 
-						pyauthor = run (new List<string>{"author", "msg", "tstamp"}, 
-						           "author = myrev.get_apparent_authors()[0]\nmsg = myrev.get_summary()\ntstamp = repr(myrev.timestamp)\n"); 
-						author = StringFromPython (pyauthor[0]);
-						msg = StringFromPython (pyauthor[1]);
-						timestamp = StringFromPython (pyauthor[2]);
-					} catch {
-						msg = author = timestamp = string.Empty; 
+			}
+			
+			ThreadPool.QueueUserWorkItem (delegate {
+				foreach (BazaarRevision rev in history) {
+					List<RevisionPath> paths = new List<RevisionPath> ();
+					foreach (LocalStatus status in Status (basePath, rev)) {
+						paths.Add (new RevisionPath (status.Filename, ConvertAction (status.Status), status.Status.ToString ()));
 					}
-				}// lock
-					
-				revTime = (double.TryParse (timestamp, out seconds))? new DateTime (1970, 1, 1).AddSeconds (seconds): DateTime.Now;
-				history.Add (new BazaarRevision (repo, rev, revTime, 
-				             author, msg, paths.ToArray ()));
-			}
-			
-			lock (lockme){ run (null, "del histtree\n"); }
-			
-			history.Reverse ();
+					rev.ChangedFiles = paths.ToArray ();
+				}
+			});
+				
 			return history.ToArray ();
 		}// GetHistory
 
@@ -552,6 +551,22 @@
 			
 			monitor.Log.WriteLine ("Pushed to {0}", pushLocation);
 		}
+		
+		public override void DPush (string pushLocation, string localPath, bool remember, MonoDevelop.Core.IProgressMonitor monitor)
+		{
+			localPath = Path.GetFullPath (localPath);
+			if (null == monitor){ monitor = new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor (); }
+			StringBuilder command = new StringBuilder ();
+			command.AppendLine ("mycmd = foreign.cmd_dpush()");
+			command.AppendLine ("mycmd._setup_outf()");
+			command.AppendLine (string.Format ("mycmd.run('{0}',{1}, '{2}')",
+			                                   pushLocation, remember? "True": "False",
+			                                   localPath));
+			
+			lock (lockme){ run (null, command.ToString ()); }
+			
+			monitor.Log.WriteLine ("Pushed to {0}", pushLocation);
+		}// DPush
 
 		public override void Remove (string path, bool force, MonoDevelop.Core.IProgressMonitor monitor)
 		{
@@ -606,7 +621,7 @@
 			bool modified = false;
 			IntPtr  tuple = IntPtr.Zero,
 					listlen = IntPtr.Zero;
-			path = Path.GetFullPath (path);
+			path = Path.GetFullPath (path).Replace ("{", "{{").Replace ("}", "}}");// escape for string.format
 			command.AppendFormat ("tree = workingtree.WorkingTree.open_containing(\"{0}\")[0]\n", path);
 			
 			if (null == revision || BazaarRevision.HEAD == revision.Rev || BazaarRevision.NONE == revision.Rev) {
@@ -834,5 +849,22 @@
 				return !pending.Equals ("1", StringComparison.Ordinal);
 			}
 		}// IsMergePending
+		
+		public override bool CanRebase ()
+		{
+			string haveRebase = null;
+			StringBuilder command = new StringBuilder ();
+			command.AppendLine ("haveRebase = 'false'");
+			command.AppendLine ("for name, plugin in bzrlib.plugin.plugins().items():");
+			command.AppendLine ("  if(name == rebase):");
+			command.AppendLine ("    haveRebase = 'true'");
+			command.AppendLine ("    break");
+			
+			lock (lockme) {
+				haveRebase = StringFromPython (run (new List<string>(){"haveRebase"}, command.ToString ())[0]); 
+			}
+			
+			return "true".Equals (haveRebase, StringComparison.Ordinal);
+		}// CanRebase
 	}// BazaarCLibClient
 }

=== modified file 'BazaarClient.cs'
--- BazaarClient.cs	2009-09-29 09:37:26 +0000
+++ BazaarClient.cs	2009-10-21 21:25:16 +0000
@@ -101,6 +101,7 @@
 		public abstract BazaarRevision[] GetHistory (BazaarRepository repo, string localFile, BazaarRevision since);
 		public abstract void Merge (string mergeLocation, string localPath, bool remember, bool overwrite, BazaarRevision start, BazaarRevision end, IProgressMonitor monitor);
 		public abstract void Push (string pushLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor);
+		public abstract void DPush (string pushLocation, string localPath, bool remember, MonoDevelop.Core.IProgressMonitor monitor);
 		public abstract void Pull (string pullLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor);
 		public abstract void Commit (ChangeSet changeSet, IProgressMonitor monitor);
 		public abstract DiffInfo[] Diff (string basePath, string[] files);
@@ -188,6 +189,7 @@
 		}// IsValidExportPath
 		
 		public abstract bool IsMergePending (string localPath);
+		public abstract bool CanRebase ();
 	}
 
 	public class LocalStatus {

=== modified file 'BazaarCommands.cs'
--- BazaarCommands.cs	2009-09-29 09:48:17 +0000
+++ BazaarCommands.cs	2009-10-21 21:25:16 +0000
@@ -419,7 +419,7 @@
 				if ((int)Gtk.ResponseType.Ok == bsd.Run () && !string.IsNullOrEmpty (bsd.SelectedLocation)) {
 					BazaarTask worker = new BazaarTask ();
 					worker.Description = string.Format ("Pushing to {0}", bsd.SelectedLocation);
-					worker.Operation = delegate{ repo.Push (bsd.SelectedLocation, vcitem.Path, bsd.SaveDefault, bsd.Overwrite, worker.ProgressMonitor); };
+					worker.Operation = delegate{ repo.Push (bsd.SelectedLocation, vcitem.Path, bsd.SaveDefault, bsd.Overwrite, bsd.OmitHistory, worker.ProgressMonitor); };
 					worker.Start ();
 				}
 			} finally {

=== modified file 'BazaarRepository.cs'
--- BazaarRepository.cs	2009-08-18 10:25:32 +0000
+++ BazaarRepository.cs	2009-10-21 21:25:16 +0000
@@ -28,6 +28,7 @@
 	public class BazaarRepository : UrlBasedRepository
 	{
 		private Dictionary<string,string> tempfiles;
+		private Dictionary<string,VersionInfo> statusCache;
 		
 		public BazaarRepository ()
 		{
@@ -44,7 +45,7 @@
 		{
 			Method = BazaarVersionControl.protocols[0];
 			tempfiles = new Dictionary<string,string> ();
-			ThreadPool.SetMaxThreads (5, 5);
+			statusCache = new Dictionary<string, VersionInfo> ();
 		}// Init
 
 		/// <summary>
@@ -127,7 +128,21 @@
 		
 		public override VersionInfo GetVersionInfo (string localPath, bool getRemoteStatus)
 		{
-			return Bazaar.GetVersionInfo (this, Path.GetFullPath (localPath), getRemoteStatus);
+			return statusCache[localPath] = Bazaar.GetVersionInfo (this, Path.GetFullPath (localPath), getRemoteStatus);
+		}
+		
+		/// <summary>
+		/// Prefer cached version info for non-essential operations (menu display)
+		/// </summary>
+		private VersionInfo GetCachedVersionInfo (string localPath, bool getRemoteStatus)
+		{
+			VersionInfo status = null;
+			if (statusCache.ContainsKey (localPath)) {
+				status = statusCache[localPath];
+			} else {
+				status = GetVersionInfo (localPath, getRemoteStatus);
+			}
+			return status;
 		}
 
 		/// <remarks>
@@ -135,7 +150,13 @@
 		/// </remarks>
 		public override VersionInfo[] GetDirectoryVersionInfo (string localDirectory, bool getRemoteStatus, bool recursive)
 		{
-			return Bazaar.GetDirectoryVersionInfo (this, Path.GetFullPath (localDirectory), getRemoteStatus, recursive);
+			VersionInfo[] versions = Bazaar.GetDirectoryVersionInfo (this, Path.GetFullPath (localDirectory), getRemoteStatus, recursive);
+			if (null != versions) {
+				foreach (VersionInfo version in versions) {
+					statusCache[version.LocalPath] = version;
+				}
+			}
+			return versions;
 		}
 		
 		// Deprecated
@@ -144,13 +165,13 @@
 			serverPath = string.Format ("{0}{1}{2}", Url, Url.EndsWith ("/")? string.Empty: "/", serverPath);
 			// System.Console.WriteLine ("Got publish {0} {1}", serverPath, localPath);
 			Bazaar.StoreCredentials (serverPath);
-			Bazaar.Push (serverPath, localPath, false, false, monitor);
+			Bazaar.Push (serverPath, Path.GetFullPath (localPath), false, false, false, monitor);
 			return new BazaarRepository (Bazaar, serverPath);
 		}
 		
-		public virtual void Push (string pushLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor) {
+		public virtual void Push (string pushLocation, string localPath, bool remember, bool overwrite, bool omitHistory, IProgressMonitor monitor) {
 			Bazaar.StoreCredentials (pushLocation);
-			Bazaar.Push (pushLocation, Path.GetFullPath(localPath), remember, overwrite, monitor);
+			Bazaar.Push (pushLocation, Path.GetFullPath (localPath), remember, overwrite, omitHistory, monitor);
 		}// Push
 
 		public virtual void Pull (string pullLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor) {
@@ -217,10 +238,10 @@
 		{
 			if (string.IsNullOrEmpty (GetLocalBasePath (localPath))) {
 				return false;
-			}
+			} 
 			
 			localPath = Path.GetFullPath (localPath);
-			VersionInfo info = GetVersionInfo (localPath, false);
+			VersionInfo info = GetCachedVersionInfo (localPath, false);
 			return (null != info && info.IsVersioned);
 		}
 
@@ -231,7 +252,7 @@
 			}
 			
 			localFile = Path.GetFullPath (localFile);
-			VersionInfo info = GetVersionInfo (localFile, false);
+			VersionInfo info = GetCachedVersionInfo (localFile, false);
 			return (null != info && info.IsVersioned && info.HasLocalChanges);
 		}
 
@@ -242,7 +263,7 @@
 			}
 			
 			localFile = Path.GetFullPath (localFile);
-			VersionInfo info = GetVersionInfo (localFile, false);
+			VersionInfo info = GetCachedVersionInfo (localFile, false);
 			return (null != info && info.IsVersioned && (0 != (info.Status & VersionStatus.Conflicted)));
 		}
 
@@ -393,5 +414,10 @@
 		{
 			Bazaar.Export (Path.GetFullPath(localPath), Path.GetFullPath(exportLocation), monitor);
 		}// Export
+		
+		public virtual bool CanRebase ()
+		{
+			return Bazaar.CanRebase ();
+		}// CanRebase
 	}// BazaarRepository
 }

=== modified file 'BazaarRevision.cs'
--- BazaarRevision.cs	2008-12-08 16:53:57 +0000
+++ BazaarRevision.cs	2009-10-21 21:25:16 +0000
@@ -20,11 +20,19 @@
 
 namespace MonoDevelop.VersionControl.Bazaar
 {
-	
-	
+		/// <summary>
+		/// Represents a revision in a Bazaar branch.
+		/// </summary>
 		public class BazaarRevision : Revision
 		{
 			public readonly string Rev;
+			
+			// Overriding base property to allow public/asynchronous set
+			public new RevisionPath[] ChangedFiles {
+				get{ return base.ChangedFiles; }
+				set{ base.ChangedFiles = value; }
+			}
+			
 			public static readonly string HEAD = "-1";
 			public static readonly string FIRST = "1";
 			public static readonly string NONE = "NONE";

=== modified file 'BazaarVersionControl.cs'
--- BazaarVersionControl.cs	2009-09-26 13:35:43 +0000
+++ BazaarVersionControl.cs	2009-10-21 21:25:16 +0000
@@ -232,8 +232,12 @@
 			Client.Merge (mergeLocation, localPath, remember, overwrite, start, end, monitor);
 		}// Merge
 
-		public void Push (string pushLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor) {
-			Client.Push (pushLocation, localPath, remember, overwrite, monitor);
+		public void Push (string pushLocation, string localPath, bool remember, bool overwrite, bool omitHistory, IProgressMonitor monitor) {
+			if (omitHistory) {
+				Client.DPush (pushLocation, localPath, remember, monitor);
+			} else {
+				Client.Push (pushLocation, localPath, remember, overwrite, monitor);
+			}
 		}// Push
 
 		public void Pull (string pullLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor) {
@@ -339,5 +343,10 @@
 		{
 			Client.Export (localPath, exportPath, monitor);
 		}// Export
+		
+		public bool CanRebase ()
+		{
+			return Client.CanRebase ();
+		}// CanRebase
 	}// BazaarVersionControl
 }

=== modified file 'Dialogs/BranchSelectionDialog.cs'
--- Dialogs/BranchSelectionDialog.cs	2009-08-05 11:28:41 +0000
+++ Dialogs/BranchSelectionDialog.cs	2009-10-21 21:25:16 +0000
@@ -54,6 +54,18 @@
 			get{ return overwriteCB.Active; }
 		}// Overwrite
 		
+		public bool OmitHistory {
+			get{ return omitCB.Active; }
+		}// OmitHistory
+
+		protected virtual void OnOmitCBToggled (object sender, System.EventArgs e)
+		{
+			if (omitCB.Active) {
+				overwriteCB.Active = false;
+			}
+			overwriteCB.Sensitive = omitCB.Active;
+		}// OnOmitCBToggled
+		
 		public BranchSelectionDialog(ICollection<string> branchLocations, string defaultLocation, string localDirectory, bool enableLocalPathSelection, bool enableRemember, bool enableOverwrite)
 		{
 			this.Build();
@@ -90,6 +102,7 @@
 			if (!string.IsNullOrEmpty (localDirectory))
 				localPathButton.SetCurrentFolder (localDirectory);
 			localPathButton.Sensitive = enableLocalPathSelection;
+			omitCB.Visible = !enableLocalPathSelection;
 			defaultCB.Sensitive = enableRemember;
 			overwriteCB.Sensitive = enableOverwrite;
 		}// constructor

=== modified file 'IBazaarClient.cs'
--- IBazaarClient.cs	2009-09-23 19:36:55 +0000
+++ IBazaarClient.cs	2009-10-21 21:25:16 +0000
@@ -204,12 +204,35 @@
 		/// <param name="localPath">
 		/// A <see cref="System.String"/>: The local path to push
 		/// </param>
+		/// <param name="remember">
+		/// A <see cref="System.Boolean"/>: Whether pushLocation should be remembered
+		/// </param>
+		/// <param name="overwrite">
+		/// A <see cref="System.Boolean"/>: Whether to overwrite stale changes at pushLocation
+		/// </param>
 		/// <param name="monitor">
 		/// A <see cref="IProgressMonitor"/>: The progress monitor to be used
 		/// </param>
 		void Push (string pushLocation, string localPath, bool remember, bool overwrite, IProgressMonitor monitor);
 
 		/// <summary>
+		/// Performs a push
+		/// </summary>
+		/// <param name="pushLocation">
+		/// A <see cref="System.String"/>: The branch URI to which to push
+		/// </param>
+		/// <param name="localPath">
+		/// A <see cref="System.String"/>: The local path to push
+		/// </param>
+		/// <param name="remember">
+		/// A <see cref="System.Boolean"/>: Whether pushLocation should be remembered
+		/// </param>
+		/// <param name="monitor">
+		/// A <see cref="IProgressMonitor"/>: The progress monitor to be used
+		/// </param>
+		void DPush (string pushLocation, string localPath, bool remember, MonoDevelop.Core.IProgressMonitor monitor);
+		
+		/// <summary>
 		/// Performs a pull
 		/// </summary>
 		/// <param name="pullLocation">
@@ -402,5 +425,10 @@
 		/// A <see cref="System.Boolean"/>: Whether a merge is pending
 		/// </returns>
 		bool IsMergePending (string localPath);
+		
+		/// <summary>
+		/// Whether the rebase plugin is installed
+		/// </summary>
+		bool CanRebase ();
 	}
 }

=== modified file 'gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.BranchSelectionDialog.cs'
--- gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.BranchSelectionDialog.cs	2009-09-28 18:13:37 +0000
+++ gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.BranchSelectionDialog.cs	2009-10-21 21:25:16 +0000
@@ -10,7 +10,6 @@
 
 namespace MonoDevelop.VersionControl.Bazaar.Dialogs {
     
-    
     public partial class BranchSelectionDialog {
         
         private Gtk.VBox vbox2;
@@ -27,6 +26,8 @@
         
         private Gtk.CheckButton overwriteCB;
         
+        private Gtk.CheckButton omitCB;
+        
         private Gtk.Button buttonCancel;
         
         private Gtk.Button buttonOk;
@@ -87,26 +88,36 @@
             this.overwriteCB = new Gtk.CheckButton();
             this.overwriteCB.CanFocus = true;
             this.overwriteCB.Name = "overwriteCB";
-            this.overwriteCB.Label = Mono.Unix.Catalog.GetString("Overwrite");
+            this.overwriteCB.Label = Mono.Unix.Catalog.GetString("O_verwrite");
             this.overwriteCB.DrawIndicator = true;
             this.overwriteCB.UseUnderline = true;
             this.hbox1.Add(this.overwriteCB);
             Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox1[this.overwriteCB]));
             w6.Position = 1;
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.omitCB = new Gtk.CheckButton();
+            this.omitCB.CanFocus = true;
+            this.omitCB.Name = "omitCB";
+            this.omitCB.Label = Mono.Unix.Catalog.GetString("O_mit History");
+            this.omitCB.DrawIndicator = true;
+            this.omitCB.UseUnderline = true;
+            this.hbox1.Add(this.omitCB);
+            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.omitCB]));
+            w7.Position = 2;
             this.vbox2.Add(this.hbox1);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
-            w7.Position = 2;
-            w7.Expand = false;
-            w7.Fill = false;
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+            w8.Position = 2;
+            w8.Expand = false;
+            w8.Fill = false;
             w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w8.Position = 0;
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
+            w9.Position = 0;
             // Internal child MonoDevelop.VersionControl.Bazaar.Dialogs.BranchSelectionDialog.ActionArea
-            Gtk.HButtonBox w9 = this.ActionArea;
-            w9.Name = "dialog1_ActionArea";
-            w9.Spacing = 6;
-            w9.BorderWidth = ((uint)(5));
-            w9.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
+            Gtk.HButtonBox w10 = this.ActionArea;
+            w10.Name = "dialog1_ActionArea";
+            w10.Spacing = 6;
+            w10.BorderWidth = ((uint)(5));
+            w10.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
             // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
             this.buttonCancel = new Gtk.Button();
             this.buttonCancel.CanDefault = true;
@@ -116,9 +127,9 @@
             this.buttonCancel.UseUnderline = true;
             this.buttonCancel.Label = "gtk-cancel";
             this.AddActionWidget(this.buttonCancel, -6);
-            Gtk.ButtonBox.ButtonBoxChild w10 = ((Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonCancel]));
-            w10.Expand = false;
-            w10.Fill = false;
+            Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonCancel]));
+            w11.Expand = false;
+            w11.Fill = false;
             // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
             this.buttonOk = new Gtk.Button();
             this.buttonOk.CanDefault = true;
@@ -128,16 +139,17 @@
             this.buttonOk.UseUnderline = true;
             this.buttonOk.Label = "gtk-ok";
             this.AddActionWidget(this.buttonOk, -5);
-            Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonOk]));
-            w11.Position = 1;
-            w11.Expand = false;
-            w11.Fill = false;
+            Gtk.ButtonBox.ButtonBoxChild w12 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonOk]));
+            w12.Position = 1;
+            w12.Expand = false;
+            w12.Fill = false;
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
             this.DefaultWidth = 400;
             this.DefaultHeight = 257;
             this.Show();
+            this.omitCB.Toggled += new System.EventHandler(this.OnOmitCBToggled);
         }
     }
 }

=== modified file 'gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs'
--- gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs	2009-09-28 18:13:37 +0000
+++ gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs	2009-10-21 21:25:16 +0000
@@ -10,7 +10,6 @@
 
 namespace MonoDevelop.VersionControl.Bazaar.Dialogs {
     
-    
     public partial class PasswordPromptDialog {
         
         private Gtk.VBox vbox2;

=== modified file 'gtk-gui/generated.cs'
--- gtk-gui/generated.cs	2009-09-28 18:13:37 +0000
+++ gtk-gui/generated.cs	2009-10-21 21:25:16 +0000
@@ -10,7 +10,6 @@
 
 namespace Stetic {
     
-    
     internal class Gui {
         
         private static bool initialized;

=== modified file 'gtk-gui/gui.stetic'
--- gtk-gui/gui.stetic	2009-08-18 10:25:32 +0000
+++ gtk-gui/gui.stetic	2009-10-21 21:25:16 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
@@ -81,7 +81,7 @@
                   <widget class="Gtk.CheckButton" id="overwriteCB">
                     <property name="MemberName">overwriteCB</property>
                     <property name="CanFocus">True</property>
-                    <property name="Label" translatable="yes">Overwrite</property>
+                    <property name="Label" translatable="yes">O_verwrite</property>
                     <property name="DrawIndicator">True</property>
                     <property name="HasLabel">True</property>
                     <property name="UseUnderline">True</property>
@@ -91,6 +91,21 @@
                     <property name="AutoSize">True</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="Gtk.CheckButton" id="omitCB">
+                    <property name="MemberName">omitCB</property>
+                    <property name="CanFocus">True</property>
+                    <property name="Label" translatable="yes">O_mit History</property>
+                    <property name="DrawIndicator">True</property>
+                    <property name="HasLabel">True</property>
+                    <property name="UseUnderline">True</property>
+                    <signal name="Toggled" handler="OnOmitCBToggled" />
+                  </widget>
+                  <packing>
+                    <property name="Position">2</property>
+                    <property name="AutoSize">True</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="Position">2</property>
@@ -248,4 +263,4 @@
       </widget>
     </child>
   </widget>
-</stetic-interface>
\ No newline at end of file
+</stetic-interface>