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

Appearance settings

Commit ef9395f

Browse filesBrowse files
committed
Merge branch 'master' of git://gitorious.org/git-python/mainline
2 parents 24effa4 + 9aa93b5 commit ef9395f
Copy full SHA for ef9395f

5 files changed

+15-18Lines changed: 15 additions & 18 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/git/__init__.py‎

Copy file name to clipboardExpand all lines: lib/git/__init__.py
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import os
22
import inspect
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
from git.actor import Actor
107
from git.blob import Blob
Collapse file

‎lib/git/cmd.py‎

Copy file name to clipboardExpand all lines: lib/git/cmd.py
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ def get_dir(self):
5151
return self.git_dir
5252

5353
def execute(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
Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py
+2-2Lines 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
if hasattr(os, 'link') and path.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
for line in f:
3737
if '__version__ =' in line:
38-
line = line.replace("'svn'", "'%s'" % VERSION)
38+
line = line.replace("'git'", "'%s'" % VERSION)
3939
found = True
4040
out.append(line)
4141
f.close()
Collapse file

‎test/git/test_git.py‎

Copy file name to clipboardExpand all lines: test/git/test_git.py
+2-2Lines 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
def test_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" not in git.call_args[1] )
62+
output = self.git.version(pass_this_kwarg=False)
63+
assert_true("pass_this_kwarg" not in git.call_args[1])
Collapse file

‎test/testlib/helper.py‎

Copy file name to clipboardExpand all lines: test/testlib/helper.py
+1-1Lines 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
def fixture_path(name):
6-
test_dir = os.path.dirname( os.path.dirname(__file__) )
6+
test_dir = os.path.dirname(os.path.dirname(__file__))
77
return os.path.join(test_dir, "fixtures", name)
88

99
def fixture(name):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.