[PATCH 11 of 15] some fixes, now supports clone from httprepo with -r argument

Pradeepkumar Gayam in3xes at gmail.com
Mon Jul 12 05:49:53 CDT 2010


# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1278918509 -19800
# Branch stable
# Node ID 5cbf744770059217f22720b935e889f841c9b508
# Parent  80e7ed5acc92171cc21c8d0bbced5c486ff5b0b0
some fixes, now supports clone from httprepo with -r argument

diff -r 80e7ed5acc92 -r 5cbf74477005 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Jul 12 02:05:56 2010 +0530
+++ b/mercurial/localrepo.py	Mon Jul 12 12:38:29 2010 +0530
@@ -1203,7 +1203,7 @@
                     raise util.Abort(_("Partial pull cannot be done because "
                                        "other repository doesn't support "
                                        "changegroupsubset."))
-                cg = remote.changegroupsubset(fetch, heads, 'pull')
+                cg = remote.changegroupsubset(fetch, heads, 'pull', pdelta=pdelta)
             return self.addchangegroup(cg, 'pull', remote.url(), lock=lock,
                                        pdelta=pdelta)
         finally:
diff -r 80e7ed5acc92 -r 5cbf74477005 mercurial/revlog.py
--- a/mercurial/revlog.py	Mon Jul 12 02:05:56 2010 +0530
+++ b/mercurial/revlog.py	Mon Jul 12 12:38:29 2010 +0530
@@ -1008,7 +1008,7 @@
 
     def revdiff(self, rev1, rev2):
         """return or calculate a delta between two revisions"""
-        if rev1 != nullrev  and self.deltaparent(rev) == rev1:
+        if rev1 != nullrev  and self.deltaparent(rev2) == rev1:
             return self._chunk(rev2)
 
         return mdiff.textdiff(self.revision(self.node(rev1)),


More information about the Mercurial-devel mailing list