mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
99386e40fd
Summary: debuginhibit was removed since we no longer have a separate inhibit state. smartlog hack about changing "o" to "x" was removed since "obsolete()" revset is correct and the hack is unnecessary now. directaccess was removed from tests since inhibit does not depend on it. `- obsolete()` was added to some revsets to avoid divergence and other surprises. Use `inhibit.revive` API in infinitepush and reset to revive changesets properly. Remove various hacky code that mangle inhibit state in corner cases. Most test changes are `o` changed to `x` in output since we draw `obsolete()` state correctly now. `test-infinitepush-backup-remotefilelog.t` change was because output could be `bytes/sec` instead of `KB/sec`. Test Plan: arc unit Reviewers: #mercurial, kulshrax Reviewed By: kulshrax Subscribers: kulshrax, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5391361 Signature: t1:5391361:1499722618:d3c1cf629f0c59ecdf1dfd5e653c1eb6176646b8
37 lines
633 B
Perl
37 lines
633 B
Perl
Set up test environment.
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers, allowunstable
|
|
> EOF
|
|
$ showgraph() {
|
|
> hg log --graph -T "{rev} {desc|firstline}" | sed \$d
|
|
> }
|
|
|
|
Test that rebased commits that would cause instability are inhibited.
|
|
$ hg init repo && cd repo
|
|
$ hg debugbuilddag -m '+3 *3'
|
|
$ showgraph
|
|
o 3 r3
|
|
|
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
$ hg rebase -r 1 -d 3
|
|
rebasing 1:* "r1" (glob)
|
|
merging mf
|
|
$ showgraph
|
|
o 4 r1
|
|
|
|
|
o 3 r3
|
|
|
|
|
| o 2 r2
|
|
| |
|
|
| x 1 r1
|
|
|/
|
|
o 0 r0
|