~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make stgit.config use git-repo-config.
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index
cdf15fd
..
249080e
100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-397,6
+397,11
@@
def rename_branch(from_name, to_name):
rename(os.path.join(basedir.get(), 'refs', 'heads'),
from_name, to_name)
rename(os.path.join(basedir.get(), 'refs', 'heads'),
from_name, to_name)
+ reflog_dir = os.path.join(basedir.get(), 'logs', 'refs', 'heads')
+ if os.path.exists(reflog_dir) \
+ and os.path.exists(os.path.join(reflog_dir, from_name)):
+ rename(reflog_dir, from_name, to_name)
+
def add(names):
"""Add the files or recursively add the directory contents
"""
def add(names):
"""Add the files or recursively add the directory contents
"""
@@
-444,10
+449,10
@@
def user():
"""
global __user
if not __user:
"""
global __user
if not __user:
- if config.has_option('user', 'name') \
- and config.has_option('user', 'email'):
- __user = Person(config.get('user', 'name'),
-
config.get('user', 'email')
)
+ name=config.get('user.name')
+ email=config.get('user.email')
+ if name and email:
+
__user = Person(name, email
)
else:
raise GitException, 'unknown user details'
return __user;
else:
raise GitException, 'unknown user details'
return __user;
@@
-683,6
+688,8
@@
def status(files = None, modified = False, new = False, deleted = False,
cache_files = [x for x in cache_files if x[0] in filestat]
for fs in cache_files:
cache_files = [x for x in cache_files if x[0] in filestat]
for fs in cache_files:
+ if files and not fs[1] in files:
+ continue
if all:
print '%s %s' % (fs[0], fs[1])
else:
if all:
print '%s %s' % (fs[0], fs[1])
else:
@@
-811,7
+818,7
@@
def pull(repository = 'origin', refspec = None):
if refspec:
args.append(refspec)
if refspec:
args.append(refspec)
- if __run(config.get('stgit
', '
pullcmd'), args) != 0:
+ if __run(config.get('stgit
.
pullcmd'), args) != 0:
raise GitException, 'Failed "git-pull %s"' % repository
def repack():
raise GitException, 'Failed "git-pull %s"' % repository
def repack():