/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

merge bzr.dev rev 4098

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
585
585
        finally:
586
586
            if base_tree is not None:
587
587
                base_tree.unlock()
588
 
        if not is_quiet() and len(added) > 0:
589
 
            self.outf.write('add completed\n')
590
588
        if len(ignored) > 0:
591
589
            if verbose:
592
590
                for glob in sorted(ignored.keys()):
2304
2302
        if revision is not None or tree is None:
2305
2303
            tree = _get_one_revision_tree('ls', revision, branch=branch)
2306
2304
 
 
2305
        apply_view = False
 
2306
        if isinstance(tree, WorkingTree) and tree.supports_views():
 
2307
            view_files = tree.views.lookup_view()
 
2308
            if view_files:
 
2309
                apply_view = True
 
2310
                view_str = views.view_display_str(view_files)
 
2311
                note("ignoring files outside view: %s" % view_str)
 
2312
 
2307
2313
        tree.lock_read()
2308
2314
        try:
2309
2315
            for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2315
2321
                        continue
2316
2322
                    if kind is not None and fkind != kind:
2317
2323
                        continue
 
2324
                    if apply_view:
 
2325
                        try:
 
2326
                            views.check_path_in_view(tree, fp)
 
2327
                        except errors.FileOutsideView:
 
2328
                            continue
2318
2329
                    kindch = entry.kind_character()
2319
2330
                    outstring = fp + kindch
2320
2331
                    if verbose:
2637
2648
    If author of the change is not the same person as the committer, you can
2638
2649
    specify the author's name using the --author option. The name should be
2639
2650
    in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
 
2651
    If there is more than one author of the change you can specify the option
 
2652
    multiple times, once for each author.
2640
2653
 
2641
2654
    A selected-file commit may fail in some cases where the committed
2642
2655
    tree would be invalid. Consider::
2686
2699
                    "files in the working tree."),
2687
2700
             ListOption('fixes', type=str,
2688
2701
                    help="Mark a bug as being fixed by this revision."),
2689
 
             Option('author', type=unicode,
 
2702
             ListOption('author', type=unicode,
2690
2703
                    help="Set the author's name, if it's different "
2691
2704
                         "from the committer."),
2692
2705
             Option('local',
2789
2802
                        specific_files=selected_list,
2790
2803
                        allow_pointless=unchanged, strict=strict, local=local,
2791
2804
                        reporter=None, verbose=verbose, revprops=properties,
2792
 
                        author=author,
 
2805
                        authors=author,
2793
2806
                        exclude=safe_relpath_files(tree, exclude))
2794
2807
        except PointlessCommit:
2795
2808
            # FIXME: This should really happen before the file is read in;
3371
3384
        allow_pending = True
3372
3385
        verified = 'inapplicable'
3373
3386
        tree = WorkingTree.open_containing(directory)[0]
 
3387
 
 
3388
        # die as quickly as possible if there are uncommitted changes
 
3389
        try:
 
3390
            basis_tree = tree.revision_tree(tree.last_revision())
 
3391
        except errors.NoSuchRevision:
 
3392
            basis_tree = tree.basis_tree()
 
3393
        changes = tree.changes_from(basis_tree)
 
3394
        if changes.has_changed():
 
3395
            raise errors.UncommittedChanges(tree)
 
3396
 
3374
3397
        view_info = _get_view_info_for_change_reporter(tree)
3375
3398
        change_reporter = delta._ChangeReporter(
3376
3399
            unversioned_filter=tree.is_ignored, view_info=view_info)
3429
3452
                                       merger.other_rev_id)
3430
3453
                    result.report(self.outf)
3431
3454
                    return 0
3432
 
            merger.check_basis(not force)
 
3455
            merger.check_basis(False)
3433
3456
            if preview:
3434
3457
                return self._do_preview(merger)
3435
3458
            else: