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:
- 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
60
60
# the directory shouldn't exist
61
61
os.mkdir( self.dir )
62
62
63
# bzr init
63
# brz init
64
64
try:
65
self.run( [ 'bzr', 'init', '.' ] )
65
self.run( [ 'brz', 'init', '.' ] )
66
66
except self.VcsError as e:
67
67
68
68
# attempt to clean-up dir
83
83
# the directory shouldn't exist
84
84
os.mkdir( self.dir )
85
85
86
# bzr co
86
# brz co
87
87
try:
88
self.run( [ 'bzr', 'checkout', url, '.' ] )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
89
89
except self.VcsError as e:
90
90
91
91
# attempt to clean-up dir
101
101
"""Obtain some sort of revision identifier
102
102
"""
103
103
104
# bzr revno
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
104
# brz revno
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
106
106
107
107
# parse revno
108
buf = StringIO.StringIO( output )
108
buf = io.StringIO( output )
109
109
return buf.readline().rstrip()
110
110
111
111
115
115
revision.
116
116
"""
117
117
118
# bzr st
119
output = self.run( [ 'bzr', 'status' ] )
118
# brz st
119
output = self.run( [ 'brz', 'status' ] )
120
120
files = self.parse_file_blocks( output )
121
121
122
# 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
123
123
# strange situations, like when a directory has been replaced with a
124
124
# symlink to a non-existant file)
125
125
if 'kind changed' in files:
127
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
128
128
if not matches:
129
129
raise RunTimeError(
130
'failed to parse bzr kind change: %s' % file )
130
'failed to parse brz kind change: %s' % file )
131
131
file = matches.group( 1 )
132
if the.verbose >= 2: print "removing (kind changed): " + file
132
if the.verbose >= 2: print("removing (kind changed): " + file)
133
133
full_file = os.path.join( self.dir, file )
134
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
135
os.unlink( full_file )
138
138
else:
139
139
raise RuntimeError( 'exotic file in repo: %s' % file )
140
140
141
# bzr revert
142
self.run( [ 'bzr', 'revert', '--no-backup' ] )
141
# brz revert
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
143
143
144
# bzr st
145
output = self.run( [ 'bzr', 'status' ] )
144
# brz st
145
output = self.run( [ 'brz', 'status' ] )
146
146
files = self.parse_file_blocks( output )
147
147
148
148
# remove unknown files
151
151
matches = re.search( r'^(.+?)[/@+]?$', file )
152
152
if not matches:
153
153
raise RunTimeError(
154
'failed to parse bzr unknowns: %s' % file )
154
'failed to parse brz unknowns: %s' % file )
155
155
file = matches.group( 1 )
156
if the.verbose >= 2: print "removing (unknown): " + file
156
if the.verbose >= 2: print("removing (unknown): " + file)
157
157
full_file = os.path.join( self.dir, file )
158
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
159
os.unlink( full_file )
165
165
# if a revision identifier has been given, ensure we're updated to that
166
166
if revno is not None and self.get_revno() != revno:
167
167
168
# bzr update
169
self.run( [ 'bzr', 'update', '-r', revno ] )
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
170
170
171
171
172
172
def update( self ):
175
175
operation.
176
176
"""
177
177
178
# 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
179
179
# once during an update!!!
180
180
#
181
181
# # get revno
182
182
# revno = self.get_revno()
183
183
#
184
184
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'bzr', 'update', '-r', revno ] )
185
# self.run( [ 'brz', 'update', '-r', revno ] )
186
186
#
187
187
# # get log output
188
188
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
190
190
#
191
191
# # parse output
192
192
# keep_files = list()
214
214
# rename_from = rename_files[ rename_from ]
215
215
# rename_files[ line[ 4 : ] ] = rename_from
216
216
217
# bzr update properly
218
output = self.run( [ 'bzr', 'update' ] )
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
219
219
220
220
# parse output (see logic in report() in bzrlib/delta.py)
221
221
files = list()
222
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
223
223
for line in buf:
224
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
225
line = line.rstrip()
244
244
continue
245
245
246
246
raise RuntimeError(
247
'failed to parse bzr update output line:\n%s' % line )
247
'failed to parse brz update output line:\n%s' % line )
248
248
249
249
return files
250
250
251
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
252
265
def has_changes( self ):
253
266
"""Check if the branch has any local modifications.
254
267
"""
255
268
256
# bzr status
257
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
258
271
259
272
# parse output
260
273
files = self.parse_file_blocks( output )
265
278
"""Return a list of files that have conflicts.
266
279
"""
267
280
268
# bzr status
269
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
270
283
271
284
# parse output
272
285
files = self.parse_file_blocks( output )
278
291
@param files a list of relative filenames
279
292
"""
280
293
281
# bzr add
282
self.run( [ 'bzr', 'add', '-N' ] + files )
294
# brz add
295
self.run( [ 'brz', 'add', '-N' ] + files )
283
296
284
297
285
298
def commit( self ):
286
299
"""Commit changes to the repo.
287
300
"""
288
301
289
# bzr commit
302
# brz commit
290
303
try:
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
304
self.run( [ 'brz', 'commit', '-m', '' ] )
292
305
except self.VcsError as e:
293
306
if re.search( 'Working tree is out of date', e.output ):
294
307
raise the.program.FatalError(
299
312
300
313
301
314
def run( self, cmd ):
302
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
303
316
p = Popen( cmd, cwd = self.dir,
304
317
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
305
output = p.communicate()[ 0 ]
318
output = p.communicate()[ 0 ].decode()
306
319
if p.returncode > 0:
307
320
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
308
321
if the.verbose >= 2:
309
322
verbose_output = output.rstrip()
310
323
if len( verbose_output ):
311
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
312
325
return output
313
326
314
327
315
328
def parse_file_blocks( self, output ):
316
329
res = dict()
317
330
current = None
318
buf = StringIO.StringIO( output )
331
buf = io.StringIO( output )
319
332
for line in buf:
320
333
matches = re.search( '^([a-z ]+):$', line, re.I )
321
334
if matches:
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480