← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Aaron Bentley
  • Date: 2005-07-28 18:46:35 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050728184635-2461268fd9d1e8d1
Added default backups for merge-revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1420
1420
class cmd_merge_revert(Command):
1421
1421
    """Reverse all changes since the last commit.
1422
1422
 
1423
 
    Only versioned files are affected.
1424
 
 
1425
 
    TODO: Store backups of any files that will be reverted, so
1426
 
          that the revert can be undone.          
 
1423
    Only versioned files are affected.  By default, any files that are changed
 
1424
    will be backed up first.  Backup files have a '~' appended to their name.
1427
1425
    """
1428
 
    takes_options = ['revision']
 
1426
    takes_options = ['revision', 'no-backup']
1429
1427
 
1430
 
    def run(self, revision=None):
 
1428
    def run(self, revision=None, no_backup=False):
1431
1429
        from bzrlib.merge import merge
1432
1430
        if revision is None:
1433
1431
            revision = [-1]
1435
1433
            raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1436
1434
        merge(('.', revision[0]), parse_spec('.'),
1437
1435
              check_clean=False,
1438
 
              ignore_zero=True)
 
1436
              ignore_zero=True,
 
1437
              backup_files=not no_backup)
1439
1438
 
1440
1439
 
1441
1440
class cmd_assert_fail(Command):
1500
1499
    'update':                 None,
1501
1500
    'long':                   None,
1502
1501
    'root':                   str,
 
1502
    'no-backup':              None,
1503
1503
    }
1504
1504
 
1505
1505
SHORT_OPTIONS = {