Commits

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

Comments (0)

Files changed (1)

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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.