Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphlog: fix --follow FILE and relative paths
authorPatrick Mezard <patrick@mezard.eu>
Sat, 14 Apr 2012 11:27:11 +0200
changeset 16434 8b62a77d0895
parent 16433 e38b29937118
child 16435 df347129305d
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.
hgext/graphlog.py file | annotate | diff | comparison | revisions
tests/test-glog.t file | annotate | diff | comparison | revisions 
--- 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:
--- a/tests/test-glog.t	Sat Apr 14 11:16:57 2012 +0200
+++ b/tests/test-glog.t	Sat Apr 14 11:27:11 2012 +0200
@@ -2026,6 +2026,20 @@
           ('string', 'r:')
           ('string', 'd:relpath'))
         ('string', 'p:.'))))
+  $ testlog ../b
+  []
+  (group
+    (group
+      (func
+        ('symbol', 'filelog')
+        ('string', '../b'))))
+  $ testlog -f ../b
+  []
+  (group
+    (group
+      (func
+        ('symbol', 'follow')
+        ('string', 'b'))))
   $ cd ..
 
 Test --hidden
Mercurial