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
- lib/stdhome/command
- lib/stdhome/walker
- files renamed:
- version => VERSION
- lib/stdhome/command_init.py => lib/stdhome/command/init.py
- lib/stdhome/command_resolve.py => lib/stdhome/command/resolve.py
- lib/stdhome/command_stage_revert.py => lib/stdhome/command/stage_revert.py
- lib/stdhome/command_status.py => lib/stdhome/command/status.py
- lib/stdhome/command_update.py => lib/stdhome/command/update.py
- 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 stdhome.the as the
25
import StringIO
26
27
28
class VcsBzr:
24
import io
25
from .vcs import Vcs
26
from stdhome import the
27
28
29
class BzrVcs( Vcs ):
29
30
30
31
31
32
def __init__( self, dir ):
33
34
34
35
@param dir the fully-qualified directory to work in.
35
36
"""
37
36
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 )
37
54
38
55
39
56
def init( self ):
43
60
# the directory shouldn't exist
44
61
os.mkdir( self.dir )
45
62
46
# bzr init
47
p = Popen( [ 'bzr', 'init', '.' ], cwd = self.dir,
48
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
49
output = p.communicate()[ 0 ]
50
if p.returncode > 0:
63
# brz init
64
try:
65
self.run( [ 'brz', 'init', '.' ] )
66
except self.VcsError as e:
51
67
52
68
# attempt to clean-up dir
53
69
try:
55
71
except OSError:
56
72
pass
57
73
58
raise the.program.FatalError( 'bzr init failed', output )
74
raise
59
75
60
76
61
77
def checkout( self, url ):
67
83
# the directory shouldn't exist
68
84
os.mkdir( self.dir )
69
85
70
# bzr co
71
p = Popen( [ 'bzr', 'co', url, '.' ], cwd = self.dir,
72
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
73
output = p.communicate()[ 0 ]
74
if p.returncode > 0:
86
# brz co
87
try:
88
self.run( [ 'brz', 'checkout', url, '.' ] )
89
except self.VcsError as e:
75
90
76
91
# attempt to clean-up dir
77
92
try:
79
94
except OSError:
80
95
pass
81
96
82
raise the.program.FatalError( 'bzr checkout failed', output )
83
84
85
def revert( self ):
97
raise
98
99
100
def get_revno( self ):
101
"""Obtain some sort of revision identifier
102
"""
103
104
# brz revno
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
106
107
# parse revno
108
buf = io.StringIO( output )
109
return buf.readline().rstrip()
110
111
112
def revert( self, revno = None ):
86
113
"""Revert the branch so that there are no outstanding changes or unknown files.
114
If a revno is supplied, then the repository is reverted to that
115
revision.
87
116
"""
88
117
89
# bzr revert
90
p = Popen( [ 'bzr', 'revert', '--no-backup' ], cwd = self.dir,
91
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
92
output = p.communicate()[ 0 ]
93
if p.returncode > 0:
94
raise the.program.FatalError( 'bzr revert failed', output )
95
96
# bzr st
97
p = Popen( [ 'bzr', 'st' ], cwd = self.dir,
98
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
99
output = p.communicate()[ 0 ]
100
if p.returncode > 0:
101
raise the.program.FatalError( 'bzr status failed', output )
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' ] )
102
146
files = self.parse_file_blocks( output )
103
147
104
148
# remove unknown files
105
149
if 'unknown' in files:
106
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)
107
157
full_file = os.path.join( self.dir, file )
108
if os.path.isfile( full_file ):
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
109
159
os.unlink( full_file )
110
elif os.full_file.isdir( full_file ):
160
elif os.path.isdir( full_file ):
111
161
shutil.rmtree( full_file )
112
162
else:
113
163
raise RuntimeError( 'exotic file in repo: %s' % file )
114
164
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:
167
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
170
115
171
116
172
def update( self ):
117
"""Update the branch, pulling down any upstream changes and merging them.
118
"""
119
120
# bzr update
121
p = Popen( [ 'bzr', 'update' ], cwd = self.dir,
122
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
123
output = p.communicate()[ 0 ]
124
if p.returncode > 0:
125
raise the.program.FatalError( 'bzr update failed', output )
173
"""Update the branch, pulling down any upstream changes and merging them. This
174
method returns a list of the files that were modified as part of this
175
operation.
176
"""
177
178
# WARNING: the following might cause brz to ask for your ssh password more than
179
# once during an update!!!
180
#
181
# # get revno
182
# revno = self.get_revno()
183
#
184
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
186
#
187
# # get log output
188
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
190
#
191
# # parse output
192
# keep_files = list()
193
# buf = StringIO.StringIO( output )
194
# in_message = False
195
# for line in buf:
196
# line = line.rstrip( '\n' )
197
# if line.lower() == 'message:':
198
# in_message = True
199
# elif in_message:
200
# if line[ : 2 ] != ' ':
201
# in_message = False
202
# else:
203
# line = line[ 2 : ]
204
#
205
# # process directives
206
# if line[ : 6 ].lower() == 'keep: ':
207
# file = line[ 6 : ]
208
# if file in rename_files: file = rename_files[ file ]
209
# keep_files.append( file )
210
# elif line[ : 8 ].lower() == 'rename: ':
211
# rename_from = line[ 8 : ]
212
# elif line[ : 4 ].lower() == 'to: ':
213
# if rename_from in rename_files:
214
# rename_from = rename_files[ rename_from ]
215
# rename_files[ line[ 4 : ] ] = rename_from
216
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
219
220
# parse output (see logic in report() in bzrlib/delta.py)
221
files = list()
222
buf = io.StringIO( output )
223
for line in buf:
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
line = line.rstrip()
226
227
# renames show before and after file names
228
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
229
if matches:
230
files.append( matches.group( 1 ) )
231
files.append( matches.group( 2 ) )
232
continue
233
234
# kind changes shows the same name twice
235
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
236
if matches:
237
files.append( matches.group( 1 ) )
238
continue
239
240
# other entries have only one filename
241
matches = re.search( '^... (.*?)[/@+]?$', line )
242
if matches:
243
files.append( matches.group( 1 ) )
244
continue
245
246
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
248
249
return files
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 )
126
263
127
264
128
265
def has_changes( self ):
129
266
"""Check if the branch has any local modifications.
130
267
"""
131
268
132
# bzr status
133
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
134
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
135
output = p.communicate()[ 0 ]
136
if p.returncode > 0:
137
raise the.program.FatalError( 'bzr status failed', output )
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
271
272
# parse output
138
273
files = self.parse_file_blocks( output )
139
274
return True if len( files ) else False
140
275
143
278
"""Return a list of files that have conflicts.
144
279
"""
145
280
146
# bzr status
147
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
148
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
149
output = p.communicate()[ 0 ]
150
if p.returncode > 0:
151
raise the.program.FatalError( 'bzr status failed', output )
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
283
284
# parse output
152
285
files = self.parse_file_blocks( output )
153
286
return files['conflicts'] if 'conflicts' in files else None
154
287
155
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
314
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
316
p = Popen( cmd, cwd = self.dir,
317
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
319
if p.returncode > 0:
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 ))
325
return output
326
327
156
328
def parse_file_blocks( self, output ):
157
329
res = dict()
158
330
current = None
159
buf = StringIO.StringIO( output )
331
buf = io.StringIO( output )
160
332
for line in buf:
161
333
matches = re.search( '^([a-z ]+):$', line, re.I )
162
334
if matches:
169
341
res[ current ] = list()
170
342
res[ current ].append( matches.group( 1 ) )
171
343
continue
172
if re.search( '^[0-9]+ shelf exists', line ): continue
344
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
173
345
if re.search( '^working tree is out of date', line ): continue
174
346
raise self.ParseError( "unrecognised line: %s" % line )
175
347
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480