Mercurial Mercurial > hg / 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/patch.py
changeset 24021 f51a822dcf3b
parent 24020 cc81e6da0757
child 24022 da63f557d0dc 
--- a/mercurial/patch.py	Fri Jan 16 14:58:06 2015 -0800
+++ b/mercurial/patch.py	Fri Jan 16 14:58:51 2015 -0800
@@ -1753,13 +1753,13 @@
         aprefix = 'a/'
         bprefix = 'b/'
 
-    def diffline(a, b, revs):
+    def diffline(f, revs):
         if not repo.ui.quiet:
             if revs:
                 revinfo = ' '.join(["-r %s" % rev for rev in revs])
-                line = 'diff %s %s\n' % (revinfo, a)
+                line = 'diff %s %s\n' % (revinfo, f)
             else:
-                line = 'diff %s\n' % a
+                line = 'diff %s\n' % f
         else:
             line = ''
         return line
@@ -1846,7 +1846,7 @@
         path2 = posixpath.join(prefix, f2)
         header = []
         if revs:
-            header.append(diffline(path1, path2, revs))
+            header.append(diffline(path1, revs))
         elif opts.git:
             header.append('diff --git %s%s %s%s\n' %
                           (aprefix, path1, bprefix, path2))
Mercurial