[PATCH 4 of 4 V3 part 2] rebase: use lazy ancestor membership testing
Siddharth Agarwal
sid0 at fb.com
Mon Dec 17 23:30:13 CST 2012
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1355806281 28800
# Node ID 4cda1a1e5675bc46ed4e878170c2ed26e783f769
# Parent 952ec71894acfbd8ff7f9f831ce6a6d1060e5ccc
rebase: use lazy ancestor membership testing
For a repository with over 400,000 commits, rebasing one revision near tip,
this avoids one walk up the DAG, speeding the operation up by around 0.8
seconds.
diff -r 952ec71894ac -r 4cda1a1e5675 hgext/rebase.py
--- a/hgext/rebase.py Mon Dec 17 20:43:37 2012 -0800
+++ b/hgext/rebase.py Mon Dec 17 20:51:21 2012 -0800
@@ -214,8 +214,8 @@
else:
originalwd, target, state = result
if collapsef:
- targetancestors = set(repo.changelog.ancestors([target]))
- targetancestors.add(target)
+ targetancestors = repo.changelog.ancestors([target],
+ inclusive=True)
external = checkexternal(repo, state, targetancestors)
if keepbranchesf:
@@ -233,8 +233,7 @@
# Rebase
if not targetancestors:
- targetancestors = set(repo.changelog.ancestors([target]))
- targetancestors.add(target)
+ targetancestors = repo.changelog.ancestors([target], inclusive=True)
# Keep track of the current bookmarks in order to reset them later
currentbookmarks = repo._bookmarks.copy()
More information about the Mercurial-devel
mailing list