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 24
- compare with another revision
- download diff
- download tarball
- view history from revision 24
- Committer: Tim Marston
- Date: 2014-04-05 22:26:17 UTC
- Revision ID: tim@ed.am-20140405222617-4nf4alk3u2dxe430
removed reference to copy-in conflicts (which no longer exist)
- files removed:
- dev
- files renamed:
- VERSION => version
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
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 ):
101
85
"""Obtain some sort of revision identifier
102
86
"""
103
87
104
# bzr revno
88
# bzr revert
105
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
# bzr st
119
output = self.run( [ 'bzr', 'status' ] )
120
files = self.parse_file_blocks( output )
121
122
# remove kind changed files (or they can cause `bzr 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 bzr 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
# bzr revert
102
# bzr revert (run twice to handle a bug in bzr where reverting a
103
# directory from a symlink can cause conflicts during initial revert)
104
self.run( [ 'bzr', 'revert', '--no-backup' ] )
142
105
self.run( [ 'bzr', 'revert', '--no-backup' ] )
143
106
144
107
# bzr st
148
111
# remove unknown files
149
112
if 'unknown' in files:
150
113
for file in files[ 'unknown' ]:
151
matches = re.search( r'^(.+?)[/@+]?$', file )
152
if not matches:
153
raise RunTimeError(
154
'failed to parse bzr unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
114
if the.verbose > 1: print "removing unknown: " + file
157
115
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
116
if os.path.isfile( full_file ):
159
117
os.unlink( full_file )
160
118
elif os.path.isdir( full_file ):
161
119
shutil.rmtree( full_file )
162
120
else:
163
121
raise RuntimeError( 'exotic file in repo: %s' % file )
164
122
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:
123
# if a revision identifyer has been given, update to that
124
if revno is not None:
167
125
168
126
# bzr update
169
127
self.run( [ 'bzr', 'update', '-r', revno ] )
219
177
220
178
# parse output (see logic in report() in bzrlib/delta.py)
221
179
files = list()
222
buf = io.StringIO( output )
180
buf = StringIO.StringIO( output )
223
181
for line in buf:
224
182
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
183
line = line.rstrip()
184
if the.verbose > 1: print ' %s' % line
226
185
227
186
# renames show before and after file names
228
187
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
244
203
continue
245
204
246
205
raise RuntimeError(
247
'failed to parse bzr update output line:\n%s' % line )
206
'failed to parse bzr update output line:\n%' % line )
248
207
249
208
return files
250
209
251
210
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
211
def has_changes( self ):
266
212
"""Check if the branch has any local modifications.
267
213
"""
286
232
return files['conflicts'] if 'conflicts' in files else None
287
233
288
234
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
# bzr add
295
self.run( [ 'bzr', 'add', '-N' ] + files )
296
297
298
def commit( self ):
299
"""Commit changes to the repo.
300
"""
301
302
# bzr commit
303
try:
304
self.run( [ 'bzr', '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
235
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
236
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
316
237
p = Popen( cmd, cwd = self.dir,
317
238
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
239
output = p.communicate()[ 0 ]
319
240
if p.returncode > 0:
320
241
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
242
return output
326
243
327
244
328
245
def parse_file_blocks( self, output ):
329
246
res = dict()
330
247
current = None
331
buf = io.StringIO( output )
248
buf = StringIO.StringIO( output )
332
249
for line in buf:
333
250
matches = re.search( '^([a-z ]+):$', line, re.I )
334
251
if matches:
341
258
res[ current ] = list()
342
259
res[ current ].append( matches.group( 1 ) )
343
260
continue
344
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
261
if re.search( '^[0-9]+ shelf exists', line ): continue
345
262
if re.search( '^working tree is out of date', line ): continue
346
263
raise self.ParseError( "unrecognised line: %s" % line )
347
264
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480