← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-16 01:50:48 UTC
  • mfrom: (2078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016015048-0f22df07e38093da
[merge] bzr.dev 2078

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1291
1291
        for file_id in inv:
1292
1292
            if file_id in basis_inv:
1293
1293
                continue
 
1294
            if inv.is_root(file_id) and len(basis_inv) == 0:
 
1295
                continue
1294
1296
            path = inv.id2path(file_id)
1295
1297
            if not os.access(osutils.abspath(path), os.F_OK):
1296
1298
                continue
1503
1505
            tree = tree.branch.repository.revision_tree(
1504
1506
                revision[0].in_history(tree.branch).rev_id)
1505
1507
 
1506
 
        for fp, fc, kind, fid, entry in tree.list_files():
 
1508
        for fp, fc, kind, fid, entry in tree.list_files(include_root=False):
1507
1509
            if fp.startswith(relpath):
1508
1510
                fp = fp[len(relpath):]
1509
1511
                if non_recursive and '/' in fp:
2855
2857
            url = 'readonly+' + url
2856
2858
        t = get_transport(url)
2857
2859
        if inet:
2858
 
            server = smart.SmartStreamServer(sys.stdin, sys.stdout, t)
 
2860
            server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
2859
2861
        elif port is not None:
2860
2862
            if ':' in port:
2861
2863
                host, port = port.split(':')