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 99
- compare with another revision
- download diff
- download tarball
- view history from revision 99
- Committer: Tim Marston
- Date: 2022-06-27 15:47:18 UTC
- Revision ID: tim@ed.am-20220627154718-coj4in7pqgl3c8lr
updated Makefile for previous commit
- files added:
- dev
- files renamed:
- version => VERSION
- 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 StringIO
25
from vcs import Vcs
28
26
29
from stdhome import the
27
30
31
from .vcs import Vcs
32
28
33
29
34
class BzrVcs( Vcs ):
30
35
34
39
35
40
@param dir the fully-qualified directory to work in.
36
41
"""
42
37
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 )
38
59
39
60
40
61
def init( self ):
85
106
"""Obtain some sort of revision identifier
86
107
"""
87
108
88
# bzr revert
109
# bzr revno
89
110
output = self.run( [ 'bzr', 'revno', '--tree' ] )
90
111
91
112
# parse revno
92
buf = StringIO.StringIO( output )
113
buf = io.StringIO( output )
93
114
return buf.readline().rstrip()
94
115
95
116
99
120
revision.
100
121
"""
101
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
102
146
# bzr revert
103
147
self.run( [ 'bzr', 'revert', '--no-backup' ] )
104
148
109
153
# remove unknown files
110
154
if 'unknown' in files:
111
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)
112
162
full_file = os.path.join( self.dir, file )
113
if os.path.isfile( full_file ):
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
114
164
os.unlink( full_file )
115
elif os.full_file.isdir( full_file ):
165
elif os.path.isdir( full_file ):
116
166
shutil.rmtree( full_file )
117
167
else:
118
168
raise RuntimeError( 'exotic file in repo: %s' % file )
119
169
120
# if a revision identifyer has been given, update to that
121
if revno is not None:
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:
122
172
123
173
# bzr update
124
174
self.run( [ 'bzr', 'update', '-r', revno ] )
174
224
175
225
# parse output (see logic in report() in bzrlib/delta.py)
176
226
files = list()
177
buf = StringIO.StringIO( output )
227
buf = io.StringIO( output )
178
228
for line in buf:
179
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
180
230
line = line.rstrip()
181
if the.verbose > 1: print ' %s' % line
182
231
183
232
# renames show before and after file names
184
233
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
200
249
continue
201
250
202
251
raise RuntimeError(
203
'failed to parse bzr update output line:\n%' % line )
252
'failed to parse bzr update output line:\n%s' % line )
204
253
205
254
return files
206
255
207
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
208
270
def has_changes( self ):
209
271
"""Check if the branch has any local modifications.
210
272
"""
229
291
return files['conflicts'] if 'conflicts' in files else None
230
292
231
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
232
319
def run( self, cmd ):
233
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
234
321
p = Popen( cmd, cwd = self.dir,
235
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
236
output = p.communicate()[ 0 ]
323
output = p.communicate()[ 0 ].decode()
237
324
if p.returncode > 0:
238
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 ))
239
330
return output
240
331
241
332
242
333
def parse_file_blocks( self, output ):
243
334
res = dict()
244
335
current = None
245
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
246
337
for line in buf:
247
338
matches = re.search( '^([a-z ]+):$', line, re.I )
248
339
if matches:
255
346
res[ current ] = list()
256
347
res[ current ].append( matches.group( 1 ) )
257
348
continue
258
if re.search( '^[0-9]+ shelf exists', line ): continue
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
259
350
if re.search( '^working tree is out of date', line ): continue
260
351
raise self.ParseError( "unrecognised line: %s" % line )
261
352
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480