/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:
57
57
                                        raise the.program.FatalError(
58
58
                                                'invalid repository name: ' + optarg )
59
59
                                the.repo = optarg
 
60
                        elif opt in [ '--verbose', '-v' ]:
 
61
                                the.verbose += 1
60
62
                        elif opt == "--help":
61
63
                                self.print_help()
62
64
 
107
109
        def expand_home_dir_files( files ):
108
110
                """Returns a unique, sorted list of relative filenames, calculated from the list
109
111
                provided, which is made up from individual files and directories
110
 
                relative to the CWD.  Directories and are not recursed in to, but
111
 
                leading path components are also returned.  Specified filenames must
112
 
                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).
113
115
 
114
116
                """
115
117
 
135
137
                                raise the.program.FatalError(
136
138
                                        'not found in home directory: %s' % rel_file )
137
139
 
138
 
                        # append path parts
139
 
                        path = rel_file
140
 
                        while True:
141
 
                                path, dummy = os.path.split( path )
142
 
                                if len( path ): ret.add( path )
143
 
                                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
144
146
 
145
147
                        # append the file or directory
146
148
                        ret.add( rel_file )