/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
699
699
 
700
700
    def run(self, dir_list):
701
701
        for d in dir_list:
702
 
            os.mkdir(d)
703
702
            wt, dd = WorkingTree.open_containing(d)
704
 
            wt.add([dd])
705
 
            self.outf.write('added %s\n' % d)
 
703
            base = os.path.dirname(dd)
 
704
            id = wt.path2id(base)
 
705
            if id != None:
 
706
                os.mkdir(d)
 
707
                wt.add([dd])
 
708
                self.outf.write('added %s\n' % d)
 
709
            else:
 
710
                raise errors.NotVersionedError(path=base)
706
711
 
707
712
 
708
713
class cmd_relpath(Command):
3169
3174
            raise errors.BzrCommandError("Commit refused because there are"
3170
3175
                              " unknown files in the working tree.")
3171
3176
        except errors.BoundBranchOutOfDate, e:
3172
 
            raise errors.BzrCommandError(str(e) + "\n"
3173
 
            'To commit to master branch, run update and then commit.\n'
3174
 
            'You can also pass --local to commit to continue working '
3175
 
            'disconnected.')
 
3177
            e.extra_help = ("\n"
 
3178
                'To commit to master branch, run update and then commit.\n'
 
3179
                'You can also pass --local to commit to continue working '
 
3180
                'disconnected.')
 
3181
            raise
3176
3182
 
3177
3183
 
3178
3184
class cmd_check(Command):