/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/add.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

Lines of Context:
lib/stdhome/command/add.py
109
109
        def expand_home_dir_files( files ):
110
110
                """Returns a unique, sorted list of relative filenames, calculated from the list
111
111
                provided, which is made up from individual files and directories
112
 
                relative to the CWD.  Directories and are not recursed in to, but
113
 
                leading path components are also returned.  Specified filenames must
114
 
                exist in the home directory (although they may not exist in the repo).
 
112
                relative to the CWD.  Directories are not recursed in to, and leading
 
113
                path components are not returned.  Specified filenames must exist in the
 
114
                home directory (although they may not exist in the repo).
115
115
 
116
116
                """
117
117
 
137
137
                                raise the.program.FatalError(
138
138
                                        'not found in home directory: %s' % rel_file )
139
139
 
140
 
                        # append path parts
141
 
                        path = rel_file
142
 
                        while True:
143
 
                                path, dummy = os.path.split( path )
144
 
                                if len( path ): ret.add( path )
145
 
                                else: break
 
140
                        # # append path parts
 
141
                        # path = rel_file
 
142
                        # while True:
 
143
                        #       path, dummy = os.path.split( path )
 
144
                        #       if len( path ): ret.add( path )
 
145
                        #       else: break
146
146
 
147
147
                        # append the file or directory
148
148
                        ret.add( rel_file )