105
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = StringIO.StringIO( output )
108
buf = io.StringIO( output )
109
109
return buf.readline().rstrip()
129
129
raise RunTimeError(
130
130
'failed to parse bzr kind change: %s' % file )
131
131
file = matches.group( 1 )
132
if the.verbose >= 2: print "removing (kind changed): " + file
132
if the.verbose >= 2: print("removing (kind changed): " + file)
133
133
full_file = os.path.join( self.dir, file )
134
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
135
os.unlink( full_file )
153
153
raise RunTimeError(
154
154
'failed to parse bzr unknowns: %s' % file )
155
155
file = matches.group( 1 )
156
if the.verbose >= 2: print "removing (unknown): " + file
156
if the.verbose >= 2: print("removing (unknown): " + file)
157
157
full_file = os.path.join( self.dir, file )
158
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
159
os.unlink( full_file )
220
220
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
224
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
225
line = line.rstrip()
291
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
292
292
except self.VcsError as e:
293
if re.search( '/Working tree is out of date, please/', e.output ):
293
if re.search( 'Working tree is out of date', e.output ):
294
294
raise the.program.FatalError(
295
295
'you must update your files first.\n' +
296
296
'Hint: see "%s update --help"' % the.program.name );
299
301
def run( self, cmd ):
300
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
302
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
301
303
p = Popen( cmd, cwd = self.dir,
302
304
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
303
output = p.communicate()[ 0 ]
305
output = p.communicate()[ 0 ].decode()
304
306
if p.returncode > 0:
305
307
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
306
308
if the.verbose >= 2:
307
309
verbose_output = output.rstrip()
308
310
if len( verbose_output ):
309
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
311
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
313
315
def parse_file_blocks( self, output ):
316
buf = StringIO.StringIO( output )
318
buf = io.StringIO( output )
318
320
matches = re.search( '^([a-z ]+):$', line, re.I )