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 28
- compare with another revision
- download diff
- download tarball
- view history from revision 28
- Committer: Tim Marston
- Date: 2014-04-05 22:30:23 UTC
- Revision ID: tim@ed.am-20140405223023-3co87mbvnxwk1l65
added revert command
- 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' ] )
102
# bzr st
103
output = self.run( [ 'bzr', 'status' ] )
120
104
files = self.parse_file_blocks( output )
121
105
122
# remove kind changed files (or they can cause `brz revert` to break in
106
# remove kind changed files (or they can cause `bzr revert` to break in
123
107
# strange situations, like when a directory has been replaced with a
124
108
# symlink to a non-existant file)
125
109
if 'kind changed' in files:
126
110
for file in files[ 'kind changed' ]:
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
111
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
128
112
if not matches:
129
113
raise RunTimeError(
130
'failed to parse brz kind change: %s' % file )
114
'failed to parse bzr kind change: %s' % file )
131
115
file = matches.group( 1 )
132
if the.verbose >= 2: print("removing (kind changed): " + file)
116
if the.verbose > 1: print "removing (kind changed): " + file
133
117
full_file = os.path.join( self.dir, file )
134
118
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
119
os.unlink( full_file )
138
122
else:
139
123
raise RuntimeError( 'exotic file in repo: %s' % file )
140
124
141
# brz revert
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
125
# bzr revert
126
self.run( [ 'bzr', 'revert', '--no-backup' ] )
143
127
144
# brz st
145
output = self.run( [ 'brz', 'status' ] )
128
# bzr st
129
output = self.run( [ 'bzr', 'status' ] )
146
130
files = self.parse_file_blocks( output )
147
131
148
132
# remove unknown files
149
133
if 'unknown' in files:
150
134
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)
135
if the.verbose > 1: print "removing (unknown): " + file
157
136
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
137
if os.path.isfile( full_file ):
159
138
os.unlink( full_file )
160
139
elif os.path.isdir( full_file ):
161
140
shutil.rmtree( full_file )
162
141
else:
163
142
raise RuntimeError( 'exotic file in repo: %s' % file )
164
143
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:
144
# if a revision identifyer has been given, update to that
145
if revno is not None:
167
146
168
# brz update
169
self.run( [ 'brz', 'update', '-r', revno ] )
147
# bzr update
148
self.run( [ 'bzr', 'update', '-r', revno ] )
170
149
171
150
172
151
def update( self ):
175
154
operation.
176
155
"""
177
156
178
# WARNING: the following might cause brz to ask for your ssh password more than
157
# WARNING: the following might cause bzr to ask for your ssh password more than
179
158
# once during an update!!!
180
159
#
181
160
# # get revno
182
161
# revno = self.get_revno()
183
162
#
184
163
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
164
# self.run( [ 'bzr', 'update', '-r', revno ] )
186
165
#
187
166
# # get log output
188
167
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
168
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
190
169
#
191
170
# # parse output
192
171
# keep_files = list()
214
193
# rename_from = rename_files[ rename_from ]
215
194
# rename_files[ line[ 4 : ] ] = rename_from
216
195
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
196
# bzr update properly
197
output = self.run( [ 'bzr', 'update' ] )
219
198
220
199
# parse output (see logic in report() in bzrlib/delta.py)
221
200
files = list()
222
buf = io.StringIO( output )
201
buf = StringIO.StringIO( output )
223
202
for line in buf:
224
203
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
204
line = line.rstrip()
205
if the.verbose > 1: print ' %s' % line
226
206
227
207
# renames show before and after file names
228
208
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
244
224
continue
245
225
246
226
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
227
'failed to parse bzr update output line:\n%s' % line )
248
228
249
229
return files
250
230
251
231
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
232
def has_changes( self ):
266
233
"""Check if the branch has any local modifications.
267
234
"""
268
235
269
# brz status
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
236
# bzr status
237
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
271
238
272
239
# parse output
273
240
files = self.parse_file_blocks( output )
278
245
"""Return a list of files that have conflicts.
279
246
"""
280
247
281
# brz status
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
248
# bzr status
249
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
283
250
284
251
# parse output
285
252
files = self.parse_file_blocks( output )
286
253
return files['conflicts'] if 'conflicts' in files else None
287
254
288
255
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
256
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
257
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
316
258
p = Popen( cmd, cwd = self.dir,
317
259
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
260
output = p.communicate()[ 0 ]
319
261
if p.returncode > 0:
320
262
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
263
return output
326
264
327
265
328
266
def parse_file_blocks( self, output ):
329
267
res = dict()
330
268
current = None
331
buf = io.StringIO( output )
269
buf = StringIO.StringIO( output )
332
270
for line in buf:
333
271
matches = re.search( '^([a-z ]+):$', line, re.I )
334
272
if matches:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0