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:
- VERSION => version
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
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
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
102
# bzr revert
142
103
self.run( [ 'bzr', 'revert', '--no-backup' ] )
143
104
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 bzr 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
123
# bzr update
169
124
self.run( [ 'bzr', 'update', '-r', revno ] )
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 bzr update output line:\n%s' % line )
203
'failed to parse bzr update output line:\n%' % line )
248
204
249
205
return files
250
206
273
229
return files['conflicts'] if 'conflicts' in files else None
274
230
275
231
276
def add( self, files ):
277
"""Make sure files are added to version control.
278
@param files a list of relative filenames
279
"""
280
281
# bzr add
282
self.run( [ 'bzr', 'add', '-N' ] + files )
283
284
285
def commit( self ):
286
"""Commit changes to the repo.
287
"""
288
289
# bzr commit
290
try:
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
292
except self.VcsError as e:
293
if re.search( 'Working tree is out of date', e.output ):
294
raise the.program.FatalError(
295
'you must update your files first.\n' +
296
'Hint: see "%s update --help"' % the.program.name );
297
else:
298
raise e
299
300
301
232
def run( self, cmd ):
302
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
233
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
303
234
p = Popen( cmd, cwd = self.dir,
304
235
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
305
236
output = p.communicate()[ 0 ]
306
237
if p.returncode > 0:
307
238
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
308
if the.verbose >= 2:
309
verbose_output = output.rstrip()
310
if len( verbose_output ):
311
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
312
239
return output
313
240
314
241
328
255
res[ current ] = list()
329
256
res[ current ].append( matches.group( 1 ) )
330
257
continue
331
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
258
if re.search( '^[0-9]+ shelf exists', line ): continue
332
259
if re.search( '^working tree is out of date', line ): continue
333
260
raise self.ParseError( "unrecognised line: %s" % line )
334
261
return res
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0