~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a boundary to parse_patches()
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index
42b0d12
..
0e83ffc
100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-182,9
+182,14
@@
def __run(cmd, args=None):
return 0
def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
return 0
def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
- noexclude = True):
+ noexclude = True
, verbose = False
):
"""Returns a list of pairs - [status, filename]
"""
"""Returns a list of pairs - [status, filename]
"""
+ if verbose:
+ print >> sys.stderr, \
+ 'Checking for changes in the working directory...',
+ sys.stderr.flush()
+
refresh_index()
if not files:
refresh_index()
if not files:
@@
-221,12
+226,15
@@
def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
if fs[1] not in conflicts:
cache_files.append(fs)
if fs[1] not in conflicts:
cache_files.append(fs)
+ if verbose:
+ print >> sys.stderr, 'done'
+
return cache_files
def local_changes():
"""Return true if there are local changes in the tree
"""
return cache_files
def local_changes():
"""Return true if there are local changes in the tree
"""
- return len(__tree_status()) != 0
+ return len(__tree_status(
verbose = True
)) != 0
# HEAD value cached
__head = None
# HEAD value cached
__head = None
@@
-401,7
+409,7
@@
def update_cache(files = None, force = False):
if not files:
files = []
if not files:
files = []
- cache_files = __tree_status(files)
+ cache_files = __tree_status(files
, verbose = False
)
# everything is up-to-date
if len(cache_files) == 0:
# everything is up-to-date
if len(cache_files) == 0:
@@
-508,8
+516,12
@@
def merge(base, head1, head2):
local tree
"""
refresh_index()
local tree
"""
refresh_index()
- if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0:
- raise GitException, 'git-read-tree failed (local changes maybe?)'
+
+ try:
+ # use _output() to mask the verbose prints of the tool
+ _output('git-merge-recursive %s -- %s %s' % (base, head1, head2))
+ except GitException:
+ pass
# check the index for unmerged entries
files = {}
# check the index for unmerged entries
files = {}
@@
-698,31
+710,45
@@
def pull(repository = 'origin', refspec = None):
if __run(config.get('stgit', 'pullcmd'), args) != 0:
raise GitException, 'Failed "git-pull %s"' % repository
if __run(config.get('stgit', 'pullcmd'), args) != 0:
raise GitException, 'Failed "git-pull %s"' % repository
-def apply_patch(filename = None, base = None):
+def repack():
+ """Repack all objects into a single pack
+ """
+ __run('git-repack -a -d -f')
+
+def apply_patch(filename = None, diff = None, base = None,
+ fail_dump = True):
"""Apply a patch onto the current or given index. There must not
be any local changes in the tree, otherwise the command fails
"""
"""Apply a patch onto the current or given index. There must not
be any local changes in the tree, otherwise the command fails
"""
- def __apply_patch():
- if filename:
- return __run('git-apply --index', [filename]) == 0
- else:
- try:
- _input('git-apply --index', sys.stdin)
- except GitException:
- return False
- return True
-
if base:
orig_head = get_head()
switch(base)
else:
if base:
orig_head = get_head()
switch(base)
else:
- refresh_index() # needed since __apply_patch() doesn't do it
+ refresh_index()
+
+ if diff is None:
+ if filename:
+ f = file(filename)
+ else:
+ f = sys.stdin
+ diff = f.read()
+ if filename:
+ f.close()
- if not __apply_patch():
+ try:
+ _input_str('git-apply --index', diff)
+ except GitException:
if base:
switch(orig_head)
if base:
switch(orig_head)
- raise GitException, 'Patch does not apply cleanly'
- elif base:
+ if fail_dump:
+ # write the failed diff to a file
+ f = file('.stgit-failed.patch', 'w+')
+ f.write(diff)
+ f.close()
+
+ raise
+
+ if base:
top = commit(message = 'temporary commit used for applying a patch',
parents = [base])
switch(orig_head)
top = commit(message = 'temporary commit used for applying a patch',
parents = [base])
switch(orig_head)