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/bzr.py
- browse files at revision 100
- compare with another revision
- download diff
- download tarball
- view history from revision 100
- Committer: Tim Marston
- Date: 2022-06-27 15:51:01 UTC
- Revision ID: tim@ed.am-20220627155101-znatxg4q91gqs1sc
additional change for brz->bzr
- files added:
- dev
- lib/stdhome/command
- lib/stdhome/walker
- files renamed:
- version => VERSION
- lib/stdhome/command_init.py => lib/stdhome/command/init.py
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
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 stdhome.the as the
25
import StringIO
26
27
28
class VcsBzr:
28
29
from stdhome import the
30
31
from .vcs import Vcs
32
33
34
class BzrVcs( Vcs ):
29
35
30
36
31
37
def __init__( self, dir ):
33
39
34
40
@param dir the fully-qualified directory to work in.
35
41
"""
42
36
43
self.dir = dir
44
self.ignored_files = [ '.bzr', '.bzrignore' ]
45
46
47
def has_authority( self ):
48
"""Check that the directory is under this VCS's control.
49
"""
50
51
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
52
53
54
def expand_repo_url( self, url ):
55
"""Convert a simple hostname in to an URL that the VCS can use.
56
"""
57
58
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
37
59
38
60
39
61
def init( self ):
44
66
os.mkdir( self.dir )
45
67
46
68
# 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:
69
try:
70
self.run( [ 'bzr', 'init', '.' ] )
71
except self.VcsError as e:
51
72
52
73
# attempt to clean-up dir
53
74
try:
55
76
except OSError:
56
77
pass
57
78
58
raise the.program.FatalError( 'bzr init failed', output )
79
raise
59
80
60
81
61
82
def checkout( self, url ):
68
89
os.mkdir( self.dir )
69
90
70
91
# 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:
92
try:
93
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
except self.VcsError as e:
75
95
76
96
# attempt to clean-up dir
77
97
try:
79
99
except OSError:
80
100
pass
81
101
82
raise the.program.FatalError( 'bzr checkout failed', output )
83
84
85
def revert( self ):
102
raise
103
104
105
def get_revno( self ):
106
"""Obtain some sort of revision identifier
107
"""
108
109
# bzr revno
110
output = self.run( [ 'bzr', 'revno', '--tree' ] )
111
112
# parse revno
113
buf = io.StringIO( output )
114
return buf.readline().rstrip()
115
116
117
def revert( self, revno = None ):
86
118
"""Revert the branch so that there are no outstanding changes or unknown files.
119
If a revno is supplied, then the repository is reverted to that
120
revision.
87
121
"""
88
122
123
# bzr st
124
output = self.run( [ 'bzr', 'status' ] )
125
files = self.parse_file_blocks( output )
126
127
# remove kind changed files (or they can cause `bzr revert` to break in
128
# strange situations, like when a directory has been replaced with a
129
# symlink to a non-existant file)
130
if 'kind changed' in files:
131
for file in files[ 'kind changed' ]:
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
133
if not matches:
134
raise RunTimeError(
135
'failed to parse bzr kind change: %s' % file )
136
file = matches.group( 1 )
137
if the.verbose >= 2: print("removing (kind changed): " + file)
138
full_file = os.path.join( self.dir, file )
139
if os.path.isfile( full_file ) or os.path.islink( full_file ):
140
os.unlink( full_file )
141
elif os.path.isdir( full_file ):
142
shutil.rmtree( full_file )
143
else:
144
raise RuntimeError( 'exotic file in repo: %s' % file )
145
89
146
# 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 )
147
self.run( [ 'bzr', 'revert', '--no-backup' ] )
95
148
96
149
# 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 )
150
output = self.run( [ 'bzr', 'status' ] )
102
151
files = self.parse_file_blocks( output )
103
152
104
153
# remove unknown files
105
154
if 'unknown' in files:
106
155
for file in files[ 'unknown' ]:
156
matches = re.search( r'^(.+?)[/@+]?$', file )
157
if not matches:
158
raise RunTimeError(
159
'failed to parse bzr unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
107
162
full_file = os.path.join( self.dir, file )
108
if os.path.isfile( full_file ):
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
109
164
os.unlink( full_file )
110
elif os.full_file.isdir( full_file ):
165
elif os.path.isdir( full_file ):
111
166
shutil.rmtree( full_file )
112
167
else:
113
168
raise RuntimeError( 'exotic file in repo: %s' % file )
114
169
170
# if a revision identifier has been given, ensure we're updated to that
171
if revno is not None and self.get_revno() != revno:
172
173
# bzr update
174
self.run( [ 'bzr', 'update', '-r', revno ] )
175
115
176
116
177
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 )
178
"""Update the branch, pulling down any upstream changes and merging them. This
179
method returns a list of the files that were modified as part of this
180
operation.
181
"""
182
183
# WARNING: the following might cause bzr to ask for your ssh password more than
184
# once during an update!!!
185
#
186
# # get revno
187
# revno = self.get_revno()
188
#
189
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'bzr', 'update', '-r', revno ] )
191
#
192
# # get log output
193
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
195
#
196
# # parse output
197
# keep_files = list()
198
# buf = StringIO.StringIO( output )
199
# in_message = False
200
# for line in buf:
201
# line = line.rstrip( '\n' )
202
# if line.lower() == 'message:':
203
# in_message = True
204
# elif in_message:
205
# if line[ : 2 ] != ' ':
206
# in_message = False
207
# else:
208
# line = line[ 2 : ]
209
#
210
# # process directives
211
# if line[ : 6 ].lower() == 'keep: ':
212
# file = line[ 6 : ]
213
# if file in rename_files: file = rename_files[ file ]
214
# keep_files.append( file )
215
# elif line[ : 8 ].lower() == 'rename: ':
216
# rename_from = line[ 8 : ]
217
# elif line[ : 4 ].lower() == 'to: ':
218
# if rename_from in rename_files:
219
# rename_from = rename_files[ rename_from ]
220
# rename_files[ line[ 4 : ] ] = rename_from
221
222
# bzr update properly
223
output = self.run( [ 'bzr', 'update' ] )
224
225
# parse output (see logic in report() in bzrlib/delta.py)
226
files = list()
227
buf = io.StringIO( output )
228
for line in buf:
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
230
line = line.rstrip()
231
232
# renames show before and after file names
233
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
234
if matches:
235
files.append( matches.group( 1 ) )
236
files.append( matches.group( 2 ) )
237
continue
238
239
# kind changes shows the same name twice
240
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
241
if matches:
242
files.append( matches.group( 1 ) )
243
continue
244
245
# other entries have only one filename
246
matches = re.search( '^... (.*?)[/@+]?$', line )
247
if matches:
248
files.append( matches.group( 1 ) )
249
continue
250
251
raise RuntimeError(
252
'failed to parse bzr update output line:\n%s' % line )
253
254
return files
255
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 )
126
268
127
269
128
270
def has_changes( self ):
130
272
"""
131
273
132
274
# 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 )
275
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
276
277
# parse output
138
278
files = self.parse_file_blocks( output )
139
279
return True if len( files ) else False
140
280
144
284
"""
145
285
146
286
# 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 )
287
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
288
289
# parse output
152
290
files = self.parse_file_blocks( output )
153
291
return files['conflicts'] if 'conflicts' in files else None
154
292
155
293
294
def add( self, files ):
295
"""Make sure files are added to version control.
296
@param files a list of relative filenames
297
"""
298
299
# bzr add
300
self.run( [ 'bzr', 'add', '-N' ] + files )
301
302
303
def commit( self ):
304
"""Commit changes to the repo.
305
"""
306
307
# bzr commit
308
try:
309
self.run( [ 'bzr', '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
317
318
319
def run( self, cmd ):
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
321
p = Popen( cmd, cwd = self.dir,
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
323
output = p.communicate()[ 0 ].decode()
324
if p.returncode > 0:
325
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
326
if the.verbose >= 2:
327
verbose_output = output.rstrip()
328
if len( verbose_output ):
329
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
330
return output
331
332
156
333
def parse_file_blocks( self, output ):
157
334
res = dict()
158
335
current = None
159
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
160
337
for line in buf:
161
338
matches = re.search( '^([a-z ]+):$', line, re.I )
162
339
if matches:
169
346
res[ current ] = list()
170
347
res[ current ].append( matches.group( 1 ) )
171
348
continue
172
if re.search( '^[0-9]+ shelf exists', line ): continue
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
173
350
if re.search( '^working tree is out of date', line ): continue
174
351
raise self.ParseError( "unrecognised line: %s" % line )
175
352
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480