19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import subprocess, os, re, shutil
23
27
from subprocess import Popen
26
29
from stdhome import the
32
37
def __init__( self, dir ):
60
65
# the directory shouldn't exist
61
66
os.mkdir( self.dir )
65
self.run( [ 'bzr', 'init', '.' ] )
70
self.run( [ 'brz', 'init', '.' ] )
66
71
except self.VcsError as e:
68
73
# attempt to clean-up dir
83
88
# the directory shouldn't exist
84
89
os.mkdir( self.dir )
88
self.run( [ 'bzr', 'checkout', url, '.' ] )
93
self.run( [ 'brz', 'checkout', url, '.' ] )
89
94
except self.VcsError as e:
91
96
# attempt to clean-up dir
101
106
"""Obtain some sort of revision identifier
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
108
buf = StringIO.StringIO( output )
113
buf = io.StringIO( output )
109
114
return buf.readline().rstrip()
119
output = self.run( [ 'bzr', 'status' ] )
124
output = self.run( [ 'brz', 'status' ] )
120
125
files = self.parse_file_blocks( output )
122
# remove kind changed files (or they can cause `bzr revert` to break in
127
# remove kind changed files (or they can cause `brz revert` to break in
123
128
# strange situations, like when a directory has been replaced with a
124
129
# symlink to a non-existant file)
125
130
if 'kind changed' in files:
127
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
129
134
raise RunTimeError(
130
'failed to parse bzr kind change: %s' % file )
135
'failed to parse brz kind change: %s' % file )
131
136
file = matches.group( 1 )
132
if the.verbose >= 2: print "removing (kind changed): " + file
137
if the.verbose >= 2: print("removing (kind changed): " + file)
133
138
full_file = os.path.join( self.dir, file )
134
139
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
140
os.unlink( full_file )
139
144
raise RuntimeError( 'exotic file in repo: %s' % file )
142
self.run( [ 'bzr', 'revert', '--no-backup' ] )
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
145
output = self.run( [ 'bzr', 'status' ] )
150
output = self.run( [ 'brz', 'status' ] )
146
151
files = self.parse_file_blocks( output )
148
153
# remove unknown files
151
156
matches = re.search( r'^(.+?)[/@+]?$', file )
153
158
raise RunTimeError(
154
'failed to parse bzr unknowns: %s' % file )
159
'failed to parse brz unknowns: %s' % file )
155
160
file = matches.group( 1 )
156
if the.verbose >= 2: print "removing (unknown): " + file
161
if the.verbose >= 2: print("removing (unknown): " + file)
157
162
full_file = os.path.join( self.dir, file )
158
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
164
os.unlink( full_file )
165
170
# if a revision identifier has been given, ensure we're updated to that
166
171
if revno is not None and self.get_revno() != revno:
169
self.run( [ 'bzr', 'update', '-r', revno ] )
174
self.run( [ 'brz', 'update', '-r', revno ] )
172
177
def update( self ):
178
# WARNING: the following might cause bzr to ask for your ssh password more than
183
# WARNING: the following might cause brz to ask for your ssh password more than
179
184
# once during an update!!!
182
187
# revno = self.get_revno()
184
189
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'bzr', 'update', '-r', revno ] )
190
# self.run( [ 'brz', 'update', '-r', revno ] )
187
192
# # get log output
188
193
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
192
197
# keep_files = list()
214
219
# rename_from = rename_files[ rename_from ]
215
220
# rename_files[ line[ 4 : ] ] = rename_from
217
# bzr update properly
218
output = self.run( [ 'bzr', 'update' ] )
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
220
225
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = StringIO.StringIO( output )
227
buf = io.StringIO( output )
224
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
230
line = line.rstrip()
246
251
raise RuntimeError(
247
'failed to parse bzr update output line:\n%s' % line )
252
'failed to parse brz update output line:\n%s' % line )
258
"""Get a list of any local modifications. This method returns a list of files
264
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
267
return self.parse_file_blocks( output )
252
270
def has_changes( self ):
253
271
"""Check if the branch has any local modifications.
257
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
260
278
files = self.parse_file_blocks( output )
265
283
"""Return a list of files that have conflicts.
269
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
272
290
files = self.parse_file_blocks( output )
278
296
@param files a list of relative filenames
282
self.run( [ 'bzr', 'add', '-N' ] + files )
300
self.run( [ 'brz', 'add', '-N' ] + files )
285
303
def commit( self ):
286
304
"""Commit changes to the repo.
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
309
self.run( [ 'brz', 'commit', '-m', '' ] )
292
310
except self.VcsError as e:
293
if re.search( '/Working tree is out of date, please/', e.output ):
311
if re.search( 'Working tree is out of date', e.output ):
294
312
raise the.program.FatalError(
295
313
'you must update your files first.\n' +
296
314
'Hint: see "%s update --help"' % the.program.name );
299
319
def run( self, cmd ):
300
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
301
321
p = Popen( cmd, cwd = self.dir,
302
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
303
output = p.communicate()[ 0 ]
323
output = p.communicate()[ 0 ].decode()
304
324
if p.returncode > 0:
305
325
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
306
326
if the.verbose >= 2:
307
327
verbose_output = output.rstrip()
308
328
if len( verbose_output ):
309
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
329
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
313
333
def parse_file_blocks( self, output ):
316
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
318
338
matches = re.search( '^([a-z ]+):$', line, re.I )