/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-12-15 16:35:40 UTC
  • mfrom: (3113 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3115.
  • Revision ID: aaron.bentley@utoronto.ca-20071215163540-g04zcop5aj5h1nwh
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4027
4027
    def _run(self, submit_branch, revision, public_branch, remember, format,
4028
4028
             no_bundle, no_patch, output, from_, mail_to, message):
4029
4029
        from bzrlib.revision import NULL_REVISION
 
4030
        branch = Branch.open_containing(from_)[0]
4030
4031
        if output is None:
4031
4032
            outfile = StringIO()
4032
4033
        elif output == '-':
4033
4034
            outfile = self.outf
4034
4035
        else:
4035
4036
            outfile = open(output, 'wb')
 
4037
        # we may need to write data into branch's repository to calculate
 
4038
        # the data to send.
 
4039
        branch.lock_write()
4036
4040
        try:
4037
 
            branch = Branch.open_containing(from_)[0]
4038
 
            # we may need to write data into branch's repository to calculate
4039
 
            # the data to send.
4040
 
            branch.lock_write()
4041
4041
            if output is None:
4042
4042
                config = branch.get_config()
4043
4043
                if mail_to is None: