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:
- dev
- files renamed:
- version => VERSION
- lib/stdhome/vcs/bzr.py => lib/stdhome/vcs/brz.py
- files modified:
- .bzrignore
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
34
34
35
35
@param dir the fully-qualified directory to work in.
36
36
"""
37
37
38
self.dir = dir
39
self.ignored_files = [ '.bzr', '.bzrignore' ]
40
41
42
def has_authority( self ):
43
"""Check that the directory is under this VCS's control.
44
"""
45
46
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
47
48
49
def expand_repo_url( self, url ):
50
"""Convert a simple hostname in to an URL that the VCS can use.
51
"""
52
53
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
38
54
39
55
40
56
def init( self ):
44
60
# the directory shouldn't exist
45
61
os.mkdir( self.dir )
46
62
47
# bzr init
63
# brz init
48
64
try:
49
self.run( [ 'bzr', 'init', '.' ] )
65
self.run( [ 'brz', 'init', '.' ] )
50
66
except self.VcsError as e:
51
67
52
68
# attempt to clean-up dir
67
83
# the directory shouldn't exist
68
84
os.mkdir( self.dir )
69
85
70
# bzr co
86
# brz co
71
87
try:
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
73
89
except self.VcsError as e:
74
90
75
91
# attempt to clean-up dir
85
101
"""Obtain some sort of revision identifier
86
102
"""
87
103
88
# bzr revert
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
104
# brz revno
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
90
106
91
107
# parse revno
92
buf = StringIO.StringIO( output )
108
buf = io.StringIO( output )
93
109
return buf.readline().rstrip()
94
110
95
111
99
115
revision.
100
116
"""
101
117
102
# bzr revert
103
self.run( [ 'bzr', 'revert', '--no-backup' ] )
104
105
# bzr st
106
output = self.run( [ 'bzr', 'status' ] )
118
# brz st
119
output = self.run( [ 'brz', 'status' ] )
120
files = self.parse_file_blocks( output )
121
122
# remove kind changed files (or they can cause `brz revert` to break in
123
# strange situations, like when a directory has been replaced with a
124
# symlink to a non-existant file)
125
if 'kind changed' in files:
126
for file in files[ 'kind changed' ]:
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
128
if not matches:
129
raise RunTimeError(
130
'failed to parse brz kind change: %s' % file )
131
file = matches.group( 1 )
132
if the.verbose >= 2: print("removing (kind changed): " + file)
133
full_file = os.path.join( self.dir, file )
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
os.unlink( full_file )
136
elif os.path.isdir( full_file ):
137
shutil.rmtree( full_file )
138
else:
139
raise RuntimeError( 'exotic file in repo: %s' % file )
140
141
# brz revert
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
143
144
# brz st
145
output = self.run( [ 'brz', 'status' ] )
107
146
files = self.parse_file_blocks( output )
108
147
109
148
# remove unknown files
110
149
if 'unknown' in files:
111
150
for file in files[ 'unknown' ]:
151
matches = re.search( r'^(.+?)[/@+]?$', file )
152
if not matches:
153
raise RunTimeError(
154
'failed to parse brz unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
112
157
full_file = os.path.join( self.dir, file )
113
if os.path.isfile( full_file ):
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
114
159
os.unlink( full_file )
115
elif os.full_file.isdir( full_file ):
160
elif os.path.isdir( full_file ):
116
161
shutil.rmtree( full_file )
117
162
else:
118
163
raise RuntimeError( 'exotic file in repo: %s' % file )
119
164
120
# if a revision identifyer has been given, update to that
121
if revno is not None:
165
# if a revision identifier has been given, ensure we're updated to that
166
if revno is not None and self.get_revno() != revno:
122
167
123
# bzr update
124
self.run( [ 'bzr', 'update', '-r', revno ] )
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
125
170
126
171
127
172
def update( self ):
130
175
operation.
131
176
"""
132
177
133
# 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
134
179
# once during an update!!!
135
180
#
136
181
# # get revno
137
182
# revno = self.get_revno()
138
183
#
139
184
# # update to current revision (pull in history without updating tree)
140
# self.run( [ 'bzr', 'update', '-r', revno ] )
185
# self.run( [ 'brz', 'update', '-r', revno ] )
141
186
#
142
187
# # get log output
143
188
# next_revno = str( int( revno ) + 1 )
144
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
145
190
#
146
191
# # parse output
147
192
# keep_files = list()
169
214
# rename_from = rename_files[ rename_from ]
170
215
# rename_files[ line[ 4 : ] ] = rename_from
171
216
172
# bzr update properly
173
output = self.run( [ 'bzr', 'update' ] )
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
174
219
175
220
# parse output (see logic in report() in bzrlib/delta.py)
176
221
files = list()
177
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
178
223
for line in buf:
179
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
180
225
line = line.rstrip()
181
if the.verbose > 1: print ' %s' % line
182
226
183
227
# renames show before and after file names
184
228
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
200
244
continue
201
245
202
246
raise RuntimeError(
203
'failed to parse bzr update output line:\n%' % line )
247
'failed to parse brz update output line:\n%s' % line )
204
248
205
249
return files
206
250
207
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
208
265
def has_changes( self ):
209
266
"""Check if the branch has any local modifications.
210
267
"""
211
268
212
# bzr status
213
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
214
271
215
272
# parse output
216
273
files = self.parse_file_blocks( output )
221
278
"""Return a list of files that have conflicts.
222
279
"""
223
280
224
# bzr status
225
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
226
283
227
284
# parse output
228
285
files = self.parse_file_blocks( output )
229
286
return files['conflicts'] if 'conflicts' in files else None
230
287
231
288
289
def add( self, files ):
290
"""Make sure files are added to version control.
291
@param files a list of relative filenames
292
"""
293
294
# brz add
295
self.run( [ 'brz', 'add', '-N' ] + files )
296
297
298
def commit( self ):
299
"""Commit changes to the repo.
300
"""
301
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
312
313
232
314
def run( self, cmd ):
233
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
234
316
p = Popen( cmd, cwd = self.dir,
235
317
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
236
output = p.communicate()[ 0 ]
318
output = p.communicate()[ 0 ].decode()
237
319
if p.returncode > 0:
238
320
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
321
if the.verbose >= 2:
322
verbose_output = output.rstrip()
323
if len( verbose_output ):
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
239
325
return output
240
326
241
327
242
328
def parse_file_blocks( self, output ):
243
329
res = dict()
244
330
current = None
245
buf = StringIO.StringIO( output )
331
buf = io.StringIO( output )
246
332
for line in buf:
247
333
matches = re.search( '^([a-z ]+):$', line, re.I )
248
334
if matches:
255
341
res[ current ] = list()
256
342
res[ current ].append( matches.group( 1 ) )
257
343
continue
258
if re.search( '^[0-9]+ shelf exists', line ): continue
344
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
259
345
if re.search( '^working tree is out of date', line ): continue
260
346
raise self.ParseError( "unrecognised line: %s" % line )
261
347
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480