Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 24455 16961d43dc89
parent 24451 c3bbafef25d6
child 24463 06d199e66bbc 
--- a/mercurial/cmdutil.py	Wed Mar 25 15:58:31 2015 -0400
+++ b/mercurial/cmdutil.py	Wed Mar 25 11:55:15 2015 -0700
@@ -1008,7 +1008,7 @@
 
 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
                    changes=None, stat=False, fp=None, prefix='',
-                   relative='', listsubrepos=False):
+                   root='', listsubrepos=False):
     '''show diff or diffstat.'''
     if fp is None:
         write = ui.write
@@ -1016,8 +1016,8 @@
         def write(s, **kw):
             fp.write(s)
 
-    if relative:
-        relroot = pathutil.canonpath(repo.root, repo.getcwd(), relative)
+    if root:
+        relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
     else:
         relroot = ''
     if relroot != '':
mercurial