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 18
- compare with another revision
- download diff
- download tarball
- view history from revision 18
- Committer: Tim Marston
- Date: 2014-04-04 22:35:04 UTC
- Revision ID: tim@ed.am-20140404223504-z91mtjgeljckqyg8
updated comment
- 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
#
19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
20
20
21
21
22
import io
23
import os
24
import re
25
import shutil
26
import subprocess
22
import subprocess, os, re, shutil
27
23
from subprocess import Popen
28
24
import StringIO
25
from vcs import Vcs
29
26
from stdhome import the
30
27
31
from .vcs import Vcs
32
33
34
class BrzVcs( Vcs ):
28
29
class BzrVcs( Vcs ):
35
30
36
31
37
32
def __init__( self, dir ):
39
34
40
35
@param dir the fully-qualified directory to work in.
41
36
"""
42
43
37
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 )
59
38
60
39
61
40
def init( self ):
65
44
# the directory shouldn't exist
66
45
os.mkdir( self.dir )
67
46
68
# brz init
47
# bzr init
69
48
try:
70
self.run( [ 'brz', 'init', '.' ] )
49
self.run( [ 'bzr', 'init', '.' ] )
71
50
except self.VcsError as e:
72
51
73
52
# attempt to clean-up dir
88
67
# the directory shouldn't exist
89
68
os.mkdir( self.dir )
90
69
91
# brz co
70
# bzr co
92
71
try:
93
self.run( [ 'brz', 'checkout', url, '.' ] )
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
73
except self.VcsError as e:
95
74
96
75
# attempt to clean-up dir
106
85
"""Obtain some sort of revision identifier
107
86
"""
108
87
109
# brz revno
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
88
# bzr revert
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
111
90
112
91
# parse revno
113
buf = io.StringIO( output )
92
buf = StringIO.StringIO( output )
114
93
return buf.readline().rstrip()
115
94
116
95
120
99
revision.
121
100
"""
122
101
123
# brz st
124
output = self.run( [ 'brz', 'status' ] )
125
files = self.parse_file_blocks( output )
126
127
# remove kind changed files (or they can cause `brz 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 brz 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
146
# brz revert
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
148
149
# brz st
150
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' ] )
151
107
files = self.parse_file_blocks( output )
152
108
153
109
# remove unknown files
154
110
if 'unknown' in files:
155
111
for file in files[ 'unknown' ]:
156
matches = re.search( r'^(.+?)[/@+]?$', file )
157
if not matches:
158
raise RunTimeError(
159
'failed to parse brz unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
162
112
full_file = os.path.join( self.dir, file )
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
113
if os.path.isfile( full_file ):
164
114
os.unlink( full_file )
165
elif os.path.isdir( full_file ):
115
elif os.full_file.isdir( full_file ):
166
116
shutil.rmtree( full_file )
167
117
else:
168
118
raise RuntimeError( 'exotic file in repo: %s' % file )
169
119
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:
120
# if a revision identifyer has been given, update to that
121
if revno is not None:
172
122
173
# brz update
174
self.run( [ 'brz', 'update', '-r', revno ] )
123
# bzr update
124
self.run( [ 'bzr', 'update', '-r', revno ] )
175
125
176
126
177
127
def update( self ):
180
130
operation.
181
131
"""
182
132
183
# 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
184
134
# once during an update!!!
185
135
#
186
136
# # get revno
187
137
# revno = self.get_revno()
188
138
#
189
139
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'brz', 'update', '-r', revno ] )
140
# self.run( [ 'bzr', 'update', '-r', revno ] )
191
141
#
192
142
# # get log output
193
143
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
144
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
195
145
#
196
146
# # parse output
197
147
# keep_files = list()
219
169
# rename_from = rename_files[ rename_from ]
220
170
# rename_files[ line[ 4 : ] ] = rename_from
221
171
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
172
# bzr update properly
173
output = self.run( [ 'bzr', 'update' ] )
224
174
225
175
# parse output (see logic in report() in bzrlib/delta.py)
226
176
files = list()
227
buf = io.StringIO( output )
177
buf = StringIO.StringIO( output )
228
178
for line in buf:
229
179
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
230
180
line = line.rstrip()
181
if the.verbose > 1: print ' %s' % line
231
182
232
183
# renames show before and after file names
233
184
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
249
200
continue
250
201
251
202
raise RuntimeError(
252
'failed to parse brz update output line:\n%s' % line )
203
'failed to parse bzr update output line:\n%' % line )
253
204
254
205
return files
255
206
256
207
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
270
208
def has_changes( self ):
271
209
"""Check if the branch has any local modifications.
272
210
"""
273
211
274
# brz status
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
212
# bzr status
213
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
276
214
277
215
# parse output
278
216
files = self.parse_file_blocks( output )
283
221
"""Return a list of files that have conflicts.
284
222
"""
285
223
286
# brz status
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
224
# bzr status
225
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
288
226
289
227
# parse output
290
228
files = self.parse_file_blocks( output )
291
229
return files['conflicts'] if 'conflicts' in files else None
292
230
293
231
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
# brz add
300
self.run( [ 'brz', 'add', '-N' ] + files )
301
302
303
def commit( self ):
304
"""Commit changes to the repo.
305
"""
306
307
# brz commit
308
try:
309
self.run( [ 'brz', '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
232
def run( self, cmd ):
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
233
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
321
234
p = Popen( cmd, cwd = self.dir,
322
235
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
323
output = p.communicate()[ 0 ].decode()
236
output = p.communicate()[ 0 ]
324
237
if p.returncode > 0:
325
238
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
239
return output
331
240
332
241
333
242
def parse_file_blocks( self, output ):
334
243
res = dict()
335
244
current = None
336
buf = io.StringIO( output )
245
buf = StringIO.StringIO( output )
337
246
for line in buf:
338
247
matches = re.search( '^([a-z ]+):$', line, re.I )
339
248
if matches:
346
255
res[ current ] = list()
347
256
res[ current ].append( matches.group( 1 ) )
348
257
continue
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
258
if re.search( '^[0-9]+ shelf exists', line ): continue
350
259
if re.search( '^working tree is out of date', line ): continue
351
260
raise self.ParseError( "unrecognised line: %s" % line )
352
261
return res
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0