← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-27 01:54:40 UTC
  • mto: (1711.2.26 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1734.
  • Revision ID: john@arbash-meinel.com-20060527015440-1a10495d8e56ed5f
deprecating appendpath, it does exactly what pathjoin does

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
73
73
from bzrlib.merge import merge_inner, transform_tree
74
74
from bzrlib.osutils import (
75
75
                            abspath,
76
 
                            appendpath,
77
76
                            compact_date,
78
77
                            file_kind,
79
78
                            isdir,
714
713
                    continue
715
714
 
716
715
                # path within tree
717
 
                fp = appendpath(from_dir_relpath, f)
 
716
                fp = pathjoin(from_dir_relpath, f)
718
717
 
719
718
                # absolute path
720
 
                fap = appendpath(dp, f)
 
719
                fap = pathjoin(dp, f)
721
720
                
722
721
                f_ie = inv.get_child(from_dir_id, f)
723
722
                if f_ie:
803
802
            if f_id == None:
804
803
                raise BzrError("%r is not versioned" % f)
805
804
            name_tail = splitpath(f)[-1]
806
 
            dest_path = appendpath(to_name, name_tail)
 
805
            dest_path = pathjoin(to_name, name_tail)
807
806
            if self.has_filename(dest_path):
808
807
                raise BzrError("destination %r already exists" % dest_path)
809
808
            if f_id in to_idpath:
816
815
        try:
817
816
            for f in from_paths:
818
817
                name_tail = splitpath(f)[-1]
819
 
                dest_path = appendpath(to_name, name_tail)
 
818
                dest_path = pathjoin(to_name, name_tail)
820
819
                result.append((f, dest_path))
821
820
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
822
821
                try:
978
977
            
979
978
            fl.sort()
980
979
            for subf in fl:
981
 
                subp = appendpath(path, subf)
 
980
                subp = pathjoin(path, subf)
982
981
                yield subp
983
982
 
984
983
    def _translate_ignore_rule(self, rule):