Rev 96: Merge bugfixes for 379347, 379069, and also fix support for bzr 1.16 at the same time. in http://bazaar.launchpad.net/~bzr-loom-devs/bzr-loom/trunk/

[Robert Collins]

At http://bazaar.launchpad.net/~bzr-loom-devs/bzr-loom/trunk/

------------------------------------------------------------
revno: 96 [merge]
revision-id: robertc at robertcollins.net-20090618031414-ide5ozp7c1pkza51
parent: aaron at aaronbentley.com-20090415200403-w1ezd73pv1nm0zch
parent: bzr at lazymalevolence.com-20090522090618-pxllochvztto0fnj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Thu 2009-06-18 13:14:14 +1000
message:
  Merge bugfixes for 379347, 379069, and also fix support for bzr 1.16 at the same time.
modified:
  NEWS                           news-20080228111444-miryhm4hma987q57-1
  branch.py                      branch.py-20060620084702-jnrwijq76kg45klj-5
  setup.py                       setup.py-20060816082033-q1kfsfwsqprjak2q-1
=== modified file 'NEWS'
--- a/NEWS	2008-11-19 07:18:17 +0000
+++ b/NEWS	2009-06-18 03:14:14 +0000
@@ -29,6 +29,12 @@
 
   BUGFIXES:
 
+    * ``pull`` expects the keywork local. (Mark Lee, #379347)
+
+    * ``setup.py`` doesn't actually install. (Mark Lee, #379069)
+
+    * module has no attribute ``PushResult``. (Robert Collins)
+
   API BREAKS:
 
   TESTING:

=== modified file 'branch.py'
--- a/branch.py	2009-04-15 20:04:03 +0000
+++ b/branch.py	2009-06-18 03:14:14 +0000
@@ -437,7 +437,8 @@
 
     @needs_write_lock
     def pull(self, source, overwrite=False, stop_revision=None,
-        run_hooks=True, possible_transports=None, _override_hook_target=None):
+        run_hooks=True, possible_transports=None, _override_hook_target=None,
+        local=False):
         """Pull from a branch into this loom.
 
         If the remote branch is a non-loom branch, the pull is done against the
@@ -743,7 +744,7 @@
 
     @staticmethod
     def make_result():
-        return bzrlib.branch.PushResult()
+        return bzrlib.branch.BranchPushResult()
 
     @staticmethod
     def post_hooks():

=== modified file 'setup.py'
--- a/setup.py	2008-05-30 02:39:07 +0000
+++ b/setup.py	2009-05-22 08:53:44 +0000
@@ -24,7 +24,7 @@
 bzr_minimum_version = (1, 0, 0)
 bzr_maximum_version = None
 
-if __name__ == 'main':
+if __name__ == '__main__':
     setup(name="Loom",
           version="1.4.0dev0",
           description="Loom plugin for bzr.",