/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/command/command.py

  • Committer: Tim Marston
  • Date: 2016-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/command.py
50
50
                        # check the file is in the home directory
51
51
                        if abs_file[ : len( home_dir_prefix ) ] != home_dir_prefix:
52
52
                                raise the.program.FatalError(
53
 
                                        'not in home directory: %s' % abs_file )
 
53
                                        'not under home directory: %s' % abs_file )
54
54
 
55
55
                        # relative file
56
56
                        rel_file = abs_file[ len( home_dir_prefix ) : ]
62
62
                                        'not managed by stdhome: %s' % rel_file )
63
63
 
64
64
                        # append the file or directory tree
65
 
                        ret.extend( Walker.generate_walk_list(
66
 
                                the.repo.full_dir, rel_file ) )
 
65
                        ret.extend( Walker.generate_walk_list( rel_file ) )
67
66
 
68
67
                return sorted( set ( ret ) )