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 14
- compare with another revision
- download diff
- download tarball
- view history from revision 14
- Committer: Tim Marston
- Date: 2014-03-19 20:02:46 UTC
- Revision ID: tim@ed.am-20140319200246-xbde7zekxf410oyl
removed double return
- files removed:
- dev
- files renamed:
- lib/stdhome/vcs/brz.py => lib/stdhome/vcs/bzr.py
- VERSION => version
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
1
# brz.py
1
# bzr.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 io
25
from .vcs import Vcs
24
import StringIO
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
38
37
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 )
54
38
55
39
56
40
def init( self ):
60
44
# the directory shouldn't exist
61
45
os.mkdir( self.dir )
62
46
63
# brz init
47
# bzr init
64
48
try:
65
self.run( [ 'brz', 'init', '.' ] )
49
self.run( [ 'bzr', 'init', '.' ] )
66
50
except self.VcsError as e:
67
51
68
52
# attempt to clean-up dir
83
67
# the directory shouldn't exist
84
68
os.mkdir( self.dir )
85
69
86
# brz co
70
# bzr co
87
71
try:
88
self.run( [ 'brz', 'checkout', url, '.' ] )
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
89
73
except self.VcsError as e:
90
74
91
75
# attempt to clean-up dir
101
85
"""Obtain some sort of revision identifier
102
86
"""
103
87
104
# brz revno
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
88
# bzr revert
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
106
90
107
91
# parse revno
108
buf = io.StringIO( output )
92
buf = StringIO.StringIO( output )
109
93
return buf.readline().rstrip()
110
94
111
95
115
99
revision.
116
100
"""
117
101
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
# bzr revert
103
self.run( [ 'bzr', 'revert', '--no-backup' ] )
104
105
# bzr st
106
output = self.run( [ 'bzr', 'status' ] )
146
107
files = self.parse_file_blocks( output )
147
108
148
109
# remove unknown files
149
110
if 'unknown' in files:
150
111
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)
157
112
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
113
if os.path.isfile( full_file ):
159
114
os.unlink( full_file )
160
elif os.path.isdir( full_file ):
115
elif os.full_file.isdir( full_file ):
161
116
shutil.rmtree( full_file )
162
117
else:
163
118
raise RuntimeError( 'exotic file in repo: %s' % file )
164
119
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:
120
# if a revision identifyer has been given, update to that
121
if revno is not None:
167
122
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
123
# bzr update
124
self.run( [ 'bzr', 'update', '-r', revno ] )
170
125
171
126
172
127
def update( self ):
175
130
operation.
176
131
"""
177
132
178
# WARNING: the following might cause brz to ask for your ssh password more than
133
# WARNING: the following might cause bzr to ask for your ssh password more than
179
134
# once during an update!!!
180
135
#
181
136
# # get revno
182
137
# revno = self.get_revno()
183
138
#
184
139
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
140
# self.run( [ 'bzr', 'update', '-r', revno ] )
186
141
#
187
142
# # get log output
188
143
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
144
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
190
145
#
191
146
# # parse output
192
147
# keep_files = list()
214
169
# rename_from = rename_files[ rename_from ]
215
170
# rename_files[ line[ 4 : ] ] = rename_from
216
171
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
172
# bzr update properly
173
output = self.run( [ 'bzr', 'update' ] )
219
174
220
175
# parse output (see logic in report() in bzrlib/delta.py)
221
176
files = list()
222
buf = io.StringIO( output )
177
buf = StringIO.StringIO( output )
223
178
for line in buf:
224
179
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
180
line = line.rstrip()
181
if the.verbose > 1: print ' %s' % line
226
182
227
183
# renames show before and after file names
228
184
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
244
200
continue
245
201
246
202
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
203
'failed to parse bzr update output line:\n%' % line )
248
204
249
205
return files
250
206
251
207
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
265
208
def has_changes( self ):
266
209
"""Check if the branch has any local modifications.
267
210
"""
268
211
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
212
# bzr status
213
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
271
214
272
215
# parse output
273
216
files = self.parse_file_blocks( output )
278
221
"""Return a list of files that have conflicts.
279
222
"""
280
223
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
224
# bzr status
225
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
283
226
284
227
# parse output
285
228
files = self.parse_file_blocks( output )
286
229
return files['conflicts'] if 'conflicts' in files else None
287
230
288
231
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
232
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
233
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
316
234
p = Popen( cmd, cwd = self.dir,
317
235
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
236
output = p.communicate()[ 0 ]
319
237
if p.returncode > 0:
320
238
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
239
return output
326
240
327
241
328
242
def parse_file_blocks( self, output ):
329
243
res = dict()
330
244
current = None
331
buf = io.StringIO( output )
245
buf = StringIO.StringIO( output )
332
246
for line in buf:
333
247
matches = re.search( '^([a-z ]+):$', line, re.I )
334
248
if matches:
341
255
res[ current ] = list()
342
256
res[ current ].append( matches.group( 1 ) )
343
257
continue
344
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
258
if re.search( '^[0-9]+ shelf exists', line ): continue
345
259
if re.search( '^working tree is out of date', line ): continue
346
260
raise self.ParseError( "unrecognised line: %s" % line )
347
261
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480