To get this branch, use:
bzr branch
http://bzr.ed.am/stdhome
« back to all changes in this revision
Viewing changes to lib/stdhome/vcs/brz.py
- browse files at revision 94
- compare with another revision
- download diff
- download tarball
- view history from revision 94
- Committer: Tim Marston
- Date: 2021-09-01 12:28:59 UTC
- Revision ID: tim@ed.am-20210901122859-tkvlmry7hef8ahwc
moved bzr -> brz
- files added:
- lib/stdhome/command/stage_add.py
- files renamed:
- tools/ => dev/
- tools/dev-environment => dev/dev
- tools/dev-reset => dev/reset
- tools/TODO => dev/todo.org
- lib/stdhome/vcs/bzr.py => lib/stdhome/vcs/brz.py
- files modified:
- configure.ac
added
removed
lib/stdhome/vcs/brz.py
1
# bzr.py
1
# brz.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
21
21
22
22
import subprocess, os, re, shutil
23
23
from subprocess import Popen
24
import StringIO
25
from vcs import Vcs
24
import io
25
from .vcs import Vcs
26
26
from stdhome import the
27
27
28
28
36
36
"""
37
37
38
38
self.dir = dir
39
self.ignored_files = [ '.bzr', '.bzrignore' ]
39
40
40
41
41
42
def has_authority( self ):
59
60
# the directory shouldn't exist
60
61
os.mkdir( self.dir )
61
62
62
# bzr init
63
# brz init
63
64
try:
64
self.run( [ 'bzr', 'init', '.' ] )
65
self.run( [ 'brz', 'init', '.' ] )
65
66
except self.VcsError as e:
66
67
67
68
# attempt to clean-up dir
82
83
# the directory shouldn't exist
83
84
os.mkdir( self.dir )
84
85
85
# bzr co
86
# brz co
86
87
try:
87
self.run( [ 'bzr', 'checkout', url, '.' ] )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
88
89
except self.VcsError as e:
89
90
90
91
# attempt to clean-up dir
100
101
"""Obtain some sort of revision identifier
101
102
"""
102
103
103
# bzr revno
104
output = self.run( [ 'bzr', 'revno', '--tree' ] )
104
# brz revno
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
105
106
106
107
# parse revno
107
buf = StringIO.StringIO( output )
108
buf = io.StringIO( output )
108
109
return buf.readline().rstrip()
109
110
110
111
114
115
revision.
115
116
"""
116
117
117
# bzr st
118
output = self.run( [ 'bzr', 'status' ] )
118
# brz st
119
output = self.run( [ 'brz', 'status' ] )
119
120
files = self.parse_file_blocks( output )
120
121
121
# remove kind changed files (or they can cause `bzr revert` to break in
122
# remove kind changed files (or they can cause `brz revert` to break in
122
123
# strange situations, like when a directory has been replaced with a
123
124
# symlink to a non-existant file)
124
125
if 'kind changed' in files:
126
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
127
128
if not matches:
128
129
raise RunTimeError(
129
'failed to parse bzr kind change: %s' % file )
130
'failed to parse brz kind change: %s' % file )
130
131
file = matches.group( 1 )
131
if the.verbose >= 2: print "removing (kind changed): " + file
132
if the.verbose >= 2: print("removing (kind changed): " + file)
132
133
full_file = os.path.join( self.dir, file )
133
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
134
135
os.unlink( full_file )
137
138
else:
138
139
raise RuntimeError( 'exotic file in repo: %s' % file )
139
140
140
# bzr revert
141
self.run( [ 'bzr', 'revert', '--no-backup' ] )
141
# brz revert
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
142
143
143
# bzr st
144
output = self.run( [ 'bzr', 'status' ] )
144
# brz st
145
output = self.run( [ 'brz', 'status' ] )
145
146
files = self.parse_file_blocks( output )
146
147
147
148
# remove unknown files
150
151
matches = re.search( r'^(.+?)[/@+]?$', file )
151
152
if not matches:
152
153
raise RunTimeError(
153
'failed to parse bzr unknowns: %s' % file )
154
'failed to parse brz unknowns: %s' % file )
154
155
file = matches.group( 1 )
155
if the.verbose >= 2: print "removing (unknown): " + file
156
if the.verbose >= 2: print("removing (unknown): " + file)
156
157
full_file = os.path.join( self.dir, file )
157
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
158
159
os.unlink( full_file )
164
165
# if a revision identifier has been given, ensure we're updated to that
165
166
if revno is not None and self.get_revno() != revno:
166
167
167
# bzr update
168
self.run( [ 'bzr', 'update', '-r', revno ] )
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
169
170
170
171
171
172
def update( self ):
174
175
operation.
175
176
"""
176
177
177
# WARNING: the following might cause bzr to ask for your ssh password more than
178
# WARNING: the following might cause brz to ask for your ssh password more than
178
179
# once during an update!!!
179
180
#
180
181
# # get revno
181
182
# revno = self.get_revno()
182
183
#
183
184
# # update to current revision (pull in history without updating tree)
184
# self.run( [ 'bzr', 'update', '-r', revno ] )
185
# self.run( [ 'brz', 'update', '-r', revno ] )
185
186
#
186
187
# # get log output
187
188
# next_revno = str( int( revno ) + 1 )
188
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
189
190
#
190
191
# # parse output
191
192
# keep_files = list()
213
214
# rename_from = rename_files[ rename_from ]
214
215
# rename_files[ line[ 4 : ] ] = rename_from
215
216
216
# bzr update properly
217
output = self.run( [ 'bzr', 'update' ] )
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
218
219
219
220
# parse output (see logic in report() in bzrlib/delta.py)
220
221
files = list()
221
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
222
223
for line in buf:
223
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
224
225
line = line.rstrip()
243
244
continue
244
245
245
246
raise RuntimeError(
246
'failed to parse bzr update output line:\n%s' % line )
247
'failed to parse brz update output line:\n%s' % line )
247
248
248
249
return files
249
250
250
251
252
def status( self ):
253
"""Get a list of any local modifications. This method returns a list of files
254
which are modified.
255
256
"""
257
258
# bzr status
259
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
260
261
# parse output
262
return self.parse_file_blocks( output )
263
264
251
265
def has_changes( self ):
252
266
"""Check if the branch has any local modifications.
253
267
"""
254
268
255
# bzr status
256
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
257
271
258
272
# parse output
259
273
files = self.parse_file_blocks( output )
264
278
"""Return a list of files that have conflicts.
265
279
"""
266
280
267
# bzr status
268
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
269
283
270
284
# parse output
271
285
files = self.parse_file_blocks( output )
277
291
@param files a list of relative filenames
278
292
"""
279
293
280
# bzr add
281
self.run( [ 'bzr', 'add', '-N' ] + files )
294
# brz add
295
self.run( [ 'brz', 'add', '-N' ] + files )
282
296
283
297
284
298
def commit( self ):
285
299
"""Commit changes to the repo.
286
300
"""
287
301
288
# bzr commit
289
self.run( [ 'bzr', 'commit', '-m', '' ] )
302
# brz commit
303
try:
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 );
310
else:
311
raise e
290
312
291
313
292
314
def run( self, cmd ):
293
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
294
316
p = Popen( cmd, cwd = self.dir,
295
317
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
296
output = p.communicate()[ 0 ]
318
output = p.communicate()[ 0 ].decode()
297
319
if p.returncode > 0:
298
320
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
299
321
if the.verbose >= 2:
300
322
verbose_output = output.rstrip()
301
323
if len( verbose_output ):
302
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
303
325
return output
304
326
305
327
306
328
def parse_file_blocks( self, output ):
307
329
res = dict()
308
330
current = None
309
buf = StringIO.StringIO( output )
331
buf = io.StringIO( output )
310
332
for line in buf:
311
333
matches = re.search( '^([a-z ]+):$', line, re.I )
312
334
if matches:
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480