0.8 release plans

[Robert Collins]

On Wed, 2006-05-03 at 09:36 +1000, Michael Ellerman wrote:
> On 5/2/06, Martin Pool <mbp at sourcefrog.net> wrote:
> > I'd like to try to do a second 0.8 candidate this week and try to lead
> > from there to actually doing a release.
> >
> ...
> >  - default to no diff prefixes?
> 
> Having written the patch that added diff prefixes, and broken
> everyone's tools and scripts, I'm now going to try and argue that we
> should keep them because changing it now would break everyone's tools
> and scripts ;)
> 
> But seriously, if we go to no prefixes it'd be nice to have a day or
> two to fix shelf & bzrtools.
> 
> I still think -p1 is better, but I just don't care enough to argue
> anymore, so whatever.

Could you fix shelf and bzrtools then ?

I've had a poke, but got stuck in a corner where I cant seem to see whats going on.

It fails to find the file to alter for some reason I'm not fathoming.

=== modified file 'a/patchsource.py'
--- a/patchsource.py	
+++ b/patchsource.py	
@@ -65,5 +65,6 @@
         sys.stdout = output
         # FIXME diff_cmd_helper() should take an output parameter
         diff_cmd_helper(self.wt, self.file_list, external_diff_options=None,
-                        old_revision_spec=self.revision)
+                        old_revision_spec=self.revision,
+                        old_label='', new_label='')
         sys.stdout = tmp

=== modified file 'a/shelf.py'
--- a/shelf.py	
+++ b/shelf.py	
@@ -155,12 +155,12 @@
                 (self.name, os.path.basename(patch_name), message))
 
         try:
-            self._run_patch(to_unshelve, dry_run=True)
-            self._run_patch(to_unshelve)
+            self._run_patch(to_unshelve, strip=0, dry_run=True)
+            self._run_patch(to_unshelve, strip=0)
         except PatchFailed:
             try:
-                self._run_patch(to_unshelve, strip=0, dry_run=True)
-                self._run_patch(to_unshelve, strip=0)
+                self._run_patch(to_unshelve, strip=1, dry_run=True)
+                self._run_patch(to_unshelve, strip=1)
             except PatchFailed:
                 if force:
                     self.log('Warning: Unshelving failed, forcing as ' \
@@ -216,12 +216,12 @@
         patch.close()
 
         try:
-            self._run_patch(to_shelve, reverse=True, dry_run=True)
-            self._run_patch(to_shelve, reverse=True)
+            self._run_patch(to_shelve, reverse=True, strip=0, dry_run=True)
+            self._run_patch(to_shelve, reverse=True, strip=0)
         except PatchFailed:
             try:
-                self._run_patch(to_shelve, reverse=True, strip=0, dry_run=True)
-                self._run_patch(to_shelve, reverse=True, strip=0)
+                self._run_patch(to_shelve, reverse=True, strip=1, dry_run=True)
+                self._run_patch(to_shelve, reverse=True, strip=1)
             except PatchFailed:
                 raise CommandError("Failed removing shelved changes from the"
                     "working tree!")

=== modified file 'a/tests/shelf_tests.py'
--- a/tests/shelf_tests.py	
+++ b/tests/shelf_tests.py	
@@ -6,9 +6,9 @@
 class ShelfTests(bzrlib.tests.TestCaseWithTransport):
     ORIGINAL = '\n\nhello test world\n\n'
     MODIFIED = '\n\ngoodbye test world\n\n'
-    DIFF_HEADER = "=== modified file 'a/test_file'\n"
-    DIFF_1 = """--- a/test_file\t
-+++ b/test_file\t
+    DIFF_HEADER = "=== modified file 'test_file'\n"
+    DIFF_1 = """--- test_file\t
++++ test_file\t
 @@ -1,4 +1,4 @@
  
  
@@ -16,8 +16,8 @@
 +goodbye test world
  
 """
-    DIFF_2 = """--- a/test_file\t
-+++ b/test_file\t
+    DIFF_2 = """--- test_file\t
++++ test_file\t
 @@ -1,4 +1,4 @@
  
  



-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060508/28f11952/attachment.pgp