Commits

Martin Geisler committed a74ea80

rebased to 296e78744d32

  • Participants
  • Parent commits 82a1394

Comments (0)

Files changed (1)

File implementation

 # HG changeset patch
 # User Henrik Stuart <hg@hstuart.dk>
 # Date 1297282594 -3600
-# Node ID 1351df650cb0dc4e3685acc733b86ea76a21400c
-# Parent  73cfb7a5aa5630e70f77bf4399b07f64c89b0dfa
+# Node ID 1fba6e896fe1666b2e4f22cd498f4184c71ac7cc
+# Parent  296e78744d32a41f3a06ec2afc364342073767f5
 add support for marking changesets as dead
 
 Marking a changeset as dead is, if it is a head, a way to delete a
          finally:
              if lock is not None:
                  lock.release()
-@@ -1452,7 +1475,7 @@
+@@ -1450,7 +1473,7 @@
  
          # can we go through the fast path ?
          heads.sort()
--        allheads = self.heads()
-+        allheads = self.heads(dead=True)
-         allheads.sort()
-         if heads == allheads:
-             return self._changegroup(msng_cl_lst, source)
-@@ -1623,9 +1646,9 @@
+-        if heads == sorted(self.heads()):
++        if heads == sorted(self.heads(dead=True)):
+             return self._changegroup(csets, source)
+ 
+         # slow path
+@@ -1598,9 +1621,9 @@
  
          return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
  
  
      def _changegroup(self, nodes, source):
          """Compute the changegroup of all nodes that we have that a recipient
-@@ -1711,7 +1734,8 @@
+@@ -1686,7 +1709,8 @@
  
          return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
  
          """Add the changegroup returned by source.read() to this repo.
          srctype is a string like 'push', 'pull', or 'unbundle'.  url is
          the URL of the repo where this changegroup is coming from.
-@@ -1935,7 +1959,7 @@
+@@ -1910,7 +1934,7 @@
          finally:
              lock.release()
  
          '''clone remote repository.
  
          keyword arguments:
-@@ -1950,7 +1974,7 @@
+@@ -1925,7 +1949,7 @@
          # and format flags on "stream" capability, and use
          # uncompressed only if compatible.
  
              # 'stream' means remote revlog format is revlogv1 only
              if remote.capable('stream'):
                  return self.stream_in(remote, set(('revlogv1',)))
-@@ -1961,7 +1985,7 @@
+@@ -1936,7 +1960,7 @@
                  # if we support it, stream in and adjust our requirements
                  if not streamreqs - self.supportedformats:
                      return self.stream_in(remote, streamreqs)