39
self.ignored_files = [ '.bzr', '.bzrignore' ]
42
def has_authority( self ):
43
"""Check that the directory is under this VCS's control.
46
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
49
def expand_repo_url( self, url ):
50
"""Convert a simple hostname in to an URL that the VCS can use.
53
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
105
90
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = io.StringIO( output )
93
buf = StringIO.StringIO( output )
109
94
return buf.readline().rstrip()
129
114
raise RunTimeError(
130
115
'failed to parse bzr kind change: %s' % file )
131
116
file = matches.group( 1 )
132
if the.verbose >= 2: print("removing (kind changed): " + file)
117
if the.verbose >= 2: print "removing (kind changed): " + file
133
118
full_file = os.path.join( self.dir, file )
134
119
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
120
os.unlink( full_file )
153
138
raise RunTimeError(
154
139
'failed to parse bzr unknowns: %s' % file )
155
140
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
141
if the.verbose >= 2: print "removing (unknown): " + file
157
142
full_file = os.path.join( self.dir, file )
158
143
if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
144
os.unlink( full_file )
220
205
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = io.StringIO( output )
207
buf = StringIO.StringIO( output )
224
209
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
210
line = line.rstrip()
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
292
except self.VcsError as e:
293
if re.search( 'Working tree is out of date', e.output ):
294
raise the.program.FatalError(
295
'you must update your files first.\n' +
296
'Hint: see "%s update --help"' % the.program.name );
275
self.run( [ 'bzr', 'commit', '-m', '' ] )
301
278
def run( self, cmd ):
302
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
279
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
303
280
p = Popen( cmd, cwd = self.dir,
304
281
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
305
output = p.communicate()[ 0 ].decode()
282
output = p.communicate()[ 0 ]
306
283
if p.returncode > 0:
307
284
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
308
285
if the.verbose >= 2:
309
verbose_output = output.rstrip()
310
if len( verbose_output ):
311
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
286
print re.sub( '(^|\n)', '\\1 > ', output.rstrip() )
315
290
def parse_file_blocks( self, output ):
318
buf = io.StringIO( output )
293
buf = StringIO.StringIO( output )
320
295
matches = re.search( '^([a-z ]+):$', line, re.I )