← 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-06-28 07:08:27 UTC
  • mfrom: (2553.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
(robertc) Show the names of commit hooks during commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
56
56
 
57
57
    See also bzr resolve.
58
58
    """
59
 
    takes_options = [
60
 
            Option('text',
61
 
                   help='List paths of files with text conflicts.'),
62
 
        ]
 
59
    takes_options = [Option('text', help='list text conflicts by pathname')]
63
60
 
64
61
    def run(self, text=False):
65
62
        from bzrlib.workingtree import WorkingTree
89
86
    """
90
87
    aliases = ['resolved']
91
88
    takes_args = ['file*']
92
 
    takes_options = [
93
 
            Option('all', help='Resolve all conflicts in this tree.'),
94
 
            ]
 
89
    takes_options = [Option('all', help='Resolve all conflicts in this tree')]
95
90
    def run(self, file_list=None, all=False):
96
91
        from bzrlib.workingtree import WorkingTree
97
92
        if all:
233
228
                    if e.errno != errno.ENOENT:
234
229
                        raise
235
230
 
236
 
    def select_conflicts(self, tree, paths, ignore_misses=False,
237
 
                         recurse=False):
 
231
    def select_conflicts(self, tree, paths, ignore_misses=False):
238
232
        """Select the conflicts associated with paths in a tree.
239
233
        
240
234
        File-ids are also used for this.
259
253
                if cpath in path_set:
260
254
                    selected = True
261
255
                    selected_paths.add(cpath)
262
 
                if recurse:
263
 
                    if osutils.is_inside_any(path_set, cpath):
264
 
                        selected = True
265
 
                        selected_paths.add(cpath)
266
 
 
267
256
            for key in ('file_id', 'conflict_file_id'):
268
257
                cfile_id = getattr(conflict, key, None)
269
258
                if cfile_id is None: