/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: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1336
1336
            except errors.NoWorkingTree:
1337
1337
                source.bzrdir.create_workingtree(revision_id)
1338
1338
                return
 
1339
 
 
1340
        if not lightweight:
 
1341
            message = ('Copying history to "%s". '
 
1342
                'To checkout without local history use --lightweight.' % to_location)
 
1343
            ui.ui_factory.show_message(message)
1339
1344
        source.create_checkout(to_location, revision_id, lightweight,
1340
1345
                               accelerator_tree, hardlink)
1341
1346
 
3145
3150
        def get_message(commit_obj):
3146
3151
            """Callback to get commit message"""
3147
3152
            if file:
3148
 
                f = codecs.open(file, 'rt', osutils.get_user_encoding())
3149
 
                try:
3150
 
                    my_message = f.read()
3151
 
                finally:
3152
 
                    f.close()
 
3153
                my_message = codecs.open(
 
3154
                    file, 'rt', osutils.get_user_encoding()).read()
3153
3155
            elif message is not None:
3154
3156
                my_message = message
3155
3157
            else:
3592
3594
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3593
3595
            # On Windows, disable automatic conversion of '\n' to '\r\n' in
3594
3596
            # stdout, which would corrupt the subunit stream. 
3595
 
            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3596
 
            # following code can be deleted when it's sufficiently deployed
3597
 
            # -- vila/mgz 20100514
3598
 
            if (sys.platform == "win32"
3599
 
                and getattr(sys.stdout, 'fileno', None) is not None):
 
3597
            if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3600
3598
                import msvcrt
3601
3599
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3602
3600
        if parallel:
5128
5126
    given, in which case it is sent to a file.
5129
5127
 
5130
5128
    Mail is sent using your preferred mail program.  This should be transparent
5131
 
    on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.
 
5129
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
5132
5130
    If the preferred client can't be found (or used), your editor will be used.
5133
5131
 
5134
5132
    To use a specific mail program, set the mail_client configuration option.