Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit985093b

Browse files
committed
Merge branch 'remotes' into improvements
* remotes: remote: added tests for creation and removal, finishing the remote interface remote: base tests succeed now config: fixed serious issues that would cause it to see initial tabs as continuation lines - this leads to very incorrect results when parsing git config files. Now the complete reading is overridden to make it work as there was no other way Added configuration access including tests to remote Added remote module and test cases - about to implement remote option handling added initial frame for remote handling- remotes are somewhat related to either parsing the command output or to reading the repo configuration which would be faster
2 parents8f42db5 +53d2697 commit985093b

File tree

7 files changed

+446
-31
lines changed

7 files changed

+446
-31
lines changed

‎lib/git/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
fromgit.statsimportStats
2121
fromgit.utilsimportdashify
2222
fromgit.utilsimporttouch
23+
fromgit.remoteimportRemote
2324

2425

2526
__all__= [nameforname,objinlocals().items()

‎lib/git/config.py‎

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
importConfigParserascp
1414
fromgit.odictimportOrderedDict
1515
importinspect
16+
importcStringIO
1617

1718
class_MetaParserBuilder(type):
1819
"""
@@ -221,15 +222,88 @@ def optionxform(self, optionstr):
221222
"""
222223
returnoptionstr
223224

225+
def_read(self,fp,fpname):
226+
"""
227+
A direct copy of the py2.4 version of the super class's _read method
228+
to assure it uses ordered dicts. Had to change one line to make it work.
229+
230+
Future versions have this fixed, but in fact its quite embarassing for the
231+
guys not to have done it right in the first place !
232+
233+
Removed big comments to make it more compact.
234+
235+
Made sure it ignores initial whitespace as git uses tabs
236+
"""
237+
cursect=None# None, or a dictionary
238+
optname=None
239+
lineno=0
240+
e=None# None, or an exception
241+
whileTrue:
242+
line=fp.readline()
243+
ifnotline:
244+
break
245+
lineno=lineno+1
246+
# comment or blank line?
247+
ifline.strip()==''orline[0]in'#;':
248+
continue
249+
ifline.split(None,1)[0].lower()=='rem'andline[0]in"rR":
250+
# no leading whitespace
251+
continue
252+
else:
253+
# is it a section header?
254+
mo=self.SECTCRE.match(line)
255+
ifmo:
256+
sectname=mo.group('header')
257+
ifsectnameinself._sections:
258+
cursect=self._sections[sectname]
259+
elifsectname==cp.DEFAULTSECT:
260+
cursect=self._defaults
261+
else:
262+
# THE ONLY LINE WE CHANGED !
263+
cursect=OrderedDict((('__name__',sectname),))
264+
self._sections[sectname]=cursect
265+
# So sections can't start with a continuation line
266+
optname=None
267+
# no section header in the file?
268+
elifcursectisNone:
269+
raisecp.MissingSectionHeaderError(fpname,lineno,line)
270+
# an option line?
271+
else:
272+
mo=self.OPTCRE.match(line)
273+
ifmo:
274+
optname,vi,optval=mo.group('option','vi','value')
275+
ifviin ('=',':')and';'inoptval:
276+
pos=optval.find(';')
277+
ifpos!=-1andoptval[pos-1].isspace():
278+
optval=optval[:pos]
279+
optval=optval.strip()
280+
ifoptval=='""':
281+
optval=''
282+
optname=self.optionxform(optname.rstrip())
283+
cursect[optname]=optval
284+
else:
285+
ifnote:
286+
e=cp.ParsingError(fpname)
287+
e.append(lineno,repr(line))
288+
# END
289+
# END ?
290+
# END ?
291+
# END while reading
292+
# if any parsing errors occurred, raise an exception
293+
ife:
294+
raisee
295+
296+
224297
defread(self):
225298
"""
226-
Reads the data stored in the files we have been initialized with
299+
Reads the data stored in the files we have been initialized with. It will
300+
ignore files that cannot be read, possibly leaving an empty configuration
227301
228302
Returns
229303
Nothing
230304
231305
Raises
232-
IOError ifnot all files couldberead
306+
IOError ifa file cannotbehandled
233307
"""
234308
ifself._is_initialized:
235309
return
@@ -244,7 +318,10 @@ def read(self):
244318
close_fp=False
245319
# assume a path if it is not a file-object
246320
ifnothasattr(file_object,"seek"):
247-
fp=open(file_object)
321+
try:
322+
fp=open(file_object)
323+
exceptIOError,e:
324+
continue
248325
close_fp=True
249326
# END fp handling
250327

‎lib/git/refs.py‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Reference(LazyMixin, Iterable):
1515
Represents a named reference to any object
1616
"""
1717
__slots__= ("repo","path")
18+
_common_path_default="refs"
1819

1920
def__init__(self,repo,path,object=None):
2021
"""
@@ -75,7 +76,7 @@ def object(self):
7576
returnObject.new(self.repo,self.path)
7677

7778
@classmethod
78-
defiter_items(cls,repo,common_path="refs",**kwargs):
79+
defiter_items(cls,repo,common_path=None,**kwargs):
7980
"""
8081
Find all refs in the repository
8182
@@ -84,7 +85,9 @@ def iter_items(cls, repo, common_path = "refs", **kwargs):
8485
8586
``common_path``
8687
Optional keyword argument to the path which is to be shared by all
87-
returned Ref objects
88+
returned Ref objects.
89+
Defaults to class specific portion if None assuring that only
90+
refs suitable for the actual class are returned.
8891
8992
``kwargs``
9093
Additional options given as keyword arguments, will be passed
@@ -100,7 +103,10 @@ def iter_items(cls, repo, common_path = "refs", **kwargs):
100103

101104
options= {'sort':"committerdate",
102105
'format':"%(refname)%00%(objectname)%00%(objecttype)%00%(objectsize)"}
103-
106+
107+
ifcommon_pathisNone:
108+
common_path=cls._common_path_default
109+
104110
options.update(kwargs)
105111

106112
output=repo.git.for_each_ref(common_path,**options)
@@ -157,7 +163,8 @@ class Head(Reference):
157163
>>> head.commit.id
158164
'1c09f116cbc2cb4100fb6935bb162daa4723f455'
159165
"""
160-
166+
_common_path_default="refs/heads"
167+
161168
@property
162169
defcommit(self):
163170
"""
@@ -166,20 +173,6 @@ def commit(self):
166173
"""
167174
returnself.object
168175

169-
@classmethod
170-
defiter_items(cls,repo,common_path="refs/heads",**kwargs):
171-
"""
172-
Returns
173-
Iterator yielding Head items
174-
175-
For more documentation, please refer to git.base.Ref.list_items
176-
"""
177-
returnsuper(Head,cls).iter_items(repo,common_path,**kwargs)
178-
179-
def__repr__(self):
180-
return'<git.Head "%s">'%self.name
181-
182-
183176

184177
classTagRef(Reference):
185178
"""
@@ -197,6 +190,7 @@ class TagRef(Reference):
197190
"""
198191

199192
__slots__=tuple()
193+
_common_path_default="refs/tags"
200194

201195
@property
202196
defcommit(self):
@@ -223,16 +217,35 @@ def tag(self):
223217
returnself.object
224218
returnNone
225219

226-
@classmethod
227-
defiter_items(cls,repo,common_path="refs/tags",**kwargs):
220+
221+
# provide an alias
222+
Tag=TagRef
223+
224+
classRemoteRef(Head):
225+
"""
226+
Represents a reference pointing to a remote head.
227+
"""
228+
_common_path_default="refs/remotes"
229+
230+
@property
231+
defremote_name(self):
228232
"""
229233
Returns
230-
Iterator yielding commit items
231-
232-
For more documentation, please refer to git.base.Ref.list_items
234+
Name of the remote we are a reference of, such as 'origin' for a reference
235+
named 'origin/master'
233236
"""
234-
returnsuper(TagRef,cls).iter_items(repo,common_path,**kwargs)
235-
237+
tokens=self.path.split('/')
238+
# /refs/remotes/<remote name>/<branch_name>
239+
returntokens[2]
236240

237-
# provide an alias
238-
Tag=TagRef
241+
@property
242+
defremote_branch(self):
243+
"""
244+
Returns
245+
Name of the remote branch itself, i.e. master.
246+
247+
NOTE: The returned name is usually not qualified enough to uniquely identify
248+
a branch
249+
"""
250+
tokens=self.path.split('/')
251+
return'/'.join(tokens[3:])

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2026 Movatter.jp