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 )
60
45
# the directory shouldn't exist
61
46
os.mkdir( self.dir )
65
self.run( [ 'brz', 'init', '.' ] )
50
self.run( [ 'bzr', 'init', '.' ] )
66
51
except self.VcsError as e:
68
53
# attempt to clean-up dir
83
68
# the directory shouldn't exist
84
69
os.mkdir( self.dir )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
73
self.run( [ 'bzr', 'checkout', url, '.' ] )
89
74
except self.VcsError as e:
91
76
# attempt to clean-up dir
101
86
"""Obtain some sort of revision identifier
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
90
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = io.StringIO( output )
93
buf = StringIO.StringIO( output )
109
94
return buf.readline().rstrip()
119
output = self.run( [ 'brz', 'status' ] )
104
output = self.run( [ 'bzr', 'status' ] )
120
105
files = self.parse_file_blocks( output )
122
# remove kind changed files (or they can cause `brz revert` to break in
107
# remove kind changed files (or they can cause `bzr revert` to break in
123
108
# strange situations, like when a directory has been replaced with a
124
109
# symlink to a non-existant file)
125
110
if 'kind changed' in files:
126
111
for file in files[ 'kind changed' ]:
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
112
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
129
114
raise RunTimeError(
130
'failed to parse brz kind change: %s' % file )
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 )
139
124
raise RuntimeError( 'exotic file in repo: %s' % file )
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
127
self.run( [ 'bzr', 'revert', '--no-backup' ] )
145
output = self.run( [ 'brz', 'status' ] )
130
output = self.run( [ 'bzr', 'status' ] )
146
131
files = self.parse_file_blocks( output )
148
133
# remove unknown files
149
134
if 'unknown' in files:
150
135
for file in files[ 'unknown' ]:
151
matches = re.search( r'^(.+?)[/@+]?$', file )
154
'failed to parse brz unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
136
if the.verbose >= 2: print "removing (unknown): " + file
157
137
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
138
if os.path.isfile( full_file ):
159
139
os.unlink( full_file )
160
140
elif os.path.isdir( full_file ):
161
141
shutil.rmtree( full_file )
165
145
# if a revision identifier has been given, ensure we're updated to that
166
146
if revno is not None and self.get_revno() != revno:
169
self.run( [ 'brz', 'update', '-r', revno ] )
149
self.run( [ 'bzr', 'update', '-r', revno ] )
172
152
def update( self ):
178
# WARNING: the following might cause brz to ask for your ssh password more than
158
# WARNING: the following might cause bzr to ask for your ssh password more than
179
159
# once during an update!!!
182
162
# revno = self.get_revno()
184
164
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
165
# self.run( [ 'bzr', 'update', '-r', revno ] )
187
167
# # get log output
188
168
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
169
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
192
172
# keep_files = list()
214
194
# rename_from = rename_files[ rename_from ]
215
195
# rename_files[ line[ 4 : ] ] = rename_from
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
197
# bzr update properly
198
output = self.run( [ 'bzr', 'update' ] )
220
200
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = io.StringIO( output )
202
buf = StringIO.StringIO( output )
224
204
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
205
line = line.rstrip()
206
if the.verbose >= 2: print ' %s' % line
227
208
# renames show before and after file names
228
209
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
246
227
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
228
'failed to parse bzr update output line:\n%s' % line )
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
233
def has_changes( self ):
266
234
"""Check if the branch has any local modifications.
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
238
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
273
241
files = self.parse_file_blocks( output )
278
246
"""Return a list of files that have conflicts.
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
250
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
285
253
files = self.parse_file_blocks( output )
291
259
@param files a list of relative filenames
295
self.run( [ 'brz', 'add', '-N' ] + files )
263
self.run( [ 'bzr', 'add', '-N' ] + files )
298
266
def commit( self ):
299
267
"""Commit changes to the repo.
304
self.run( [ 'brz', '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 );
271
self.run( [ 'bzr', 'commit', '-m', '' ] )
314
274
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
275
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
316
276
p = Popen( cmd, cwd = self.dir,
317
277
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
278
output = p.communicate()[ 0 ]
319
279
if p.returncode > 0:
320
280
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
322
verbose_output = output.rstrip()
323
if len( verbose_output ):
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
328
284
def parse_file_blocks( self, output ):
331
buf = io.StringIO( output )
287
buf = StringIO.StringIO( output )
333
289
matches = re.search( '^([a-z ]+):$', line, re.I )