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