Commits

Sune Foldager  committed 551e8a6

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().

  • Participants
  • Parent commits 29bce1f

Comments (0)

Files changed (1)

File hggtk/changeset.py

         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