60
59
# the directory shouldn't exist
61
60
os.mkdir( self.dir )
65
self.run( [ 'brz', 'init', '.' ] )
64
self.run( [ 'bzr', 'init', '.' ] )
66
65
except self.VcsError as e:
68
67
# attempt to clean-up dir
83
82
# the directory shouldn't exist
84
83
os.mkdir( self.dir )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
87
self.run( [ 'bzr', 'checkout', url, '.' ] )
89
88
except self.VcsError as e:
91
90
# attempt to clean-up dir
101
100
"""Obtain some sort of revision identifier
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
104
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = io.StringIO( output )
107
buf = StringIO.StringIO( output )
109
108
return buf.readline().rstrip()
119
output = self.run( [ 'brz', 'status' ] )
118
output = self.run( [ 'bzr', 'status' ] )
120
119
files = self.parse_file_blocks( output )
122
# remove kind changed files (or they can cause `brz revert` to break in
121
# remove kind changed files (or they can cause `bzr revert` to break in
123
122
# strange situations, like when a directory has been replaced with a
124
123
# symlink to a non-existant file)
125
124
if 'kind changed' in files:
127
126
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
129
128
raise RunTimeError(
130
'failed to parse brz kind change: %s' % file )
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 )
139
138
raise RuntimeError( 'exotic file in repo: %s' % file )
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
141
self.run( [ 'bzr', 'revert', '--no-backup' ] )
145
output = self.run( [ 'brz', 'status' ] )
144
output = self.run( [ 'bzr', 'status' ] )
146
145
files = self.parse_file_blocks( output )
148
147
# remove unknown files
151
150
matches = re.search( r'^(.+?)[/@+]?$', file )
153
152
raise RunTimeError(
154
'failed to parse brz unknowns: %s' % file )
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 )
165
164
# if a revision identifier has been given, ensure we're updated to that
166
165
if revno is not None and self.get_revno() != revno:
169
self.run( [ 'brz', 'update', '-r', revno ] )
168
self.run( [ 'bzr', 'update', '-r', revno ] )
172
171
def update( self ):
178
# WARNING: the following might cause brz to ask for your ssh password more than
177
# WARNING: the following might cause bzr to ask for your ssh password more than
179
178
# once during an update!!!
182
181
# revno = self.get_revno()
184
183
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
184
# self.run( [ 'bzr', 'update', '-r', revno ] )
187
186
# # get log output
188
187
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
188
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
192
191
# keep_files = list()
214
213
# rename_from = rename_files[ rename_from ]
215
214
# rename_files[ line[ 4 : ] ] = rename_from
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
216
# bzr update properly
217
output = self.run( [ 'bzr', 'update' ] )
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()
246
245
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
246
'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
251
def has_changes( self ):
266
252
"""Check if the branch has any local modifications.
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
256
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
273
259
files = self.parse_file_blocks( output )
278
264
"""Return a list of files that have conflicts.
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
268
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
285
271
files = self.parse_file_blocks( output )
291
277
@param files a list of relative filenames
295
self.run( [ 'brz', 'add', '-N' ] + files )
281
self.run( [ 'bzr', 'add', '-N' ] + files )
298
284
def commit( self ):
299
285
"""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 );
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
300
verbose_output = output.rstrip()
323
301
if len( verbose_output ):
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
302
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
328
306
def parse_file_blocks( self, output ):
331
buf = io.StringIO( output )
309
buf = StringIO.StringIO( output )
333
311
matches = re.search( '^([a-z ]+):$', line, re.I )