~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-16 14:16:50 UTC
  • mfrom: (5777.6.13 commit-lossy)
  • Revision ID: pqm@pqm.ubuntu.com-20110416141650-nyf3g3jmhw9cjoff
(jelmer) Add --lossy option to 'bzr commit'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3144
3144
             Option('show-diff', short_name='p',
3145
3145
                    help='When no message is supplied, show the diff along'
3146
3146
                    ' with the status summary in the message editor.'),
 
3147
             Option('lossy', 
 
3148
                    help='When committing to a foreign version control '
 
3149
                    'system do not push data that can not be natively '
 
3150
                    'represented.'),
3147
3151
             ]
3148
3152
    aliases = ['ci', 'checkin']
3149
3153
 
3168
3172
 
3169
3173
    def run(self, message=None, file=None, verbose=False, selected_list=None,
3170
3174
            unchanged=False, strict=False, local=False, fixes=None,
3171
 
            author=None, show_diff=False, exclude=None, commit_time=None):
 
3175
            author=None, show_diff=False, exclude=None, commit_time=None,
 
3176
            lossy=False):
3172
3177
        from bzrlib.errors import (
3173
3178
            PointlessCommit,
3174
3179
            ConflictsInTree,
3270
3275
                        reporter=None, verbose=verbose, revprops=properties,
3271
3276
                        authors=author, timestamp=commit_stamp,
3272
3277
                        timezone=offset,
3273
 
                        exclude=tree.safe_relpath_files(exclude))
 
3278
                        exclude=tree.safe_relpath_files(exclude),
 
3279
                        lossy=lossy)
3274
3280
        except PointlessCommit:
3275
3281
            raise errors.BzrCommandError("No changes to commit."
3276
3282
                " Please 'bzr add' the files you want to commit, or use"