Mercurial > hgsubversion

diff push_cmd.py @ 151:2decec74ad0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: Use a better method for finding the outgoing revisions.
author Augie Fackler <durin42@gmail.com>
date Mon, 22 Dec 2008 21:21:39 -0600
parents 58ae90a65f41
children 1fde85a10f9e
line wrap: on
line diff
--- a/push_cmd.py
+++ b/push_cmd.py
@@ -1,5 +1,6 @@
 from mercurial import util as merc_util
 from mercurial import hg
+from mercurial import node
 from svn import core
 
 import util
@@ -71,13 +72,13 @@ def push_revisions_to_subversion(ui, rep
             hg.clean(repo, needs_transplant)
             utility_commands.rebase_commits(ui, repo, hg_repo_path, extrafn=extrafn, **opts)
             repo = hg.repository(ui, hge.path)
-            if needs_transplant in outgoing:
-                hg.clean(repo, repo['tip'].node())
-                hge = hg_delta_editor.HgChangeReceiver(hg_repo_path, ui_=ui)
-                svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
-                                             hge.revmap.iterkeys()))
-                outgoing = util.outgoing_revisions(ui, repo, hge,
-                                                   svn_commit_hashes)
+            for child in repo[replacement.node()].children():
+                rebasesrc = node.bin(child.extra().get('rebase_source', node.hex(node.nullid)))
+                if rebasesrc in outgoing:
+                    rebsrcindex = outgoing.index(rebasesrc)
+                    outgoing = outgoing[0:rebsrcindex] + [child.node(), ] + outgoing[rebsrcindex+1:]
+        hge = hg_delta_editor.HgChangeReceiver(hg_repo_path, ui_=ui)
+        svn_commit_hashes = dict(zip(hge.revmap.itervalues(), hge.revmap.iterkeys()))
     merc_util._encoding = oldencoding
     return 0