From: Paolo 'Blaisorblade' Giarrusso Date: Fri, 16 Sep 2005 19:35:15 +0000 (+0200) Subject: stg diff / files: don't update directory cache X-Git-Tag: v0.14.3~675 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/537ddf3fcbb207659094a19acd83ac7b83d4deb1 stg diff / files: don't update directory cache Do git-update-cache only when diffing with the working tree, not otherwise. Spending something like 1min for a stg files is bad - yes, my laptop was really busy and the Linux tree was probably cache-cold, but that's just not needed. Also, in diffstat we currently do it both by hand and by calling git.diff. And in files there's no need at all for that - even the comments says that "files" has only to do with committed changes. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- diff --git a/stgit/git.py b/stgit/git.py index 20c84c8..ae5506b 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -387,11 +387,11 @@ def status(files = [], modified = False, new = False, deleted = False, def diff(files = [], rev1 = 'HEAD', rev2 = None, out_fd = None): """Show the diff between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') if rev2: diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files) else: + os.system('git-update-cache --refresh > /dev/null') diff_str = _output(['git-diff-cache', '-p', rev1] + files) if out_fd: @@ -403,7 +403,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None): """Return the diffstat between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') p=popen2.Popen3('git-apply --stat') diff(files, rev1, rev2, p.tochild) p.tochild.close() @@ -415,7 +414,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None): def files(rev1, rev2): """Return the files modified between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') str = '' for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)):