[PATCH hglib] client: fix diff indentation and position

Idan Kamara idankk86 at gmail.com
Fri Aug 19 14:27:42 CDT 2011


# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1313782060 -10800
# Node ID 312f1326e1b1fe6dc8eb3fcebfa9cbcb9e56767a
# Parent  f273484eb2c723e3d4b0c6304bc53172cc37a762
client: fix diff indentation and position

diff -r f273484eb2c7 -r 312f1326e1b1 hglib/client.py
--- a/hglib/client.py	Fri Aug 19 22:24:14 2011 +0300
+++ b/hglib/client.py	Fri Aug 19 22:27:40 2011 +0300
@@ -370,6 +370,22 @@
 
         return bool(eh)
 
+    def diff(self, files=[], revs=[], change=None, text=False,
+             git=False, nodates=False, showfunction=False, reverse=False,
+             ignoreallspace=False, ignorespacechange=False, ignoreblanklines=False,
+             unified=None, stat=False, subrepos=False, include=None, exclude=None):
+        if change and revs:
+            raise ValueError('cannot specify both change and rev')
+
+        args = cmdbuilder('diff', *files, r=revs, c=change,
+                          a=text, g=git, nodates=nodates,
+                          p=showfunction, reverse=reverse,
+                          w=ignoreallspace, b=ignorespacechange,
+                          B=ignoreblanklines, U=unified, stat=stat,
+                          S=subrepos, I=include, X=exclude)
+
+        return self.rawcommand(args)
+
     def export(self, revs, output=None, switchparent=False, text=False, git=False,
                nodates=False):
         """
@@ -453,22 +469,6 @@
         out = self.rawcommand(args, eh=eh).split('\0')[:-1]
         return self._parserevs(out)
 
-    def diff(self, files=[], revs=[], change=None, text=False,
-             git=False, nodates=False, showfunction=False, reverse=False,
-             ignoreallspace=False, ignorespacechange=False, ignoreblanklines=False,
-             unified=None, stat=False, subrepos=False, include=None, exclude=None):
-            if change and revs:
-                raise ValueError('cannot specify both change and rev')
-
-            args = cmdbuilder('diff', *files, r=revs, c=change,
-                              a=text, g=git, nodates=nodates,
-                              p=showfunction, reverse=reverse,
-                              w=ignoreallspace, b=ignorespacechange,
-                              B=ignoreblanklines, U=unified, stat=stat,
-                              S=subrepos, I=include, X=exclude)
-
-            return self.rawcommand(args)
-
     def identify(self, rev=None, source=None, num=False, id=False, branch=False,
                  tags=False, bookmarks=False):
         args = cmdbuilder('identify', source, r=rev, n=num, i=id, b=branch, t=tags,


More information about the Mercurial-devel mailing list