← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Aaron Bentley
  • Date: 2007-08-21 01:32:29 UTC
  • mfrom: (2727 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2736.
  • Revision ID: aaron.bentley@utoronto.ca-20070821013229-miopsemz249tv0bl
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
57
57
from bzrlib import symbol_versioning
58
58
from bzrlib.symbol_versioning import (
59
59
    deprecated_function,
60
 
    zero_nine,
61
60
    )
62
61
from bzrlib.trace import mutter
63
62
 
768
767
    return pathjoin(*p)
769
768
 
770
769
 
771
 
@deprecated_function(zero_nine)
772
 
def appendpath(p1, p2):
773
 
    if p1 == '':
774
 
        return p2
775
 
    else:
776
 
        return pathjoin(p1, p2)
777
 
    
778
 
 
779
770
def split_lines(s):
780
771
    """Split s into lines, but without removing the newline characters."""
781
772
    lines = s.split('\n')
1089
1080
    
1090
1081
    The data yielded is of the form:
1091
1082
    ((directory-relpath, directory-path-from-top),
1092
 
    [(directory-relpath, basename, kind, lstat, path-from-top), ...]),
 
1083
    [(relpath, basename, kind, lstat, path-from-top), ...]),
1093
1084
     - directory-relpath is the relative path of the directory being returned
1094
1085
       with respect to top. prefix is prepended to this.
1095
1086
     - directory-path-from-root is the path including top for this directory.