35
35
@param dir the fully-qualified directory to work in.
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 )
85
101
"""Obtain some sort of revision identifier
89
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
92
buf = StringIO.StringIO( output )
108
buf = io.StringIO( output )
93
109
return buf.readline().rstrip()
108
124
# symlink to a non-existant file)
109
125
if 'kind changed' in files:
110
126
for file in files[ 'kind changed' ]:
111
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
113
129
raise RunTimeError(
114
130
'failed to parse bzr kind change: %s' % file )
115
131
file = matches.group( 1 )
116
if the.verbose >= 2: print "removing (kind changed): " + file
132
if the.verbose >= 2: print("removing (kind changed): " + file)
117
133
full_file = os.path.join( self.dir, file )
118
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
119
135
os.unlink( full_file )
132
148
# remove unknown files
133
149
if 'unknown' in files:
134
150
for file in files[ 'unknown' ]:
135
if the.verbose >= 2: print "removing (unknown): " + file
151
matches = re.search( r'^(.+?)[/@+]?$', file )
154
'failed to parse bzr unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
136
157
full_file = os.path.join( self.dir, file )
137
if os.path.isfile( full_file ):
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
138
159
os.unlink( full_file )
139
160
elif os.path.isdir( full_file ):
140
161
shutil.rmtree( full_file )
142
163
raise RuntimeError( 'exotic file in repo: %s' % file )
144
# if a revision identifyer has been given, update to that
145
if revno is not None:
165
# if a revision identifier has been given, ensure we're updated to that
166
if revno is not None and self.get_revno() != revno:
148
169
self.run( [ 'bzr', 'update', '-r', revno ] )
199
220
# parse output (see logic in report() in bzrlib/delta.py)
201
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
203
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
204
225
line = line.rstrip()
205
if the.verbose >= 2: print ' %s' % line
207
227
# renames show before and after file names
208
228
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
253
273
return files['conflicts'] if 'conflicts' in files else None
276
def add( self, files ):
277
"""Make sure files are added to version control.
278
@param files a list of relative filenames
282
self.run( [ 'bzr', 'add', '-N' ] + files )
286
"""Commit changes to the repo.
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 );
256
301
def run( self, cmd ):
257
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
302
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
258
303
p = Popen( cmd, cwd = self.dir,
259
304
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
260
output = p.communicate()[ 0 ]
305
output = p.communicate()[ 0 ].decode()
261
306
if p.returncode > 0:
262
307
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
309
verbose_output = output.rstrip()
310
if len( verbose_output ):
311
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
266
315
def parse_file_blocks( self, output ):
269
buf = StringIO.StringIO( output )
318
buf = io.StringIO( output )
271
320
matches = re.search( '^([a-z ]+):$', line, re.I )