← 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 at utoronto
  • Date: 2005-07-30 01:44:38 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: aaron.bentley@utoronto.ca-20050730014438-40cca84c284159ce
replaced revert with merge-revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1418
1418
              check_clean=(not force), merge_type=merge_type)
1419
1419
 
1420
1420
 
1421
 
 
1422
1421
class cmd_revert(Command):
1423
 
    """Restore selected files from a previous revision.
1424
 
    """
1425
 
    takes_args = ['file+']
1426
 
    def run(self, file_list):
1427
 
        from bzrlib.branch import find_branch
1428
 
        
1429
 
        if not file_list:
1430
 
            file_list = ['.']
1431
 
            
1432
 
        b = find_branch(file_list[0])
1433
 
 
1434
 
        b.revert([b.relpath(f) for f in file_list])
1435
 
 
1436
 
 
1437
 
class cmd_merge_revert(Command):
1438
1422
    """Reverse all changes since the last commit.
1439
1423
 
1440
1424
    Only versioned files are affected.  Specify filenames to revert only 
1443
1427
    """
1444
1428
    takes_options = ['revision', 'no-backup']
1445
1429
    takes_args = ['file*']
 
1430
    aliases = ['merge-revert']
1446
1431
 
1447
1432
    def run(self, revision=None, no_backup=False, file_list=None):
1448
1433
        from bzrlib.merge import merge
1452
1437
        if revision is None:
1453
1438
            revision = [-1]
1454
1439
        elif len(revision) != 1:
1455
 
            raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
 
1440
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1456
1441
        merge(('.', revision[0]), parse_spec('.'),
1457
1442
              check_clean=False,
1458
1443
              ignore_zero=True,