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/brz.py
- browse files at revision 96
- compare with another revision
- download diff
- download tarball
- view history from revision 96
- Committer: Tim Marston
- Date: 2021-09-01 12:55:42 UTC
- Revision ID: tim@ed.am-20210901125542-zbuzpswfo7mmm5br
fix broken use of self in @staticmethod
- files renamed:
- lib/stdhome/vcs/bzr.py => lib/stdhome/vcs/brz.py
- files modified:
- configure.ac
added
removed
lib/stdhome/vcs/brz.py
1
# bzr.py
1
# brz.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 subprocess, os, re, shutil
22
import io
23
import os
24
import re
25
import shutil
26
import subprocess
23
27
from subprocess import Popen
24
import io
28
29
from stdhome import the
30
25
31
from .vcs import Vcs
26
from stdhome import the
27
28
29
class BzrVcs( Vcs ):
32
33
34
class BrzVcs( Vcs ):
30
35
31
36
32
37
def __init__( self, dir ):
60
65
# the directory shouldn't exist
61
66
os.mkdir( self.dir )
62
67
63
# bzr init
68
# brz init
64
69
try:
65
self.run( [ 'bzr', 'init', '.' ] )
70
self.run( [ 'brz', 'init', '.' ] )
66
71
except self.VcsError as e:
67
72
68
73
# attempt to clean-up dir
83
88
# the directory shouldn't exist
84
89
os.mkdir( self.dir )
85
90
86
# bzr co
91
# brz co
87
92
try:
88
self.run( [ 'bzr', 'checkout', url, '.' ] )
93
self.run( [ 'brz', 'checkout', url, '.' ] )
89
94
except self.VcsError as e:
90
95
91
96
# attempt to clean-up dir
101
106
"""Obtain some sort of revision identifier
102
107
"""
103
108
104
# bzr revno
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
109
# brz revno
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
106
111
107
112
# parse revno
108
113
buf = io.StringIO( output )
115
120
revision.
116
121
"""
117
122
118
# bzr st
119
output = self.run( [ 'bzr', 'status' ] )
123
# brz st
124
output = self.run( [ 'brz', 'status' ] )
120
125
files = self.parse_file_blocks( output )
121
126
122
# remove kind changed files (or they can cause `bzr revert` to break in
127
# remove kind changed files (or they can cause `brz revert` to break in
123
128
# strange situations, like when a directory has been replaced with a
124
129
# symlink to a non-existant file)
125
130
if 'kind changed' in files:
127
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
128
133
if not matches:
129
134
raise RunTimeError(
130
'failed to parse bzr kind change: %s' % file )
135
'failed to parse brz kind change: %s' % file )
131
136
file = matches.group( 1 )
132
137
if the.verbose >= 2: print("removing (kind changed): " + file)
133
138
full_file = os.path.join( self.dir, file )
138
143
else:
139
144
raise RuntimeError( 'exotic file in repo: %s' % file )
140
145
141
# bzr revert
142
self.run( [ 'bzr', 'revert', '--no-backup' ] )
146
# brz revert
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
143
148
144
# bzr st
145
output = self.run( [ 'bzr', 'status' ] )
149
# brz st
150
output = self.run( [ 'brz', 'status' ] )
146
151
files = self.parse_file_blocks( output )
147
152
148
153
# remove unknown files
151
156
matches = re.search( r'^(.+?)[/@+]?$', file )
152
157
if not matches:
153
158
raise RunTimeError(
154
'failed to parse bzr unknowns: %s' % file )
159
'failed to parse brz unknowns: %s' % file )
155
160
file = matches.group( 1 )
156
161
if the.verbose >= 2: print("removing (unknown): " + file)
157
162
full_file = os.path.join( self.dir, file )
165
170
# if a revision identifier has been given, ensure we're updated to that
166
171
if revno is not None and self.get_revno() != revno:
167
172
168
# bzr update
169
self.run( [ 'bzr', 'update', '-r', revno ] )
173
# brz update
174
self.run( [ 'brz', 'update', '-r', revno ] )
170
175
171
176
172
177
def update( self ):
175
180
operation.
176
181
"""
177
182
178
# WARNING: the following might cause bzr to ask for your ssh password more than
183
# WARNING: the following might cause brz to ask for your ssh password more than
179
184
# once during an update!!!
180
185
#
181
186
# # get revno
182
187
# revno = self.get_revno()
183
188
#
184
189
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'bzr', 'update', '-r', revno ] )
190
# self.run( [ 'brz', 'update', '-r', revno ] )
186
191
#
187
192
# # get log output
188
193
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
190
195
#
191
196
# # parse output
192
197
# keep_files = list()
214
219
# rename_from = rename_files[ rename_from ]
215
220
# rename_files[ line[ 4 : ] ] = rename_from
216
221
217
# bzr update properly
218
output = self.run( [ 'bzr', 'update' ] )
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
219
224
220
225
# parse output (see logic in report() in bzrlib/delta.py)
221
226
files = list()
244
249
continue
245
250
246
251
raise RuntimeError(
247
'failed to parse bzr update output line:\n%s' % line )
252
'failed to parse brz update output line:\n%s' % line )
248
253
249
254
return files
250
255
266
271
"""Check if the branch has any local modifications.
267
272
"""
268
273
269
# bzr status
270
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
274
# brz status
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
271
276
272
277
# parse output
273
278
files = self.parse_file_blocks( output )
278
283
"""Return a list of files that have conflicts.
279
284
"""
280
285
281
# bzr status
282
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
286
# brz status
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
283
288
284
289
# parse output
285
290
files = self.parse_file_blocks( output )
291
296
@param files a list of relative filenames
292
297
"""
293
298
294
# bzr add
295
self.run( [ 'bzr', 'add', '-N' ] + files )
299
# brz add
300
self.run( [ 'brz', 'add', '-N' ] + files )
296
301
297
302
298
303
def commit( self ):
299
304
"""Commit changes to the repo.
300
305
"""
301
306
302
# bzr commit
307
# brz commit
303
308
try:
304
self.run( [ 'bzr', 'commit', '-m', '' ] )
309
self.run( [ 'brz', 'commit', '-m', '' ] )
305
310
except self.VcsError as e:
306
311
if re.search( 'Working tree is out of date', e.output ):
307
312
raise the.program.FatalError(
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480