105
104
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = io.StringIO( output )
107
buf = StringIO.StringIO( output )
109
108
return buf.readline().rstrip()
129
128
raise RunTimeError(
130
129
'failed to parse bzr kind change: %s' % file )
131
130
file = matches.group( 1 )
132
if the.verbose >= 2: print("removing (kind changed): " + file)
131
if the.verbose >= 2: print "removing (kind changed): " + file
133
132
full_file = os.path.join( self.dir, file )
134
133
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
134
os.unlink( full_file )
153
152
raise RunTimeError(
154
153
'failed to parse bzr unknowns: %s' % file )
155
154
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
155
if the.verbose >= 2: print "removing (unknown): " + file
157
156
full_file = os.path.join( self.dir, file )
158
157
if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
158
os.unlink( full_file )
220
219
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = io.StringIO( output )
221
buf = StringIO.StringIO( output )
224
223
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
224
line = line.rstrip()
253
"""Get a list of any local modifications. This method returns a list of files
259
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
262
return self.parse_file_blocks( output )
265
251
def has_changes( self ):
266
252
"""Check if the branch has any local modifications.
304
self.run( [ 'bzr', 'commit', '-m', '' ] )
305
except self.VcsError as e:
306
if re.search( 'Working tree is out of date', e.output ):
307
raise the.program.FatalError(
308
'you must update your files first.\n' +
309
'Hint: see "%s update --help"' % the.program.name );
289
self.run( [ 'bzr', 'commit', '-m', '' ] )
314
292
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
293
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
316
294
p = Popen( cmd, cwd = self.dir,
317
295
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
296
output = p.communicate()[ 0 ]
319
297
if p.returncode > 0:
320
298
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
321
299
if the.verbose >= 2:
322
verbose_output = output.rstrip()
323
if len( verbose_output ):
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
300
print re.sub( '(^|\n)', '\\1 > ', output.rstrip() )
328
304
def parse_file_blocks( self, output ):
331
buf = io.StringIO( output )
307
buf = StringIO.StringIO( output )
333
309
matches = re.search( '^([a-z ]+):$', line, re.I )