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

Commitef9395f

Browse files
committed
Merge branch 'master' of git://gitorious.org/git-python/mainline
2 parents24effa4 +9aa93b5 commitef9395f

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

‎lib/git/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
importos
22
importinspect
33

4-
# grab the version information
5-
v=open(os.path.join(os.path.dirname(__file__),'..','..','VERSION'))
6-
__version__=v.readline().strip()
7-
v.close()
4+
__version__='git'
85

96
fromgit.actorimportActor
107
fromgit.blobimportBlob

‎lib/git/cmd.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ def get_dir(self):
5151
returnself.git_dir
5252

5353
defexecute(self,command,
54-
istream=None,
55-
with_status=False,
56-
with_stderr=False,
57-
with_exceptions=False,
58-
with_raw_output=False,
54+
istream=None,
55+
with_status=False,
56+
with_stderr=False,
57+
with_exceptions=False,
58+
with_raw_output=False,
5959
):
6060
"""
6161
Handles executing the command on the shell and consumes and returns
@@ -96,10 +96,10 @@ def execute(self, command,
9696

9797
# Start the process
9898
proc=subprocess.Popen(command,
99-
cwd=self.git_dir,
100-
stdin=istream,
101-
stderr=stderr,
102-
stdout=subprocess.PIPE
99+
cwd=self.git_dir,
100+
stdin=istream,
101+
stderr=stderr,
102+
stdout=subprocess.PIPE
103103
)
104104

105105
# Wait for the process to return

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ def make_release_tree (self, base_dir, files):
2828
ifhasattr(os,'link')andpath.exists(dest):
2929
os.unlink(dest)
3030
self.copy_file(orig,dest)
31-
#_stamp_version(dest)
31+
_stamp_version(dest)
3232

3333
def_stamp_version(filename):
3434
found,out=False, []
3535
f=open(filename,'r')
3636
forlineinf:
3737
if'__version__ ='inline:
38-
line=line.replace("'svn'","'%s'"%VERSION)
38+
line=line.replace("'git'","'%s'"%VERSION)
3939
found=True
4040
out.append(line)
4141
f.close()

‎test/git/test_git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ def test_it_handles_large_input(self):
5959
@patch(Git,'execute')
6060
deftest_it_ignores_false_kwargs(self,git):
6161
# this_should_not_be_ignored=False implies it *should* be ignored
62-
output=self.git.version(pass_this_kwarg=False)
63-
assert_true("pass_this_kwarg"notingit.call_args[1])
62+
output=self.git.version(pass_this_kwarg=False)
63+
assert_true("pass_this_kwarg"notingit.call_args[1])

‎test/testlib/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
GIT_REPO=os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
44

55
deffixture_path(name):
6-
test_dir=os.path.dirname(os.path.dirname(__file__))
6+
test_dir=os.path.dirname(os.path.dirname(__file__))
77
returnos.path.join(test_dir,"fixtures",name)
88

99
deffixture(name):

0 commit comments

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