diff options
author | Bogdano Arendartchuk <bogdano@mandriva.org> | 2007-06-21 21:13:09 +0000 |
---|---|---|
committer | Bogdano Arendartchuk <bogdano@mandriva.org> | 2007-06-21 21:13:09 +0000 |
commit | a33584cd9bb62037c4749987ee70972836ae37de (patch) | |
tree | b98ec9026f0fa60b39bd27acc2240ee10852d6e9 /RepSys/svn.py | |
parent | 5dcc5a423c1945f68c3375373630a3e044a75414 (diff) | |
download | mgarepo-a33584cd9bb62037c4749987ee70972836ae37de.tar mgarepo-a33584cd9bb62037c4749987ee70972836ae37de.tar.gz mgarepo-a33584cd9bb62037c4749987ee70972836ae37de.tar.bz2 mgarepo-a33584cd9bb62037c4749987ee70972836ae37de.tar.xz mgarepo-a33584cd9bb62037c4749987ee70972836ae37de.zip |
fixed SVN.diff to not pass revision1 twice
Diffstat (limited to 'RepSys/svn.py')
-rw-r--r-- | RepSys/svn.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/RepSys/svn.py b/RepSys/svn.py index 683a691..527b1e5 100644 --- a/RepSys/svn.py +++ b/RepSys/svn.py @@ -173,14 +173,16 @@ class SVN: if entry.text_status is not unversioned] return st - def diff(self, *args, **kwargs): + def diff(self, path1, *args, **kwargs): head = pysvn.Revision(pysvn.opt_revision_kind.head) revision1 = kwargs.pop("revision1", head) revision2 = kwargs.pop("revision2", head) + if args: + kwargs["url_or_path2"] = args[0] tmpdir = tempfile.gettempdir() meth = self._client_wrap("diff") - diff_text = meth(tmpdir, revision1=revision1, revision2=revision2, - *args, **kwargs) + diff_text = meth(tmpdir, path1, revision1=revision1, + revision2=revision2, **kwargs) return diff_text def _edit_message(self, message): |