# HG changeset patch
# User Sune Foldager <[email protected]>
# Date 1239187237 -7200
# Node ID 0e63b18674a5705e6361a753a9c71f5e20cda654
# Parent 2cc5fba06b151d61b174b5b5ecdb52a84d13fa78
hgtk: show correct diff against the first parent in merge nodes
The changectx.files() method previously used to diff against the first
parent returns incomplete information. Files added or modified on the
second parent are not included. Instead, we now use repo.status().
diff -r 2cc5fba06b15 -r 0e63b18674a5 hggtk/changeset.py
--- a/hggtk/changeset.py Tue Apr 07 19:05:15 2009 -0500
+++ b/hggtk/changeset.py Wed Apr 08 12:40:37 2009 +0200
@@ -233,12 +233,9 @@
ctx1 = context.changectx(repo, node1) # parent
ctx2 = context.changectx(repo, node2) # current
- if node1 == repo.changelog.parents(node2)[0]:
- filelist = ctx2.files()
- else:
- changes = repo.status(node1, node2, None)[:5]
- modified, added, removed, deleted, unknown = changes
- filelist = modified + added + removed
+ changes = repo.status(node1, node2, None)[:5]
+ modified, added, removed, deleted, unknown = changes
+ filelist = modified + added + removed
# force manifest reading
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
