diff hgext/graphlog.py @ 16434:8b62a77d0895

graphlog: fix --follow FILE and relative paths The situation is complicated because filelog() revset uses a match object in relpath mode while follow() revset interprets the filename as a manifest entry.
author Patrick Mezard <patrick@mezard.eu>
date Sat, 14 Apr 2012 11:27:11 +0200
parents e38b29937118
children 38caf405d010
line wrap: on
line diff
--- a/hgext/graphlog.py	Sat Apr 14 11:16:57 2012 +0200
+++ b/hgext/graphlog.py	Sat Apr 14 11:27:11 2012 +0200
@@ -353,7 +353,9 @@
             fnopats = (('_ancestors', '_fancestors'),
                        ('_descendants', '_fdescendants'))
             if pats:
-                opts[fpats[followfirst]] = list(pats)
+                # follow() revset inteprets its file argument as a
+                # manifest entry, so use match.files(), not pats.
+                opts[fpats[followfirst]] = list(match.files())
             else:
                 opts[fnopats[followdescendants][followfirst]] = str(startrev)
         else: