/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 22:26:17 UTC
  • Revision ID: tim@ed.am-20140405222617-4nf4alk3u2dxe430
removed reference to copy-in conflicts (which no longer exist)

Show diffs side-by-side

added added

removed removed

lib/stdhome/vcs/bzr.py
99
99
                revision.
100
100
                """
101
101
 
102
 
                # bzr st
103
 
                output = self.run( [ 'bzr', 'status' ] )
104
 
                files = self.parse_file_blocks( output )
105
 
 
106
 
                # remove kind changed files (or they can cause `bzr revert` to break in
107
 
                # strange situations, like when a directory has been replaced with a
108
 
                # symlink to a non-existant file)
109
 
                if 'kind changed' in files:
110
 
                        for file in files[ 'kind changed' ]:
111
 
                                matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
112
 
                                if not matches:
113
 
                                        raise RunTimeError(
114
 
                                                'failed to parse bzr kind change: %s' % file )
115
 
                                file = matches.group( 1 )
116
 
                                if the.verbose > 1: print "removing (kind changed): " + file
117
 
                                full_file = os.path.join( self.dir, file )
118
 
                                if os.path.isfile( full_file ) or os.path.islink( full_file ):
119
 
                                        os.unlink( full_file )
120
 
                                elif os.path.isdir( full_file ):
121
 
                                        shutil.rmtree( full_file )
122
 
                                else:
123
 
                                        raise RuntimeError( 'exotic file in repo: %s' % file )
124
 
 
125
 
                # bzr revert
 
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' ] )
126
105
                self.run( [ 'bzr', 'revert', '--no-backup' ] )
127
106
 
128
107
                # bzr st
132
111
                # remove unknown files
133
112
                if 'unknown' in files:
134
113
                        for file in files[ 'unknown' ]:
135
 
                                if the.verbose > 1: print "removing (unknown): " + file
 
114
                                if the.verbose > 1: print "removing unknown: " + file
136
115
                                full_file = os.path.join( self.dir, file )
137
116
                                if os.path.isfile( full_file ):
138
117
                                        os.unlink( full_file )
224
203
                                continue
225
204
 
226
205
                        raise RuntimeError(
227
 
                                'failed to parse bzr update output line:\n%s' % line )
 
206
                                'failed to parse bzr update output line:\n%' % line )
228
207
 
229
208
                return files
230
209
 
279
258
                                                res[ current ] = list()
280
259
                                        res[ current ].append( matches.group( 1 ) )
281
260
                                        continue
282
 
                        if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
 
261
                        if re.search( '^[0-9]+ shelf exists', line ): continue
283
262
                        if re.search( '^working tree is out of date', line ): continue
284
263
                        raise self.ParseError( "unrecognised line: %s" % line )
285
264
                return res