← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-29 05:04:00 UTC
  • mfrom: (2947.1.3 pack)
  • Revision ID: pqm@pqm.ubuntu.com-20071029050400-j2jmz8smj2yecfrr
(robertc) Fix pack-repository to support get_parents calls as the first call on a repository, and fix full-branch push/pull performance to not suck terribly. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2005 Aaron Bentley, Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
117
117
                resolve(tree, file_list)
118
118
 
119
119
 
120
 
def resolve(tree, paths=None, ignore_misses=False, recursive=False):
121
 
    """Resolve some or all of the conflicts in a working tree.
122
 
 
123
 
    :param paths: If None, resolve all conflicts.  Otherwise, select only
124
 
        specified conflicts.
125
 
    :param recursive: If True, then elements of paths which are directories
126
 
        have all their children resolved, etc.  When invoked as part of
127
 
        recursive commands like revert, this should be True.  For commands
128
 
        or applications wishing finer-grained control, like the resolve
129
 
        command, this should be False.
130
 
    :ignore_misses: If False, warnings will be printed if the supplied paths
131
 
        do not have conflicts.
132
 
    """
 
120
def resolve(tree, paths=None, ignore_misses=False):
133
121
    tree.lock_tree_write()
134
122
    try:
135
123
        tree_conflicts = tree.conflicts()
138
126
            selected_conflicts = tree_conflicts
139
127
        else:
140
128
            new_conflicts, selected_conflicts = \
141
 
                tree_conflicts.select_conflicts(tree, paths, ignore_misses,
142
 
                    recursive)
 
129
                tree_conflicts.select_conflicts(tree, paths, ignore_misses)
143
130
        try:
144
131
            tree.set_conflicts(new_conflicts)
145
132
        except errors.UnsupportedOperation:
515
502
             "%(action)s."
516
503
 
517
504
 
518
 
class NonDirectoryParent(HandledConflict):
519
 
    """An attempt to add files to a directory that is not a director or
520
 
    an attempt to change the kind of a directory with files.
521
 
    """
522
 
 
523
 
    typestring = 'non-directory parent'
524
 
 
525
 
    format = "Conflict: %(path)s is not a directory, but has files in it."\
526
 
             "  %(action)s."
527
 
 
528
505
ctype = {}
529
506
 
530
507
 
537
514
 
538
515
register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,
539
516
               DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,
540
 
               DeletingParent, NonDirectoryParent)
 
517
               DeletingParent,)