equal
deleted
inserted
replaced
990 Changeset is a merge changeset. |
990 Changeset is a merge changeset. |
991 """ |
991 """ |
992 # i18n: "merge" is a keyword |
992 # i18n: "merge" is a keyword |
993 getargs(x, 0, 0, _("merge takes no arguments")) |
993 getargs(x, 0, 0, _("merge takes no arguments")) |
994 cl = repo.changelog |
994 cl = repo.changelog |
995 return baseset([r for r in subset if cl.parentrevs(r)[1] != -1]) |
995 return lazyset(subset, lambda r: cl.parentrevs(r)[1] != -1) |
996 |
996 |
997 def branchpoint(repo, subset, x): |
997 def branchpoint(repo, subset, x): |
998 """``branchpoint()`` |
998 """``branchpoint()`` |
999 Changesets with more than one child. |
999 Changesets with more than one child. |
1000 """ |
1000 """ |