Mercurial > hg
view tests/test-rebase-newancestor.t @ 22717:b89f7e3a414d
spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods
Instead of having the direction of iteration enforced through the ordering of
`start` and `end` attributes of spanset, we encode the iteration direction in
an explicit attribute and always store start < end. The logic for sort and
reverse has to be updated. The __iter__ is now based on the newly introduced
`fastasc` and `fastdesc` methods.
This will allow other code simplifications in the future.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 02 Oct 2014 18:02:17 -0500 |
parents | aa9385f983fa |
children | 65f215ea3e8e |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF $ hg init repo $ cd repo $ echo A > a $ echo >> a $ hg ci -Am A adding a $ echo B > a $ echo >> a $ hg ci -m B $ echo C > a $ echo >> a $ hg ci -m C $ hg up -q -C 0 $ echo D >> a $ hg ci -Am AD created new head $ hg tglog @ 3: 'AD' | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' $ hg rebase -s 1 -d 3 merging a merging a saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) $ hg tglog o 3: 'C' | o 2: 'B' | @ 1: 'AD' | o 0: 'A' $ cd ..