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

[Levi Bard]

Lots of updates - I haven't been good about merging them back. :-/

[lp:~taktaktaktaktaktaktaktaktaktak/monodevelop-bzr/2.4]

146. By Levi Bard on 2010-10-22

Remove obsolete cleanup_now calls.

147. By Levi Bard on 2010-10-22

Bump addin version.

[Jelmer Vernooij (jelmer)]

This now has conflicts :-/ I'll have a look at reviewing it soon, sorry for the delay.

[Jelmer Vernooij (jelmer)]

Is there any reason we shouldn't just overwrite trunk with your branch?

[Levi Bard (taktaktaktaktaktaktaktaktaktak)]

> Is there any reason we shouldn't just overwrite trunk with your branch?

I'm not sure - I haven't been keeping up with your changes (bad me!).
If you think it's a good idea, go ahead.

=== modified file 'BazaarCLibClient.cs'
--- BazaarCLibClient.cs	2010-01-19 22:14:40 +0000
+++ BazaarCLibClient.cs	2010-10-22 13:29:40 +0000
@@ -23,6 +23,7 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 
+using MonoDevelop.Ide;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 
@@ -117,22 +118,24 @@
 		{
 			List<IntPtr> rv = new List<IntPtr> ();
 			
-			if (0 != PyRun_SimpleString (string.Format (command, format))) {
-				string trace = "Unable to retrieve error data.";
-				if (0 == PyRun_SimpleString ("trace = ''.join(traceback.format_exception(sys.last_type, sys.last_value, sys.last_traceback))\n")) {
-					trace = StringFromPython (PyMapping_GetItemString (maindict, "trace"));
+			DispatchService.GuiSyncDispatch (() => {
+				if (0 != PyRun_SimpleString (string.Format (command, format))) {
+					string trace = "Unable to retrieve error data.";
+					if (0 == PyRun_SimpleString ("trace = ''.join(traceback.format_exception(sys.last_type, sys.last_value, sys.last_traceback))\n")) {
+						trace = StringFromPython (PyMapping_GetItemString (maindict, "trace"));
+					}
+					PyErr_Clear ();
+					
+					throw new BazaarClientException(string.Format ("Error running '{0}': {1}{2}", string.Format (command, format), Environment.NewLine, trace));
+				}
+			
+				if (null != variables) {
+					rv = variables.ConvertAll<IntPtr> (delegate(string variable){ 
+						return PyMapping_GetItemString (maindict, variable);
+					});
 				}
 				PyErr_Clear ();
-				
-				throw new BazaarClientException(string.Format ("Error running '{0}': {1}{2}", string.Format (command, format), Environment.NewLine, trace));
-			}
-			
-			if (null != variables) {
-				rv = variables.ConvertAll<IntPtr> (delegate(string variable){ 
-					return PyMapping_GetItemString (maindict, variable);
-				});
-			}
-			PyErr_Clear ();
+			});
 			
 			return rv;
 		}// run
@@ -183,6 +186,7 @@
 				string[] imports = new string[]{
 					"import sys",
 					"if('win32'==sys.platform): sys.path.append('C:/Program Files/Bazaar/lib/library.zip')",
+					"if('win32'==sys.platform): sys.path.append('C:/Program Files (x86)/Bazaar/lib/library.zip')",
 					"import traceback",
 					"import StringIO",
 					"import bzrlib",
@@ -228,7 +232,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("tree = workingtree.WorkingTree.open_containing(path=ur\"{0}\")[0]\n", localPath);
 			command.AppendFormat (null, "tree.smart_add(file_list=[ur\"{0}\"], recurse={1})\n", localPath, recurse? "True": "False");
-			command.Append("del tree\n");
 			
 			lock (lockme) {
 				run (null, command.ToString ());
@@ -277,7 +280,7 @@
 				command.AppendFormat ("revspec = revisionspec.RevisionSpec.from_string(spec=\"{0}\")\n", rev.Rev);
 				pyrev = "revspec.in_history(branch=b).rev_id";
 			}
-			command.AppendFormat ("b.create_checkout(to_location=ur\"{1}\", revision_id={0})\ndel b\n", pyrev, NormalizePath (targetLocalPath));
+			command.AppendFormat ("b.create_checkout(to_location=ur\"{1}\", revision_id={0})\n", pyrev, NormalizePath (targetLocalPath));
 
 			lock (lockme){ run (null, command.ToString ()); }
 			monitor.Log.WriteLine ("Checkout to {0} completed", targetLocalPath);
@@ -306,13 +309,12 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("tree = workingtree.WorkingTree.open_containing(path=ur\"{0}\")[0]\n", NormalizePath (basePath));
 			command.AppendFormat ("c = commit.Commit()\nc.commit(message=ur\"{0}\",specific_files={1},working_tree=tree)\n", escapedComment, pyfiles);
-			command.Append ("del tree\n");
 
 			lock (lockme) {
 				run (null, command.ToString ());
 			}
 		}
-
+		
 		public override DiffInfo[] Diff (string basePath, string[] files)
 		{
 			List<DiffInfo> results = new List<DiffInfo> ();
@@ -334,29 +336,65 @@
 			}
 
 			foreach (string file in files) {
-				string diffpath = Path.GetTempFileName ();
 				string fullPath = Path.Combine (basePath, file);
 				StringBuilder command = new StringBuilder ();
 				command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur\"{0}\")\n", fullPath);
-				command.AppendFormat ("outfile = open(ur\"{0}\",\"w\")\n", diffpath);
+				command.AppendFormat ("outfile = StringIO.StringIO()\n");
 				command.AppendFormat ("tree.lock_read()\ntry:\n");
-				command.AppendFormat ("  mydiff = bzrlib.diff.DiffTree(old_tree=tree.basis_tree(), new_tree=tree, to_file=outfile)\n", diffpath);
+				command.AppendFormat ("  mydiff = bzrlib.diff.DiffTree(old_tree=tree.basis_tree(), new_tree=tree, to_file=outfile)\n");
 				command.AppendFormat ("  mydiff.show_diff(specific_files=[relpath])\n");
-				command.AppendFormat ("finally:\n  tree.unlock()\n  outfile.close()\n  del tree\n");
+				command.AppendFormat ("  output = outfile.getvalue()\n");
+				command.AppendFormat ("finally:\n  tree.unlock()\n  outfile.close()\n");
 			
 				lock (lockme) {
+<<<<<<< TREE
 					try {
 						run (null, command.ToString ());
 						results.Add (new DiffInfo (file, File.ReadAllText (diffpath).Replace ("\r\n", Environment.NewLine)));
 					} finally {
 						File.Delete (diffpath);
 					}
+=======
+					string output = StringFromPython (run (new List<string>{"output"}, command.ToString ())[0]);
+					results.Add (new DiffInfo (basePath, file, output.Replace ("\r\n", Environment.NewLine)));
+>>>>>>> MERGE-SOURCE
 				}
 			}
 			
 			return results.ToArray ();
 		}
 
+		public override DiffInfo[] Diff (string path, BazaarRevision fromRevision, BazaarRevision toRevision)
+		{
+			List<DiffInfo> results = new List<DiffInfo> ();
+			path = NormalizePath (Path.GetFullPath (path));
+			StringBuilder command = new StringBuilder ();
+			
+			command.AppendFormat ("outfile = StringIO.StringIO()\n");
+			command.AppendFormat ("old_tree = None\n");
+			command.AppendFormat ("new_tree = None\n");
+			command.AppendFormat ("try:\n");
+			command.AppendFormat ("  old_tree,new_tree,old_branch,new_branch,specific_files,extra_trees = diff.get_trees_and_branches_to_diff(path_list=None, revision_specs=[revisionspec.RevisionSpec.from_string(ur\"{0}\"), revisionspec.RevisionSpec.from_string(ur\"{1}\")], old_url=ur\"{2}\", new_url=ur\"{2}\")\n", 
+			                      fromRevision, toRevision, path);
+			command.AppendFormat ("  mydiff = bzrlib.diff.DiffTree(old_tree=old_tree, new_tree=new_tree, to_file=outfile)\n");
+			command.AppendFormat ("  old_tree.lock_read()\n");
+			command.AppendFormat ("  new_tree.lock_read()\n");
+			command.AppendFormat ("  mydiff.show_diff(specific_files=specific_files, extra_trees=extra_trees)\n");
+			command.AppendFormat ("  output = outfile.getvalue()\n");
+			command.AppendFormat ("finally:\n");
+			command.AppendFormat ("  outfile.close()\n");
+			command.AppendFormat ("  if(old_tree): old_tree.unlock()\n");
+			command.AppendFormat ("  if(new_tree): new_tree.unlock()\n");
+		
+			lock (lockme) {
+				string output = StringFromPython (run (new List<string>{"output"}, command.ToString ())[0]);
+				results.Add (new DiffInfo (Path.GetDirectoryName (path), Path.GetFileName (path), 
+				                           output.Replace ("\r\n", Environment.NewLine)));
+			}
+			
+			return results.ToArray ();
+		}
+
 		static Regex revisionRegex = new Regex (@"^\s*(?<revision>[\d\.]+): (?<committer>.*) (?<date>\d{4}-\d{2}-\d{2}) (?<message>.*)", RegexOptions.Compiled);
 		public override BazaarRevision[] GetHistory (BazaarRepository repo, string localFile, BazaarRevision since)
 		{
@@ -434,7 +472,6 @@
 						// Don't care, just means branch doesn't exist
 					}
 				}// invoke each getter
-				run (null, "del b\n");
 			}// lock
 			
 			return branches;
@@ -445,7 +482,7 @@
 			IntPtr branch = IntPtr.Zero;
 			
 			lock (lockme) {
-				branch = run (new List<string>{"mybase"}, "mybranch = branch.Branch.open_containing(url=ur\"{0}\")[0]\nmybase=mybranch.base\ndel mybranch\n", NormalizePath (Path.GetFullPath (path)))[0];
+				branch = run (new List<string>{"mybase"}, "mybranch = branch.Branch.open_containing(url=ur\"{0}\")[0]\nmybase=mybranch.base\n", NormalizePath (Path.GetFullPath (path)))[0];
 				string baseurl = StringFromPython (branch);
 				return baseurl.StartsWith ("file://", StringComparison.Ordinal)? baseurl.Substring (7): baseurl;
 			}
@@ -463,8 +500,6 @@
 			command.AppendFormat ("  diff = rev_tree.get_file_text(file_id=rev_tree.path2id(path=relpath))\n");
 			command.AppendFormat ("finally:\n");
 			command.AppendFormat ("  rev_tree.unlock()\n");
-			command.AppendFormat ("  del rev_tree\n");
-			command.AppendFormat ("  del b\n");
 			
 			lock (lockme) {
 				text = run (new List<string>{"diff"}, command.ToString ())[0];
@@ -488,7 +523,7 @@
 			command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur\"{0}\")\n", NormalizePath (path));
 			command.AppendFormat ("mylist = \"\"\ntree.lock_read()\n");
 			command.AppendFormat ("try:\n  for entry in tree.list_files():\n    mylist = mylist+entry[0]+\"|\"+entry[2]+\"\\n\"\n");
-			command.AppendFormat ("finally:\n  tree.unlock()\n  del tree\n");
+			command.AppendFormat ("finally:\n  tree.unlock()\n");
 			
 			lock (lockme) {
 				try {
@@ -558,7 +593,7 @@
 			command.AppendFormat ("mycmd = builtins.cmd_pull()\n");
 			command.AppendFormat ("mycmd.outf = StringIO.StringIO()\n");
 			command.AppendFormat ("try:\n");
-			command.AppendFormat (string.Format ("  mycmd.run(location=ur'{0}',remember={1},overwrite={2},directory=ur'{3}')\n", pullLocation, remember? "True": "False", overwrite? "True": "False", localPath));
+			command.AppendFormat ("  mycmd.run(location=ur'{0}',remember={1},overwrite={2},directory=ur'{3}',verbose=True)\n", pullLocation, remember? "True": "False", overwrite? "True": "False", localPath);
 			command.AppendFormat ("  output = mycmd.outf.getvalue()\n");
 			command.AppendFormat ("finally:\n");
 			command.AppendFormat ("  mycmd.outf.close()\n");
@@ -599,7 +634,7 @@
 			command.AppendFormat ("mycmd = foreign.cmd_dpush()\n");
 			command.AppendFormat ("mycmd.outf = StringIO.StringIO()\n");
 			command.AppendFormat ("try:\n");
-			command.AppendFormat (string.Format ("  mycmd.run(location=ur'{0}',remember={1}, directory=ur'{2}')\n",
+			command.AppendFormat (string.Format ("  mycmd.run(location=ur'{0}',remember={1}, directory=ur'{2}', strict=False)\n",
 			                                   pushLocation, remember? "True": "False",
 			                                   localPath));
 			command.AppendFormat ("  output = mycmd.outf.getvalue()\n");
@@ -619,7 +654,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur\"{0}\")\n", path);
 			command.AppendFormat ("tree.remove(files=[relpath], force={1})\n", path, force? "True": "False");
-			command.Append ("del tree\n");
 			
 			lock (lockme){ run (null, command.ToString ()); }
 		}
@@ -630,7 +664,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur\"{0}\")\n", path);
 			command.AppendFormat ("conflicts.resolve(tree=tree, paths=[relpath], recursive={1})\n", Path.GetFullPath (path), recurse? "True": "False");
-			command.Append ("del tree\n");
 
 			lock (lockme){ run (null, command.ToString ()); }
 		}
@@ -650,7 +683,7 @@
 			}
 			command.AppendFormat ("tree.lock_tree_write()\n");
 			command.AppendFormat ("try:\n  tree.revert(filenames=[tree.relpath(ur\"{0}\")], old_tree=rev)\n", localPath);
-			command.AppendFormat ("finally:\n  tree.unlock()\n  del tree\n  del rev\n");
+			command.AppendFormat ("finally:\n  tree.unlock()\n");
 			lock (lockme) {
 				run (null, command.ToString ());
 			}
@@ -665,6 +698,7 @@
 			bool modified = false;
 			IntPtr  tuple = IntPtr.Zero,
 					listlen = IntPtr.Zero;
+					
 			path = NormalizePath (Path.GetFullPath (path).Replace ("{", "{{").Replace ("}", "}}"));// escape for string.format
 			command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur\"{0}\")\n", path);
 			
@@ -696,17 +730,12 @@
 							tuple = run (new List<string>{"astatus"}, "astatus = tree.abspath(filename=mylist[{0}][0])", i)[0];
 							filename = StringFromPython (tuple);
 							LocalStatus status = new LocalStatus (rev, filename, longStatuses[modtype]);
-							LoggingService.LogInfo ("{0}: {1} ({2})", modtype, filename, path);
 							if (path.Equals (filename, StringComparison.Ordinal)) {
-								LoggingService.LogInfo ("Using status {0} for {1}", modtype, filename);
 								mystatus = status;
 							} 
 							if (filename.StartsWith (path, StringComparison.Ordinal)) {
-								LoggingService.LogInfo ("Using status {0} for child of {1}", modtype, path);
 								modified = (!"unversioned".Equals (modtype, StringComparison.Ordinal));
 								statuses.Add (status);
-							} else {
-								LoggingService.LogInfo ("No match for {0}", filename);
 							}
 						}// get each file status
 					} finally {
@@ -714,11 +743,12 @@
 					}
 				}
 				
-				string conflicts = string.Empty;
+				command = new StringBuilder ();
+				command.Append ("myconflicts = \"\"\n");
+				command.Append ("for conflict in totree.conflicts():\n");
+				command.Append ("  myconflicts = myconflicts + totree.abspath (filename=conflict.path) + \"|\"\n");
 				
-				conflicts = StringFromPython (run (new List<string>{"myconflicts"},
-				    "myconflicts = \"\"\nfor conflict in totree.conflicts():\n  myconflicts = myconflicts+totree.abspath(filename=conflict.path)+\"|\"\n")[0]);
-				run (null, "del tree\ndel totree\n");
+				string conflicts = StringFromPython (run (new List<string>{"myconflicts"}, command.ToString ())[0]);
 				
 				foreach (string conflict in conflicts.Split ('|')) {
 					if (!string.IsNullOrEmpty (conflict)) {
@@ -752,7 +782,7 @@
 		public override void Update (string localPath, bool recurse, MonoDevelop.Core.IProgressMonitor monitor)
 		{
 			localPath = NormalizePath (Path.GetFullPath (localPath));
-			lock (lockme){ run (null, "tree = workingtree.WorkingTree.open_containing(path=ur\"{0}\")[0]\ntree.update()\ndel tree\n", localPath); }
+			lock (lockme){ run (null, "tree = workingtree.WorkingTree.open_containing(path=ur\"{0}\")[0]\ntree.update()\n", localPath); }
 		}
 		
 		public override void StoreCredentials (string url)
@@ -791,7 +821,6 @@
 			command.AppendFormat ("to_transport = transport.get_transport(base=ur'{0}')\n", NormalizePath (path));
 			command.Append ("create_branch = bzrdir.BzrDir.create_branch_convenience\n");
 			command.Append ("mybranch = create_branch(base=to_transport.base, format=format, possible_transports=[to_transport])\n");
-			command.Append ("del mybranch\n");
 			
 			run (null, command.ToString ());
 		}// Init
@@ -801,7 +830,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("tree,relpath = workingtree.WorkingTree.open_containing(path=ur'{0}')\n", NormalizePath (path));
 			command.AppendFormat ("ignores.tree_ignores_add_patterns(tree=tree, name_pattern_list=[relpath])\n");
-			command.Append ("del tree\n");
 			
 			run (null, command.ToString ());
 		}// Ignore
@@ -811,7 +839,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("b = branch.Branch.open_containing(url=ur'{0}')[0]\n", NormalizePath (path));
 			command.AppendFormat ("bound = repr(b.get_bound_location())\n");
-			command.AppendFormat ("del b\n");
 			
 			return ("None" != StringFromPython(run (new List<string>{"bound"}, command.ToString ())[0]));
 		}// IsBound
@@ -824,7 +851,6 @@
 			StringBuilder command = new StringBuilder ();
 			command.AppendFormat ("b = branch.Branch.open_containing(url=ur'{0}')[0]\n", NormalizePath (path));
 			command.AppendFormat ("bound = repr(b.{0}())\n", method);
-			command.AppendFormat ("del b\n");
 			
 			location = StringFromPython(run (new List<string>{"bound"}, command.ToString ())[0]);
 			return ("None" == location? string.Empty: location);
@@ -838,7 +864,7 @@
 			run (null, "remoteb = branch.Branch.open_containing(url=ur'{0}')[0]\n", branchUrl);
 			monitor.Log.WriteLine ("Opened {0}", branchUrl);
 			
-			run (null, "b.bind(other=remoteb)\ndel b\ndel remoteb");
+			run (null, "b.bind(other=remoteb)\n");
 			monitor.Log.WriteLine ("Bound {0} to {1}", localPath, branchUrl);
 		}// Bind
 
@@ -847,7 +873,7 @@
 			run (null, "b = branch.Branch.open_containing(url=ur'{0}')[0]\n", NormalizePath (localPath));
 			monitor.Log.WriteLine ("Opened {0}", localPath);
 			
-			run (null, "b.unbind()\ndel b\n");
+			run (null, "b.unbind()\n");
 			monitor.Log.WriteLine ("Unbound {0}", localPath);
 		}// Unbind
 		
@@ -856,7 +882,7 @@
 			run (null, "tree = workingtree.WorkingTree.open_containing(path=ur'{0}')[0]\nb = tree.branch\n", NormalizePath (localPath));
 			monitor.Log.WriteLine ("Opened {0}", localPath);
 			
-			run (null, "uncommit.uncommit(branch=b, tree=tree)\ndel tree\n");
+			run (null, "uncommit.uncommit(branch=b, tree=tree)\n");
 			monitor.Log.WriteLine ("Uncommit complete.");
 		}// Uncommit
 		
@@ -875,7 +901,6 @@
 			command.AppendFormat ("    f.close()\n");
 			command.AppendFormat ("finally:\n");
 			command.AppendFormat ("  tree.unlock()\n");
-			command.AppendFormat ("  del tree\n");
 			
 			string annotations = StringFromPython (run (new List<string>{"annotations"}, command.ToString ())[0]);
 			

=== modified file 'BazaarClient.cs'
--- BazaarClient.cs	2009-10-09 20:44:01 +0000
+++ BazaarClient.cs	2010-10-22 13:29:40 +0000
@@ -62,7 +62,7 @@
 					string[] tokens = v.Split ('.');
 					int major = int.Parse (tokens[0]),
 					    minor = int.Parse (tokens[1]);
-					return (1 < major || 16 <= minor);
+					return (3 <= major || (2 == major && 1 <= minor));
 				}
 			}
 			catch { }
@@ -105,6 +105,7 @@
 		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);
+		public abstract DiffInfo[] Diff (string path, BazaarRevision fromRevision, BazaarRevision toRevision);
 		public abstract void Remove (string path, bool force, IProgressMonitor monitor);
 		public abstract void Resolve (string path, bool recurse, IProgressMonitor monitor);
 		public abstract Dictionary<string, BranchType> GetKnownBranches (string path);

=== modified file 'BazaarCommands.cs'
--- BazaarCommands.cs	2010-01-19 22:14:40 +0000
+++ BazaarCommands.cs	2010-10-22 13:29:40 +0000
@@ -21,8 +21,8 @@
 
 using Gtk;
 using MonoDevelop.Core;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Core.Gui;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Pads.ProjectPad;
@@ -179,6 +179,19 @@
 			string   defaultBranch = string.Empty,
 			         localPath = vcitem.IsDirectory? vcitem.Path: Path.GetDirectoryName (vcitem.Path);
 
+			if (repo.IsModified (BazaarRepository.GetLocalBasePath (vcitem.Path.FullPath))) {
+				MessageDialog md = new MessageDialog (null, DialogFlags.Modal, 
+				                                      MessageType.Question, ButtonsType.YesNo, 
+				                                      GettextCatalog.GetString ("You have uncommitted local changes. Merge anyway?"));
+				try {
+					if ((int)ResponseType.Yes != md.Run ()) {
+						return;
+					}
+				} finally {
+					md.Destroy ();
+				}
+			}// warn about uncommitted changes
+
 			foreach (KeyValuePair<string, BranchType> branch in branches) {
 				if (BranchType.Parent == branch.Value) {
 					defaultBranch = branch.Key;
@@ -186,12 +199,12 @@
 				}
 			}// check for parent branch
 
-			Dialogs.BranchSelectionDialog bsd = new Dialogs.BranchSelectionDialog (branches.Keys, defaultBranch, localPath, false, true, true, false);
+			Dialogs.BranchSelectionDialog bsd = new Dialogs.BranchSelectionDialog (branches.Keys, defaultBranch, localPath, false, true, false, false);
 			try {
 				if ((int)Gtk.ResponseType.Ok == bsd.Run () && !string.IsNullOrEmpty (bsd.SelectedLocation)) {
 					BazaarTask worker = new BazaarTask ();
 					worker.Description = string.Format ("Merging from {0}", bsd.SelectedLocation);
-					worker.Operation = delegate{ repo.Merge (bsd.SelectedLocation, vcitem.Path, bsd.SaveDefault, bsd.Overwrite, worker.ProgressMonitor); };
+					worker.Operation = delegate{ repo.Merge (bsd.SelectedLocation, vcitem.Path, bsd.SaveDefault, true, worker.ProgressMonitor); };
 					worker.Start ();
 				}
 			} finally {

=== modified file 'BazaarRepository.cs'
--- BazaarRepository.cs	2009-10-21 21:13:45 +0000
+++ BazaarRepository.cs	2010-10-22 13:29:40 +0000
@@ -20,6 +20,7 @@
 using System.Collections;
 using System.Threading;
 
+using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.VersionControl;
 
@@ -223,15 +224,46 @@
 
 		public override void RevertToRevision (string localPath, Revision revision, IProgressMonitor monitor)
 		{
+			if (IsModified (BazaarRepository.GetLocalBasePath (localPath))) {
+				MessageDialog md = new MessageDialog (null, DialogFlags.Modal, 
+				                                      MessageType.Question, ButtonsType.YesNo, 
+				                                      GettextCatalog.GetString ("You have uncommitted local changes. Revert anyway?"));
+				try {
+					if ((int)ResponseType.Yes != md.Run ()) {
+						return;
+					}
+				} finally {
+					md.Destroy ();
+				}
+			}// warn about uncommitted changes
+
 			BazaarRevision brev = (null == revision)? new BazaarRevision (this, BazaarRevision.HEAD): (BazaarRevision)revision;
 			Bazaar.Revert (localPath, true, monitor, brev);
 		}
 
 		public override void RevertRevision (string localPath, Revision revision, IProgressMonitor monitor)
 		{
+			if (IsModified (BazaarRepository.GetLocalBasePath (localPath))) {
+				MessageDialog md = new MessageDialog (null, DialogFlags.Modal, 
+				                                      MessageType.Question, ButtonsType.YesNo, 
+				                                      GettextCatalog.GetString ("You have uncommitted local changes. Revert anyway?"));
+				try {
+					if ((int)ResponseType.Yes != md.Run ()) {
+						return;
+					}
+				} finally {
+					md.Destroy ();
+				}
+			}// warn about uncommitted changes
+
 			BazaarRevision brev = (BazaarRevision)revision;
+<<<<<<< TREE
 			localPath = Path.GetFullPath (localPath);
 			Bazaar.Merge (localPath, localPath, false, false, brev, (BazaarRevision)(brev.GetPrevious ()), monitor);
+=======
+			string localPathStr = localPath.FullPath;
+			Bazaar.Merge (localPathStr, localPathStr, false, true, brev, (BazaarRevision)(brev.GetPrevious ()), monitor);
+>>>>>>> MERGE-SOURCE
 		}
 
 		public override bool IsVersioned (string localPath)
@@ -340,6 +372,7 @@
 			return Bazaar.Diff (baseLocalPath, localPaths);
 		}// PathDiff
 
+<<<<<<< TREE
 		public override void DeleteFiles (string[] localPaths, bool force, IProgressMonitor monitor)
 		{
 			foreach (string localPath in localPaths)
@@ -361,6 +394,34 @@
 		public virtual Dictionary<string, BranchType> GetKnownBranches (string localPath)
 		{
 			return Bazaar.GetKnownBranches (Path.GetFullPath(localPath));
+=======
+		public override DiffInfo[] PathDiff (FilePath localPath, Revision fromRevision, Revision toRevision)
+		{
+			return Bazaar.Diff (localPath, (BazaarRevision)fromRevision, (BazaarRevision)toRevision);
+		}
+
+		public override void DeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor)
+		{
+			foreach (FilePath localPath in localPaths)
+				Bazaar.Remove (localPath.FullPath, force, monitor);
+		}// DeleteFiles
+
+		public override void DeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor)
+		{
+			foreach (FilePath localPath in localPaths)
+				Bazaar.Remove (localPath.FullPath, force, monitor);
+		}// DeleteDirectories
+
+		public virtual void Resolve (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		{
+			foreach (FilePath localPath in localPaths)
+				Bazaar.Resolve (localPath.FullPath, recurse, monitor);
+		}// Resolve
+
+		public virtual Dictionary<string, BranchType> GetKnownBranches (FilePath localPath)
+		{
+			return Bazaar.GetKnownBranches (localPath.FullPath);
+>>>>>>> MERGE-SOURCE
 		}// GetKnownBranches
 		
 		public virtual void Ignore (string localPath)

=== modified file 'BazaarVersionControl.cs'
--- BazaarVersionControl.cs	2010-01-19 22:14:40 +0000
+++ BazaarVersionControl.cs	2010-10-22 13:29:40 +0000
@@ -249,7 +249,7 @@
 		public void Commit (ChangeSet changeSet, IProgressMonitor monitor) {
 			if (Client.IsMergePending (Path.GetFullPath (changeSet.BaseLocalPath))) {
 				int result = (int)ResponseType.Cancel;
-				MonoDevelop.Core.Gui.DispatchService.GuiSyncDispatch(delegate{ 
+				MonoDevelop.Ide.DispatchService.GuiSyncDispatch(delegate{ 
 					MessageDialog warningDialog = new MessageDialog (null, DialogFlags.Modal, MessageType.Warning, ButtonsType.OkCancel, 
 					                   GettextCatalog.GetString ("Because there are merges pending, all pending changes must be committed together. Proceed?"));
 					result = warningDialog.Run ();
@@ -274,6 +274,11 @@
 		public DiffInfo[] Diff (string basePath, string[] files) {
 			return Client.Diff (basePath, files);
 		}// Diff
+		
+		public DiffInfo[] Diff (string path, BazaarRevision fromRevision, BazaarRevision toRevision)
+		{
+			return Client.Diff (path, fromRevision, toRevision);
+		}// Diff
 
 		public void Remove (string path, bool force, IProgressMonitor monitor) {
 			Client.Remove (path, force, monitor);

=== modified file 'Dialogs/BranchSelectionDialog.cs'
--- Dialogs/BranchSelectionDialog.cs	2009-10-23 17:46:24 +0000
+++ Dialogs/BranchSelectionDialog.cs	2010-10-22 13:29:40 +0000
@@ -96,7 +96,11 @@
 				}
 			}
 			iter = branchStore.AppendValues (string.Empty);
-
+			
+			if (1 == branchLocations.Count) {
+				branchStore.GetIterFirst (out iter);
+			}// when only one branch is known, default to it
+			
 			branchTreeView.Selection.SelectIter (found? defaultIter: iter);
 
 			if (!string.IsNullOrEmpty (localDirectory))

=== modified file 'IBazaarClient.cs'
--- IBazaarClient.cs	2009-10-09 20:44:01 +0000
+++ IBazaarClient.cs	2010-10-22 13:29:40 +0000
@@ -273,6 +273,23 @@
 		DiffInfo[] Diff (string basePath, string[] files);
 
 		/// <summary>
+		/// Performs a recursive diff
+		/// </summary>
+		/// <param name="path">
+		/// A <see cref="System.String"/>: The path to be diffed
+		/// </param>
+		/// <param name="fromRevision">
+		/// A <see cref="BazaarRevision"/>: The beginning revision
+		/// </param>
+		/// <param name="toRevision">
+		/// A <see cref="BazaarRevision"/>: The ending revision
+		/// </param>
+		/// <returns>
+		/// A <see cref="DiffInfo[]"/>: The differences
+		/// </returns>
+		DiffInfo[] Diff (string path, BazaarRevision fromRevision, BazaarRevision toRevision);
+		
+		/// <summary>
 		/// Removes a path
 		/// </summary>
 		/// <param name="path">

=== modified file 'MonoDevelop.VersionControl.Bazaar.addin.xml'
--- MonoDevelop.VersionControl.Bazaar.addin.xml	2009-12-25 11:01:50 +0000
+++ MonoDevelop.VersionControl.Bazaar.addin.xml	2010-10-22 13:29:40 +0000
@@ -6,18 +6,29 @@
        url       = "http://bazaar-vcs.org/MonoDevelop"
        description = "Bazaar support for the Version Control Addin"
        category    = "Version Control"
+<<<<<<< TREE
        version   = "2.0.0">
+=======
+       version   = "2.4.1">
+>>>>>>> MERGE-SOURCE
  
 	<Runtime>
 		<Import assembly="MonoDevelop.VersionControl.Bazaar.dll"/>
+		<Import file="MonoDevelop.VersionControl.Bazaar.dll.config"/>
 	</Runtime>
 
 	<Dependencies>
+<<<<<<< TREE
 		<Addin id="Core" version="2.0"/>
 		<Addin id="Core.Gui" version="2.0"/>
 		<Addin id="Projects" version="2.0"/>
 		<Addin id="Ide" version="2.0"/>
 		<Addin id="VersionControl" version="2.0"/>
+=======
+		<Addin id="Core" version="2.4"/>
+		<Addin id="Ide" version="2.4"/>
+		<Addin id="VersionControl" version="2.4"/>
+>>>>>>> MERGE-SOURCE
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">

=== modified file 'MonoDevelop.VersionControl.Bazaar.dll.config'
--- MonoDevelop.VersionControl.Bazaar.dll.config	2009-10-29 19:43:31 +0000
+++ MonoDevelop.VersionControl.Bazaar.dll.config	2010-10-22 13:29:40 +0000
@@ -1,3 +1,3 @@
 <configuration>
-	<dllmap os="!windows" dll="python25" target="python2.5" />
+	<dllmap os="!windows" dll="python25" target="python2.6" />
 </configuration>
\ No newline at end of file

=== added file 'addin-project.xml'
--- addin-project.xml	1970-01-01 00:00:00 +0000
+++ addin-project.xml	2010-10-22 13:29:40 +0000
@@ -0,0 +1,8 @@
+<AddinProject appVersion="2.4">
+	<Project platforms="Mac Linux">
+		<AddinFile>bin/Debug/MonoDevelop.VersionControl.Bazaar.dll</AddinFile>
+		<BuildFile>monodevelop-bzr.sln</BuildFile>
+		<BuildConfiguration>Debug</BuildConfiguration>
+	</Project>
+</AddinProject>
+

=== modified file 'gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs'
--- gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs	2009-10-21 21:13:45 +0000
+++ gtk-gui/MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs	2010-10-22 13:29:40 +0000
@@ -54,7 +54,7 @@
             this.passwordEntry.IsEditable = true;
             this.passwordEntry.ActivatesDefault = true;
             this.passwordEntry.Visibility = false;
-            this.passwordEntry.InvisibleChar = '●';
+            this.passwordEntry.InvisibleChar = '*';
             this.vbox2.Add(this.passwordEntry);
             Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.passwordEntry]));
             w3.Position = 1;

=== added file 'monodevelop-bzr.csproj'
--- monodevelop-bzr.csproj	1970-01-01 00:00:00 +0000
+++ monodevelop-bzr.csproj	2010-10-22 13:29:40 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MonoDevelop.VersionControl.Bazaar</RootNamespace>
+    <AssemblyName>MonoDevelop.VersionControl.Bazaar</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="gtk-gui\generated.cs" />
+    <Compile Include="BazaarVersionControl.cs" />
+    <Compile Include="BazaarRepository.cs" />
+    <Compile Include="IBazaarClient.cs" />
+    <Compile Include="BazaarClient.cs" />
+    <Compile Include="BazaarCommandException.cs" />
+    <Compile Include="BazaarRevision.cs" />
+    <Compile Include="BazaarClientException.cs" />
+    <Compile Include="BazaarCommands.cs" />
+    <Compile Include="Dialogs\BranchSelectionDialog.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.VersionControl.Bazaar.Dialogs.BranchSelectionDialog.cs" />
+    <Compile Include="Dialogs\PasswordPromptDialog.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.VersionControl.Bazaar.Dialogs.PasswordPromptDialog.cs" />
+    <Compile Include="BazaarCLibClient.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="gtk-gui\gui.stetic">
+      <LogicalName>gui.stetic</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.VersionControl.Bazaar.addin.xml">
+      <LogicalName>MonoDevelop.VersionControl.Bazaar.addin.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="BazaarCommandClient.cs" />
+    <None Include="BazaarLibClient.cs" />
+    <None Include="bazaarlibclient.py" />
+    <None Include="MonoDevelop.VersionControl.Bazaar.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Dialogs\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="Mono.Posix" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="MonoDevelop.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null">
+      <Package>monodevelop</Package>
+    </Reference>
+    <Reference Include="MonoDevelop.VersionControl, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null">
+      <Package>monodevelop-core-addins</Package>
+    </Reference>
+    <Reference Include="MonoDevelop.Ide, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null">
+      <Package>monodevelop</Package>
+    </Reference>
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>

=== modified file 'monodevelop-bzr.mdp'
--- monodevelop-bzr.mdp	2009-12-25 11:01:50 +0000
+++ monodevelop-bzr.mdp	2010-10-22 13:29:40 +0000
@@ -44,6 +44,12 @@
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+<<<<<<< TREE
+=======
+    <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=" />
+    <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.VersionControl, Version=2.1.0.0, Culture=neutral, PublicKeyToken=" />
+    <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=2.1.0.0, Culture=neutral, PublicKeyToken=" />
+>>>>>>> MERGE-SOURCE
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=2.0.0.0, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=2.0.0.0, Culture=neutral" />

=== added file 'monodevelop-bzr.sln'
--- monodevelop-bzr.sln	1970-01-01 00:00:00 +0000
+++ monodevelop-bzr.sln	2010-10-22 13:29:40 +0000
@@ -0,0 +1,24 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monodevelop-bzr", "monodevelop-bzr.csproj", "{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E2AA9EF-1D11-4E71-87BF-6CD48C0CF23F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = monodevelop-bzr.csproj
+		Policies = $0
+		$0.StandardHeader = $1
+		$1.inheritsSet = GPLv2License
+		name = monodevelop-bzr
+	EndGlobalSection
+EndGlobal