Mercurial > python-hglib
changeset 61:d0b9215180a4
client: fix diff indentation and position
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Fri, 19 Aug 2011 22:27:40 +0300 |
| parents | ce516ed9bc0d |
| children | d1f57f162274 |
| files | hglib/client.py |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hglib/client.py Fri Aug 19 20:15:03 2011 +0300 +++ b/hglib/client.py Fri Aug 19 22:27:40 2011 +0300 @@ -369,6 +369,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): """ @@ -452,22 +468,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,