Rev 24: update release.py for new _setup_outf() changes in http://bzr.arbash-meinel.com/plugins/ezbzr-jam

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/ezbzr-jam

------------------------------------------------------------
revno: 24
revision-id: john at arbash-meinel.com-20070212210345-yjh9znpg7jj01lkg
parent: john at arbash-meinel.com-20070212210130-58l6n7h7x3ae9qmj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ezbzr
timestamp: Mon 2007-02-12 15:03:45 -0600
message:
  update release.py for new _setup_outf() changes
modified:
  release.py                     release.py-20060116232304-34bf27069b463966
-------------- next part --------------
=== modified file 'release.py'
--- a/release.py	2007-02-12 20:49:43 +0000
+++ b/release.py	2007-02-12 21:03:45 +0000
@@ -109,9 +109,13 @@
 
                 # Create a local copy of the remote branch
                 print " * Creating temporary branch from %s..." % uri
-                builtins.cmd_branch().run(from_location=branch.base, to_location=localcache)
+                branch_cmd = builtins.cmd_branch()
+                branch_cmd._setup_outf()
+                branch_cmd.run(from_location=branch.base, to_location=localcache)
                 os.chdir(localcache)
-                builtins.cmd_pull().run(location=uri, overwrite=True)
+                pull_cmd = builtins.cmd_pull()
+                pull_cmd._setup_outf()
+                pull_cmd.run(location=uri, overwrite=True)
 
 
                 # Set the push variable for when we push back the changes
@@ -122,7 +126,9 @@
 
                 # Merge my changes into the local copy of the remote branch
                 print " * Merging in changes from %s..." % branch.base
-                builtins.cmd_merge().run(branch=branch.base, revision=revision)
+                merge_cmd = builtins.cmd_merge()
+                merge_cmd._setup_outf()
+                merge_cmd.run(branch=branch.base, revision=revision)
 
                 # Check for conflicts
                 for conflict in localbranch.working_tree().iter_conflicts():
@@ -141,10 +147,12 @@
                     print " * Committing changes..."
 
                     # Commit the merged changes
-                    builtins.cmd_commit().run(message=message, verbose=False)
+                    commit_cmd = builtins.cmd_commit()
+                    commit_cmd._setup_outf()
+                    commit_cmd.run(message=message, verbose=False)
 
                     # Push back the changes from our local copy
-                    builtins.cmd_push().run()
+                    builtins.cmd_push().run_argv_aliases([])
                 else:
                     print " * Abandoning changes!"