← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shell.py

  • Committer: Aaron Bentley
  • Date: 2005-10-27 13:11:16 UTC
  • Revision ID: abentley@panoramicfeedback.com-20051027131116-730f882183c03fe1
Fixed dirctory completion in shell

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell.py
20
20
import terminal
21
21
import readline
22
22
import string
 
23
from itertools import chain
23
24
from bzrlib.errors import BzrError
24
25
from bzrlib.commands import get_cmd_object, get_all_cmds
25
26
 
170
171
                    arg = args.split()[-1]
171
172
                else:
172
173
                    arg = ""
173
 
                iter = cmdutil.iter_dir_completions(arg)
174
 
                iter = cmdutil.iter_munged_completions(iter, arg, text)
 
174
                iter = iter_dir_completions(arg)
 
175
                iter = iter_munged_completions(iter, arg, text)
175
176
                return list(iter)
176
177
            elif len(args)>0:
177
178
                arg = args.split()[-1]
178
 
                iter = cmdutil.iter_file_completions(arg)
179
 
                return list(cmdutil.iter_munged_completions(iter, arg, text))
 
179
                iter = iter_file_completions(arg)
 
180
                return list(iter_munged_completions(iter, arg, text))
180
181
            else:
181
182
                return self.completenames(text, line, begidx, endidx)
182
183
        except Exception, e:
207
208
        listingdir = os.path.expanduser(dir)
208
209
    else:
209
210
        listingdir = cwd
210
 
    for file in iter_combine([os.listdir(listingdir), extras]):
 
211
    for file in chain(os.listdir(listingdir), extras):
211
212
        if dir != "":
212
213
            userfile = dir+'/'+file
213
214
        else: