Mercurial > hg > mercurial-crew

comparison hgext/rebase.py @ 22951:6c86c673dde6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: add createmarkers option The basic obsolete option is allowing the creation of obsolete markers. This does not enable other features, such as allowing unstable commits or exchanging obsolete markers.
author Durham Goode <durham@fb.com>
date Tue, 14 Oct 2014 13:23:52 -0700
parents 75d0edb68b41
children 8792ac090e3b
comparison
equal deleted inserted replaced
22950:bb8278b289ee 22951:6c86c673dde6
926 def clearrebased(ui, repo, state, skipped, collapsedas=None): 926 def clearrebased(ui, repo, state, skipped, collapsedas=None):
927 """dispose of rebased revision at the end of the rebase 927 """dispose of rebased revision at the end of the rebase
928 928
929 If `collapsedas` is not None, the rebase was a collapse whose result if the 929 If `collapsedas` is not None, the rebase was a collapse whose result if the
930 `collapsedas` node.""" 930 `collapsedas` node."""
931 if obsolete._enabled: 931 if obsolete.isenabled(repo, obsolete.createmarkersopt):
932 markers = [] 932 markers = []
933 for rev, newrev in sorted(state.items()): 933 for rev, newrev in sorted(state.items()):
934 if newrev >= 0: 934 if newrev >= 0:
935 if rev in skipped: 935 if rev in skipped:
936 succs = () 936 succs = ()