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 (run twice to handle a bug in bzr where reverting a
103
# directory from a symlink can cause conflicts during initial revert)
104
self.run( [ 'bzr', 'revert', '--no-backup' ] )
105
self.run( [ 'bzr', 'revert', '--no-backup' ] )
106
107
# bzr st
108
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' ] )
109
146
files = self.parse_file_blocks( output )
110
147
111
148
# remove unknown files
112
149
if 'unknown' in files:
113
150
for file in files[ 'unknown' ]:
114
if the.verbose > 1: print "removing unknown: " + file
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)
115
157
full_file = os.path.join( self.dir, file )
116
if os.path.isfile( full_file ):
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
117
159
os.unlink( full_file )
118
160
elif os.path.isdir( full_file ):
119
161
shutil.rmtree( full_file )
120
162
else:
121
163
raise RuntimeError( 'exotic file in repo: %s' % file )
122
164
123
# if a revision identifyer has been given, update to that
124
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:
125
167
126
# bzr update
127
self.run( [ 'bzr', 'update', '-r', revno ] )
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
128
170
129
171
130
172
def update( self ):
133
175
operation.
134
176
"""
135
177
136
# 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
137
179
# once during an update!!!
138
180
#
139
181
# # get revno
140
182
# revno = self.get_revno()
141
183
#
142
184
# # update to current revision (pull in history without updating tree)
143
# self.run( [ 'bzr', 'update', '-r', revno ] )
185
# self.run( [ 'brz', 'update', '-r', revno ] )
144
186
#
145
187
# # get log output
146
188
# next_revno = str( int( revno ) + 1 )
147
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
148
190
#
149
191
# # parse output
150
192
# keep_files = list()
172
214
# rename_from = rename_files[ rename_from ]
173
215
# rename_files[ line[ 4 : ] ] = rename_from
174
216
175
# bzr update properly
176
output = self.run( [ 'bzr', 'update' ] )
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
177
219
178
220
# parse output (see logic in report() in bzrlib/delta.py)
179
221
files = list()
180
buf = StringIO.StringIO( output )
222
buf = io.StringIO( output )
181
223
for line in buf:
182
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
183
225
line = line.rstrip()
184
if the.verbose > 1: print ' %s' % line
185
226
186
227
# renames show before and after file names
187
228
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
203
244
continue
204
245
205
246
raise RuntimeError(
206
'failed to parse bzr update output line:\n%' % line )
247
'failed to parse brz update output line:\n%s' % line )
207
248
208
249
return files
209
250
210
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
211
265
def has_changes( self ):
212
266
"""Check if the branch has any local modifications.
213
267
"""
214
268
215
# bzr status
216
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
217
271
218
272
# parse output
219
273
files = self.parse_file_blocks( output )
224
278
"""Return a list of files that have conflicts.
225
279
"""
226
280
227
# bzr status
228
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
229
283
230
284
# parse output
231
285
files = self.parse_file_blocks( output )
232
286
return files['conflicts'] if 'conflicts' in files else None
233
287
234
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
235
314
def run( self, cmd ):
236
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
237
316
p = Popen( cmd, cwd = self.dir,
238
317
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
239
output = p.communicate()[ 0 ]
318
output = p.communicate()[ 0 ].decode()
240
319
if p.returncode > 0:
241
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 ))
242
325
return output
243
326
244
327
245
328
def parse_file_blocks( self, output ):
246
329
res = dict()
247
330
current = None
248
buf = StringIO.StringIO( output )
331
buf = io.StringIO( output )
249
332
for line in buf:
250
333
matches = re.search( '^([a-z ]+):$', line, re.I )
251
334
if matches:
258
341
res[ current ] = list()
259
342
res[ current ].append( matches.group( 1 ) )
260
343
continue
261
if re.search( '^[0-9]+ shelf exists', line ): continue
344
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
262
345
if re.search( '^working tree is out of date', line ): continue
263
346
raise self.ParseError( "unrecognised line: %s" % line )
264
347
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480