chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5d8a4f
)
Teach new infrastructure to diff two trees
author
Karl Hasselström
<kha@treskal.com>
Mon, 28 Jan 2008 23:11:59 +0000
(
00:11
+0100)
committer
Karl Hasselström
<kha@treskal.com>
Sun, 10 Feb 2008 14:46:38 +0000
(15:46 +0100)
Nothing uses this yet, but "stg edit" will soon.
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/lib/git.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/lib/git.py
b/stgit/lib/git.py
index 45879df69664069488d57af7c9d68f228cf1e3af..d75f724c55f1b7b6cc9771f4e96cdfba03d2454a 100644
(file)
--- a/
stgit/lib/git.py
+++ b/
stgit/lib/git.py
@@
-356,6
+356,11
@@
class Repository(RunWithEnv):
return None
finally:
index.delete()
+ def diff_tree(self, t1, t2, diff_opts):
+ assert isinstance(t1, Tree)
+ assert isinstance(t2, Tree)
+ return self.run(['git', 'diff-tree', '-p'] + list(diff_opts)
+ + [t1.sha1, t2.sha1]).raw_output()
class MergeException(exception.StgException):
pass