← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-20 02:51:29 UTC
  • mfrom: (1662.1.16 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
(mbp) #36963, #3619, #39657, other cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
328
328
        raise errors.PathsNotVersionedError(sorted(unversioned))
329
329
    
330
330
 
 
331
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
332
    """Complain if paths are not in either inventory or tree.
 
333
 
 
334
    It's OK with the files exist in either tree's inventory, or 
 
335
    if they exist in the tree but are not versioned.
 
336
    
 
337
    This can be used by operations such as bzr status that can accept
 
338
    unknown or ignored files.
 
339
    """
 
340
    mutter("check paths: %r", paths)
 
341
    if not paths:
 
342
        return
 
343
    s = old_tree.filter_unversioned_files(paths)
 
344
    s = new_tree.filter_unversioned_files(s)
 
345
    s = [path for path in s if not new_tree.has_filename(path)]
 
346
    if s:
 
347
        raise errors.PathsDoNotExist(sorted(s))
 
348
 
 
349
 
331
350
def get_prop_change(meta_modified):
332
351
    if meta_modified:
333
352
        return " (properties changed)"