/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/vcs/bzr.py

  • Committer: Tim Marston
  • Date: 2014-04-05 19:20:06 UTC
  • Revision ID: tim@ed.am-20140405192006-fv0toip4b8m5pc88
fixed bug preventing skipping of subdirectories in walker; also added
walker.File.__str__()

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/vcs/bzr.py
99
99
                revision.
100
100
                """
101
101
 
102
 
                # bzr revert (run twice to handle a bug in bzr where reverting a
103
 
                # directory from a symlink can cause conflicts during initial revert)
104
 
                self.run( [ 'bzr', 'revert', '--no-backup' ] )
 
102
                # bzr revert
105
103
                self.run( [ 'bzr', 'revert', '--no-backup' ] )
106
104
 
107
105
                # bzr st
111
109
                # remove unknown files
112
110
                if 'unknown' in files:
113
111
                        for file in files[ 'unknown' ]:
114
 
                                if the.verbose > 1: print "removing unknown: " + file
115
112
                                full_file = os.path.join( self.dir, file )
116
113
                                if os.path.isfile( full_file ):
117
114
                                        os.unlink( full_file )
118
 
                                elif os.path.isdir( full_file ):
 
115
                                elif os.full_file.isdir( full_file ):
119
116
                                        shutil.rmtree( full_file )
120
117
                                else:
121
118
                                        raise RuntimeError( 'exotic file in repo: %s' % file )