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 ):
59
65
# the directory shouldn't exist
60
66
os.mkdir( self.dir )
64
self.run( [ 'bzr', 'init', '.' ] )
70
self.run( [ 'brz', 'init', '.' ] )
65
71
except self.VcsError as e:
67
73
# attempt to clean-up dir
82
88
# the directory shouldn't exist
83
89
os.mkdir( self.dir )
87
self.run( [ 'bzr', 'checkout', url, '.' ] )
93
self.run( [ 'brz', 'checkout', url, '.' ] )
88
94
except self.VcsError as e:
90
96
# attempt to clean-up dir
100
106
"""Obtain some sort of revision identifier
104
output = self.run( [ 'bzr', 'revno', '--tree' ] )
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
107
buf = StringIO.StringIO( output )
113
buf = io.StringIO( output )
108
114
return buf.readline().rstrip()
118
output = self.run( [ 'bzr', 'status' ] )
124
output = self.run( [ 'brz', 'status' ] )
119
125
files = self.parse_file_blocks( output )
121
# 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
122
128
# strange situations, like when a directory has been replaced with a
123
129
# symlink to a non-existant file)
124
130
if 'kind changed' in files:
126
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
128
134
raise RunTimeError(
129
'failed to parse bzr kind change: %s' % file )
135
'failed to parse brz kind change: %s' % file )
130
136
file = matches.group( 1 )
131
if the.verbose >= 2: print "removing (kind changed): " + file
137
if the.verbose >= 2: print("removing (kind changed): " + file)
132
138
full_file = os.path.join( self.dir, file )
133
139
if os.path.isfile( full_file ) or os.path.islink( full_file ):
134
140
os.unlink( full_file )
138
144
raise RuntimeError( 'exotic file in repo: %s' % file )
141
self.run( [ 'bzr', 'revert', '--no-backup' ] )
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
144
output = self.run( [ 'bzr', 'status' ] )
150
output = self.run( [ 'brz', 'status' ] )
145
151
files = self.parse_file_blocks( output )
147
153
# remove unknown files
150
156
matches = re.search( r'^(.+?)[/@+]?$', file )
152
158
raise RunTimeError(
153
'failed to parse bzr unknowns: %s' % file )
159
'failed to parse brz unknowns: %s' % file )
154
160
file = matches.group( 1 )
155
if the.verbose >= 2: print "removing (unknown): " + file
161
if the.verbose >= 2: print("removing (unknown): " + file)
156
162
full_file = os.path.join( self.dir, file )
157
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
158
164
os.unlink( full_file )
164
170
# if a revision identifier has been given, ensure we're updated to that
165
171
if revno is not None and self.get_revno() != revno:
168
self.run( [ 'bzr', 'update', '-r', revno ] )
174
self.run( [ 'brz', 'update', '-r', revno ] )
171
177
def update( self ):
177
# 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
178
184
# once during an update!!!
181
187
# revno = self.get_revno()
183
189
# # update to current revision (pull in history without updating tree)
184
# self.run( [ 'bzr', 'update', '-r', revno ] )
190
# self.run( [ 'brz', 'update', '-r', revno ] )
186
192
# # get log output
187
193
# next_revno = str( int( revno ) + 1 )
188
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
191
197
# keep_files = list()
213
219
# rename_from = rename_files[ rename_from ]
214
220
# rename_files[ line[ 4 : ] ] = rename_from
216
# bzr update properly
217
output = self.run( [ 'bzr', 'update' ] )
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
219
225
# parse output (see logic in report() in bzrlib/delta.py)
221
buf = StringIO.StringIO( output )
227
buf = io.StringIO( output )
223
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
224
230
line = line.rstrip()
245
251
raise RuntimeError(
246
'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 )
251
270
def has_changes( self ):
252
271
"""Check if the branch has any local modifications.
256
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
259
278
files = self.parse_file_blocks( output )
264
283
"""Return a list of files that have conflicts.
268
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
271
290
files = self.parse_file_blocks( output )
277
296
@param files a list of relative filenames
281
self.run( [ 'bzr', 'add', '-N' ] + files )
300
self.run( [ 'brz', 'add', '-N' ] + files )
284
303
def commit( self ):
285
304
"""Commit changes to the repo.
289
self.run( [ 'bzr', 'commit', '-m', '' ] )
309
self.run( [ 'brz', 'commit', '-m', '' ] )
310
except self.VcsError as e:
311
if re.search( 'Working tree is out of date', e.output ):
312
raise the.program.FatalError(
313
'you must update your files first.\n' +
314
'Hint: see "%s update --help"' % the.program.name );
292
319
def run( self, cmd ):
293
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
294
321
p = Popen( cmd, cwd = self.dir,
295
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
296
output = p.communicate()[ 0 ]
323
output = p.communicate()[ 0 ].decode()
297
324
if p.returncode > 0:
298
325
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
299
326
if the.verbose >= 2:
300
327
verbose_output = output.rstrip()
301
328
if len( verbose_output ):
302
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
329
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
306
333
def parse_file_blocks( self, output ):
309
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
311
338
matches = re.search( '^([a-z ]+):$', line, re.I )