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 96
- compare with another revision
- download diff
- download tarball
- view history from revision 96
- Committer: Tim Marston
- Date: 2021-09-01 12:55:42 UTC
- Revision ID: tim@ed.am-20210901125542-zbuzpswfo7mmm5br
fix broken use of self in @staticmethod
- files added:
- lib/stdhome/command/stage_add.py
- files removed:
- stdhome
- files renamed:
- tools/ => dev/
- 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
#
19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
20
20
21
21
22
import subprocess, os, re, shutil
22
import io
23
import os
24
import re
25
import shutil
26
import subprocess
23
27
from subprocess import Popen
24
import StringIO
25
from vcs import Vcs
28
26
29
from stdhome import the
27
30
28
29
class BzrVcs( Vcs ):
31
from .vcs import Vcs
32
33
34
class BrzVcs( Vcs ):
30
35
31
36
32
37
def __init__( self, dir ):
36
41
"""
37
42
38
43
self.dir = dir
44
self.ignored_files = [ '.bzr', '.bzrignore' ]
39
45
40
46
41
47
def has_authority( self ):
59
65
# the directory shouldn't exist
60
66
os.mkdir( self.dir )
61
67
62
# bzr init
68
# brz init
63
69
try:
64
self.run( [ 'bzr', 'init', '.' ] )
70
self.run( [ 'brz', 'init', '.' ] )
65
71
except self.VcsError as e:
66
72
67
73
# attempt to clean-up dir
82
88
# the directory shouldn't exist
83
89
os.mkdir( self.dir )
84
90
85
# bzr co
91
# brz co
86
92
try:
87
self.run( [ 'bzr', 'checkout', url, '.' ] )
93
self.run( [ 'brz', 'checkout', url, '.' ] )
88
94
except self.VcsError as e:
89
95
90
96
# attempt to clean-up dir
100
106
"""Obtain some sort of revision identifier
101
107
"""
102
108
103
# bzr revno
104
output = self.run( [ 'bzr', 'revno', '--tree' ] )
109
# brz revno
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
105
111
106
112
# parse revno
107
buf = StringIO.StringIO( output )
113
buf = io.StringIO( output )
108
114
return buf.readline().rstrip()
109
115
110
116
114
120
revision.
115
121
"""
116
122
117
# bzr st
118
output = self.run( [ 'bzr', 'status' ] )
123
# brz st
124
output = self.run( [ 'brz', 'status' ] )
119
125
files = self.parse_file_blocks( output )
120
126
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 )
127
133
if not matches:
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 )
137
143
else:
138
144
raise RuntimeError( 'exotic file in repo: %s' % file )
139
145
140
# bzr revert
141
self.run( [ 'bzr', 'revert', '--no-backup' ] )
146
# brz revert
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
142
148
143
# bzr st
144
output = self.run( [ 'bzr', 'status' ] )
149
# brz st
150
output = self.run( [ 'brz', 'status' ] )
145
151
files = self.parse_file_blocks( output )
146
152
147
153
# remove unknown files
150
156
matches = re.search( r'^(.+?)[/@+]?$', file )
151
157
if not matches:
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:
166
172
167
# bzr update
168
self.run( [ 'bzr', 'update', '-r', revno ] )
173
# brz update
174
self.run( [ 'brz', 'update', '-r', revno ] )
169
175
170
176
171
177
def update( self ):
174
180
operation.
175
181
"""
176
182
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!!!
179
185
#
180
186
# # get revno
181
187
# revno = self.get_revno()
182
188
#
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 ] )
185
191
#
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 + '..' ] )
189
195
#
190
196
# # parse output
191
197
# keep_files = list()
213
219
# rename_from = rename_files[ rename_from ]
214
220
# rename_files[ line[ 4 : ] ] = rename_from
215
221
216
# bzr update properly
217
output = self.run( [ 'bzr', 'update' ] )
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
218
224
219
225
# parse output (see logic in report() in bzrlib/delta.py)
220
226
files = list()
221
buf = StringIO.StringIO( output )
227
buf = io.StringIO( output )
222
228
for line in buf:
223
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
224
230
line = line.rstrip()
243
249
continue
244
250
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 )
247
253
248
254
return files
249
255
250
256
257
def status( self ):
258
"""Get a list of any local modifications. This method returns a list of files
259
which are modified.
260
261
"""
262
263
# bzr status
264
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
265
266
# parse output
267
return self.parse_file_blocks( output )
268
269
251
270
def has_changes( self ):
252
271
"""Check if the branch has any local modifications.
253
272
"""
254
273
255
# bzr status
256
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
274
# brz status
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
257
276
258
277
# parse output
259
278
files = self.parse_file_blocks( output )
264
283
"""Return a list of files that have conflicts.
265
284
"""
266
285
267
# bzr status
268
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
286
# brz status
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
269
288
270
289
# parse output
271
290
files = self.parse_file_blocks( output )
277
296
@param files a list of relative filenames
278
297
"""
279
298
280
# bzr add
281
self.run( [ 'bzr', 'add', '-N' ] + files )
299
# brz add
300
self.run( [ 'brz', 'add', '-N' ] + files )
282
301
283
302
284
303
def commit( self ):
285
304
"""Commit changes to the repo.
286
305
"""
287
306
288
# bzr commit
289
self.run( [ 'bzr', 'commit', '-m', '' ] )
307
# brz commit
308
try:
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 );
315
else:
316
raise e
290
317
291
318
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 ))
303
330
return output
304
331
305
332
306
333
def parse_file_blocks( self, output ):
307
334
res = dict()
308
335
current = None
309
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
310
337
for line in buf:
311
338
matches = re.search( '^([a-z ]+):$', line, re.I )
312
339
if matches:
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480