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 23
- compare with another revision
- download diff
- download tarball
- view history from revision 23
- Committer: Tim Marston
- Date: 2014-04-05 19:22:21 UTC
- Revision ID: tim@ed.am-20140405192221-yl8xgy3qorbahlfw
implemented CopyInWalker in terms of CopyBaseWalker, changed implementation of
the verbose operation print function for readability
the verbose operation print function for readability
- files added:
- lib/stdhome/command
- lib/stdhome/vcs
- lib/stdhome/walker
- files renamed:
- lib/stdhome/command_init.py => lib/stdhome/command/init.py
- lib/stdhome/stdhome.py => lib/stdhome/program.py
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
1
# bzr.py
2
#
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
#
5
# This file is part of stdhome (hereafter referred to as "this program").
6
# See http://ed.am/dev/stdhome for more information.
7
#
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
12
#
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
# GNU General Public License for more details.
17
#
18
# You should have received a copy of the GNU General Public License
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
20
21
22
import subprocess, os, re, shutil
23
from subprocess import Popen
24
import StringIO
25
from vcs import Vcs
26
from stdhome import the
27
28
29
class BzrVcs( Vcs ):
30
31
32
def __init__( self, dir ):
33
"""Init class
34
35
@param dir the fully-qualified directory to work in.
36
"""
37
self.dir = dir
38
39
40
def init( self ):
41
"""Create a new, empty branch
42
"""
43
44
# the directory shouldn't exist
45
os.mkdir( self.dir )
46
47
# bzr init
48
try:
49
self.run( [ 'bzr', 'init', '.' ] )
50
except self.VcsError as e:
51
52
# attempt to clean-up dir
53
try:
54
shutil.rmtree( self.dir )
55
except OSError:
56
pass
57
58
raise
59
60
61
def checkout( self, url ):
62
"""Checkout a new copy of a remote branch.
63
64
@param url the remote repository URL
65
"""
66
67
# the directory shouldn't exist
68
os.mkdir( self.dir )
69
70
# bzr co
71
try:
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
73
except self.VcsError as e:
74
75
# attempt to clean-up dir
76
try:
77
shutil.rmtree( self.dir )
78
except OSError:
79
pass
80
81
raise
82
83
84
def get_revno( self ):
85
"""Obtain some sort of revision identifier
86
"""
87
88
# bzr revert
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
90
91
# parse revno
92
buf = StringIO.StringIO( output )
93
return buf.readline().rstrip()
94
95
96
def revert( self, revno = None ):
97
"""Revert the branch so that there are no outstanding changes or unknown files.
98
If a revno is supplied, then the repository is reverted to that
99
revision.
100
"""
101
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' ] )
105
self.run( [ 'bzr', 'revert', '--no-backup' ] )
106
107
# bzr st
108
output = self.run( [ 'bzr', 'status' ] )
109
files = self.parse_file_blocks( output )
110
111
# remove unknown files
112
if 'unknown' in files:
113
for file in files[ 'unknown' ]:
114
if the.verbose > 1: print "removing unknown: " + file
115
full_file = os.path.join( self.dir, file )
116
if os.path.isfile( full_file ):
117
os.unlink( full_file )
118
elif os.path.isdir( full_file ):
119
shutil.rmtree( full_file )
120
else:
121
raise RuntimeError( 'exotic file in repo: %s' % file )
122
123
# if a revision identifyer has been given, update to that
124
if revno is not None:
125
126
# bzr update
127
self.run( [ 'bzr', 'update', '-r', revno ] )
128
129
130
def update( self ):
131
"""Update the branch, pulling down any upstream changes and merging them. This
132
method returns a list of the files that were modified as part of this
133
operation.
134
"""
135
136
# WARNING: the following might cause bzr to ask for your ssh password more than
137
# once during an update!!!
138
#
139
# # get revno
140
# revno = self.get_revno()
141
#
142
# # update to current revision (pull in history without updating tree)
143
# self.run( [ 'bzr', 'update', '-r', revno ] )
144
#
145
# # get log output
146
# next_revno = str( int( revno ) + 1 )
147
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
148
#
149
# # parse output
150
# keep_files = list()
151
# buf = StringIO.StringIO( output )
152
# in_message = False
153
# for line in buf:
154
# line = line.rstrip( '\n' )
155
# if line.lower() == 'message:':
156
# in_message = True
157
# elif in_message:
158
# if line[ : 2 ] != ' ':
159
# in_message = False
160
# else:
161
# line = line[ 2 : ]
162
#
163
# # process directives
164
# if line[ : 6 ].lower() == 'keep: ':
165
# file = line[ 6 : ]
166
# if file in rename_files: file = rename_files[ file ]
167
# keep_files.append( file )
168
# elif line[ : 8 ].lower() == 'rename: ':
169
# rename_from = line[ 8 : ]
170
# elif line[ : 4 ].lower() == 'to: ':
171
# if rename_from in rename_files:
172
# rename_from = rename_files[ rename_from ]
173
# rename_files[ line[ 4 : ] ] = rename_from
174
175
# bzr update properly
176
output = self.run( [ 'bzr', 'update' ] )
177
178
# parse output (see logic in report() in bzrlib/delta.py)
179
files = list()
180
buf = StringIO.StringIO( output )
181
for line in buf:
182
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
183
line = line.rstrip()
184
if the.verbose > 1: print ' %s' % line
185
186
# renames show before and after file names
187
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
188
if matches:
189
files.append( matches.group( 1 ) )
190
files.append( matches.group( 2 ) )
191
continue
192
193
# kind changes shows the same name twice
194
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
195
if matches:
196
files.append( matches.group( 1 ) )
197
continue
198
199
# other entries have only one filename
200
matches = re.search( '^... (.*?)[/@+]?$', line )
201
if matches:
202
files.append( matches.group( 1 ) )
203
continue
204
205
raise RuntimeError(
206
'failed to parse bzr update output line:\n%' % line )
207
208
return files
209
210
211
def has_changes( self ):
212
"""Check if the branch has any local modifications.
213
"""
214
215
# bzr status
216
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
217
218
# parse output
219
files = self.parse_file_blocks( output )
220
return True if len( files ) else False
221
222
223
def get_conflicts( self ):
224
"""Return a list of files that have conflicts.
225
"""
226
227
# bzr status
228
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
229
230
# parse output
231
files = self.parse_file_blocks( output )
232
return files['conflicts'] if 'conflicts' in files else None
233
234
235
def run( self, cmd ):
236
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
237
p = Popen( cmd, cwd = self.dir,
238
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
239
output = p.communicate()[ 0 ]
240
if p.returncode > 0:
241
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
242
return output
243
244
245
def parse_file_blocks( self, output ):
246
res = dict()
247
current = None
248
buf = StringIO.StringIO( output )
249
for line in buf:
250
matches = re.search( '^([a-z ]+):$', line, re.I )
251
if matches:
252
current = matches.group( 1 )
253
continue
254
if current:
255
matches = re.search( '^ ([^ ].*)$', line )
256
if matches:
257
if not current in res:
258
res[ current ] = list()
259
res[ current ].append( matches.group( 1 ) )
260
continue
261
if re.search( '^[0-9]+ shelf exists', line ): continue
262
if re.search( '^working tree is out of date', line ): continue
263
raise self.ParseError( "unrecognised line: %s" % line )
264
return res
265
266
267
class ParseError( Exception ):
268
pass
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480