mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
1ab1ffa329
Summary: Now that the python-to-rust status path uses the same entry point as the pure-rust status, let's enable the python-to-rust in tests. Disables it for a few tests that are still failing. Many of these are because the tests are still using legacy configurations that the Rust code doesn't work with. Reviewed By: jordanwebster Differential Revision: D39753911 fbshipit-source-id: b1e27ef1926bc7b196a59b65bcc96881bd9e23b2
345 lines
6.8 KiB
Perl
345 lines
6.8 KiB
Perl
#chg-compatible
|
|
$ setconfig workingcopy.ruststatus=False
|
|
$ setconfig status.use-rust=False workingcopy.use-rust=False
|
|
$ setconfig experimental.allowfilepeer=True
|
|
|
|
$ enable rebase remotenames
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo A > A
|
|
$ hg ci -Am A
|
|
adding A
|
|
|
|
$ echo B > B
|
|
$ hg ci -Am B
|
|
adding B
|
|
|
|
$ echo C >> A
|
|
$ hg ci -m C
|
|
|
|
$ hg up -q -C 'desc(A)'
|
|
|
|
$ echo D >> A
|
|
$ hg ci -m D
|
|
|
|
$ echo E > E
|
|
$ hg ci -Am E
|
|
adding E
|
|
|
|
$ cd ..
|
|
|
|
|
|
Changes during an interruption - continue:
|
|
|
|
$ hg clone -q -u . a a1
|
|
$ cd a1
|
|
|
|
$ tglog
|
|
@ ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ o 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Force a commit on C during the interruption:
|
|
|
|
$ hg up -q -C 'desc(C)' --config 'extensions.rebase=!'
|
|
|
|
$ echo 'Extra' > Extra
|
|
$ hg add Extra
|
|
$ hg ci -m 'Extra' --config 'extensions.rebase=!'
|
|
|
|
$ tglogp
|
|
@ deb5d2f93d8b draft 'Extra'
|
|
│
|
|
│ o 45396c49d53b draft 'B'
|
|
│ │
|
|
│ o ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
│ o 46b37eabc604 draft 'D'
|
|
│ │
|
|
o │ 965c486023db draft 'C'
|
|
│ │
|
|
x │ 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
Resume the rebasing:
|
|
|
|
$ hg rebase --continue
|
|
already rebased 27547f69f254 "B" as 45396c49d53b
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
|
|
$ hg rebase --continue
|
|
already rebased 27547f69f254 "B" as 45396c49d53b
|
|
rebasing 965c486023db "C"
|
|
|
|
$ tglogp
|
|
o d2d25e26288e draft 'C'
|
|
│
|
|
│ o deb5d2f93d8b draft 'Extra'
|
|
│ │
|
|
o │ 45396c49d53b draft 'B'
|
|
│ │
|
|
@ │ ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
o │ 46b37eabc604 draft 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ x 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
$ cd ..
|
|
|
|
|
|
Changes during an interruption - abort:
|
|
|
|
$ hg clone -q -u . a a2
|
|
$ cd a2
|
|
|
|
$ tglog
|
|
@ ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ o 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Force a commit on B' during the interruption:
|
|
|
|
$ hg up -q -C 'max(desc(B))' --config 'extensions.rebase=!'
|
|
|
|
$ echo 'Extra' > Extra
|
|
$ hg add Extra
|
|
$ hg ci -m 'Extra' --config 'extensions.rebase=!'
|
|
|
|
$ tglog
|
|
@ 402ee3642b59 'Extra'
|
|
│
|
|
o 45396c49d53b 'B'
|
|
│
|
|
o ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ x 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
Abort the rebasing:
|
|
|
|
$ hg rebase --abort
|
|
warning: new changesets detected on destination branch, can't strip
|
|
rebase aborted
|
|
|
|
$ tglog
|
|
@ 402ee3642b59 'Extra'
|
|
│
|
|
o 45396c49d53b 'B'
|
|
│
|
|
o ae36e8e3dfd7 'E'
|
|
│
|
|
o 46b37eabc604 'D'
|
|
│
|
|
│ o 965c486023db 'C'
|
|
│ │
|
|
│ x 27547f69f254 'B'
|
|
├─╯
|
|
o 4a2df7238c3b 'A'
|
|
|
|
$ cd ..
|
|
|
|
Changes during an interruption - abort (again):
|
|
|
|
$ hg clone -q -u . a a3
|
|
$ cd a3
|
|
|
|
$ tglogp
|
|
@ ae36e8e3dfd7 draft 'E'
|
|
│
|
|
o 46b37eabc604 draft 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
Rebasing B onto E:
|
|
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)'
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
Change phase on B and B'
|
|
|
|
$ hg up -q -C 'max(desc(B))' --config 'extensions.rebase=!'
|
|
$ hg debugmakepublic 'desc(B)'
|
|
|
|
$ tglogp
|
|
@ 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
Abort the rebasing:
|
|
|
|
$ hg rebase --abort
|
|
warning: can't clean up public changesets 45396c49d53b
|
|
rebase aborted
|
|
|
|
$ tglogp
|
|
@ 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
Test rebase interrupted by hooks
|
|
|
|
$ hg up 'desc(C)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo F > F
|
|
$ hg add F
|
|
$ hg ci -m F
|
|
|
|
$ cd ..
|
|
|
|
(precommit version)
|
|
|
|
$ cp -R a3 hook-precommit
|
|
$ cd hook-precommit
|
|
$ hg rebase --source 'desc(C)' --dest 'max(desc(B))' --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
|
|
rebasing 965c486023db "C"
|
|
M A
|
|
rebasing a0b2430ebfb8 "F"
|
|
abort: precommit hook exited with status 1
|
|
[255]
|
|
$ tglogp
|
|
@ 401ccec5e39f draft 'C'
|
|
│
|
|
│ @ a0b2430ebfb8 draft 'F'
|
|
│ │
|
|
o │ 45396c49d53b public 'B'
|
|
│ │
|
|
o │ ae36e8e3dfd7 public 'E'
|
|
│ │
|
|
o │ 46b37eabc604 public 'D'
|
|
│ │
|
|
│ x 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ hg rebase --continue
|
|
already rebased 965c486023db "C" as 401ccec5e39f
|
|
rebasing a0b2430ebfb8 "F"
|
|
$ tglogp
|
|
@ 6e92a149ac6b draft 'F'
|
|
│
|
|
o 401ccec5e39f draft 'C'
|
|
│
|
|
o 45396c49d53b public 'B'
|
|
│
|
|
o ae36e8e3dfd7 public 'E'
|
|
│
|
|
o 46b37eabc604 public 'D'
|
|
│
|
|
│ o 27547f69f254 public 'B'
|
|
├─╯
|
|
o 4a2df7238c3b public 'A'
|
|
|
|
$ cd ..
|
|
|
|
Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo a > a
|
|
$ hg commit -qAm base
|
|
$ echo b >> a
|
|
$ hg commit -qm b
|
|
$ hg up '.^'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c >> a
|
|
$ hg commit -qm c
|
|
$ hg rebase -s 'max(desc(b))' -d 'desc(c)' --noninteractive
|
|
rebasing fdaca8533b86 "b"
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ echo a > a
|
|
$ echo c >> a
|
|
$ hg resolve --mark a
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
rebasing fdaca8533b86 "b"
|
|
note: rebase of fdaca8533b86 created no changes to commit
|
|
$ hg resolve --list
|
|
$ test -f .hg/merge
|
|
[1]
|