1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
|
# Copyright (C) 2008-2010 Ben Finney <benf@cybersource.com.au>
# Chris Ball <cjb@laptop.org>
# Gianluca Montecchi <gian@grys.it>
# W. Trevor King <wking@drexel.edu>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""
Git backend.
"""
import os
import os.path
import re
import shutil
import unittest
import libbe
import libbe.ui.util.user
import base
if libbe.TESTING == True:
import doctest
import sys
def new():
return Git()
class Git(base.VCS):
name='git'
client='git'
def __init__(self, *args, **kwargs):
base.VCS.__init__(self, *args, **kwargs)
self.versioned = True
def _vcs_version(self):
status,output,error = self._u_invoke_client('--version')
return output.strip()
def _vcs_get_user_id(self):
status,output,error = \
self._u_invoke_client('config', 'user.name', expect=(0,1))
if status == 0:
name = output.rstrip('\n')
else:
name = ''
status,output,error = \
self._u_invoke_client('config', 'user.email', expect=(0,1))
if status == 0:
email = output.rstrip('\n')
else:
email = ''
if name != '' or email != '': # got something!
# guess missing info, if necessary
if name == '':
name = libbe.ui.util.user.get_fallback_username()
if email == '':
email = libe.ui.util.user.get_fallback_email()
return libbe.ui.util.user.create_user_id(name, email)
return None # Git has no infomation
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, '.git') != None :
return True
return False
def _vcs_root(self, path):
"""Find the root of the deepest repository containing path."""
# Assume that nothing funny is going on; in particular, that we aren't
# dealing with a bare repo.
if os.path.isdir(path) != True:
path = os.path.dirname(path)
status,output,error = self._u_invoke_client('rev-parse', '--git-dir',
cwd=path)
gitdir = os.path.join(path, output.rstrip('\n'))
dirname = os.path.abspath(os.path.dirname(gitdir))
return dirname
def _vcs_init(self, path):
self._u_invoke_client('init', cwd=path)
def _vcs_destroy(self):
vcs_dir = os.path.join(self.repo, '.git')
if os.path.exists(vcs_dir):
shutil.rmtree(vcs_dir)
def _vcs_add(self, path):
if os.path.isdir(path):
return
self._u_invoke_client('add', path)
def _vcs_remove(self, path):
if not os.path.isdir(self._u_abspath(path)):
self._u_invoke_client('rm', '-f', path)
def _vcs_update(self, path):
self._vcs_add(path)
def _vcs_get_file_contents(self, path, revision=None):
if revision == None:
return base.VCS._vcs_get_file_contents(self, path, revision)
else:
arg = '%s:%s' % (revision,path)
status,output,error = self._u_invoke_client('show', arg)
return output
def _vcs_path(self, id, revision):
return self._u_find_id(id, revision)
def _vcs_isdir(self, path, revision):
arg = '%s:%s' % (revision,path)
args = ['ls-tree', arg]
kwargs = {'expect':(0,128)}
status,output,error = self._u_invoke_client(*args, **kwargs)
if status != 0:
if 'not a tree object' in error:
return False
raise base.CommandError(args, status, stderr=error)
return True
def _vcs_listdir(self, path, revision):
arg = '%s:%s' % (revision,path)
status,output,error = self._u_invoke_client(
'ls-tree', '--name-only', arg)
return output.rstrip('\n').splitlines()
def _vcs_commit(self, commitfile, allow_empty=False):
args = ['commit', '--all', '--file', commitfile]
if allow_empty == True:
args.append('--allow-empty')
status,output,error = self._u_invoke_client(*args)
else:
kwargs = {'expect':(0,1)}
status,output,error = self._u_invoke_client(*args, **kwargs)
strings = ['nothing to commit',
'nothing added to commit']
if self._u_any_in_string(strings, output) == True:
raise base.EmptyCommit()
full_revision = self._vcs_revision_id(-1)
assert full_revision[:7] in output, \
'Mismatched revisions:\n%s\n%s' % (full_revision, output)
return full_revision
def _vcs_revision_id(self, index):
args = ['rev-list', '--first-parent', '--reverse', 'HEAD']
kwargs = {'expect':(0,128)}
status,output,error = self._u_invoke_client(*args, **kwargs)
if status == 128:
if error.startswith("fatal: ambiguous argument 'HEAD': unknown "):
return None
raise base.CommandError(args, status, stderr=error)
revisions = output.splitlines()
try:
if index > 0:
return revisions[index-1]
elif index < 0:
return revisions[index]
else:
return None
except IndexError:
return None
def _diff(self, revision):
status,output,error = self._u_invoke_client('diff', revision)
return output
def _parse_diff(self, diff_text):
"""
Example diff text:
diff --git a/dir/changed b/dir/changed
index 6c3ea8c..2f2f7c7 100644
--- a/dir/changed
+++ b/dir/changed
@@ -1,3 +1,3 @@
hi
-there
+everyone and
joe
diff --git a/dir/deleted b/dir/deleted
deleted file mode 100644
index 225ec04..0000000
--- a/dir/deleted
+++ /dev/null
@@ -1,3 +0,0 @@
-in
-the
-beginning
diff --git a/dir/moved b/dir/moved
deleted file mode 100644
index 5ef102f..0000000
--- a/dir/moved
+++ /dev/null
@@ -1,4 +0,0 @@
-the
-ants
-go
-marching
diff --git a/dir/moved2 b/dir/moved2
new file mode 100644
index 0000000..5ef102f
--- /dev/null
+++ b/dir/moved2
@@ -0,0 +1,4 @@
+the
+ants
+go
+marching
diff --git a/dir/new b/dir/new
new file mode 100644
index 0000000..94954ab
--- /dev/null
+++ b/dir/new
@@ -0,0 +1,2 @@
+hello
+world
"""
new = []
modified = []
removed = []
lines = diff_text.splitlines()
for i,line in enumerate(lines):
if not line.startswith('diff '):
continue
file_a,file_b = line.split()[-2:]
assert file_a.startswith('a/'), \
'missformed file_a %s' % file_a
assert file_b.startswith('b/'), \
'missformed file_a %s' % file_b
file = file_a[2:]
assert file_b[2:] == file, \
'diff file missmatch %s != %s' % (file_a, file_b)
if lines[i+1].startswith('new '):
new.append(file)
elif lines[i+1].startswith('index '):
modified.append(file)
elif lines[i+1].startswith('deleted '):
removed.append(file)
return (new,modified,removed)
def _vcs_changed(self, revision):
return self._parse_diff(self._diff(revision))
if libbe.TESTING == True:
base.make_vcs_testcase_subclasses(Git, sys.modules[__name__])
unitsuite =unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])
suite = unittest.TestSuite([unitsuite, doctest.DocTestSuite()])
|
