mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
24e46bb082
Summary: The Rust strip logic works for both revlog and segmented changelog. Use it in tests for easier segmented changelog migration. The old revlog strip has a lot of complexities on linkrev. Since this is only used for testing, I avoided the complexities by just saying all linkrevs are invalidated so we can skip the complexities of dealing with filelog or manifest, or generating a temporary bundle and unbundling them later. Most test changes are because we no longer strip filelogs. So unbundling them will not add new file revisions. `test-repair-strip.t` is removed because it is only about "Permission Denied" cases. With the new code path file logs are not stripped and the test is not relevant. This does not affect hgsql as it has the Rust logic totally disabled. Reviewed By: DurhamG Differential Revision: D22402198 fbshipit-source-id: 1c207393f59a8a3a601cfbdf7f07534b8acf46bf
263 lines
7.3 KiB
Perl
263 lines
7.3 KiB
Perl
#chg-compatible
|
|
|
|
Set up extension and repos
|
|
|
|
$ enable remotenames
|
|
$ setconfig phases.publish=false
|
|
$ hg init repo1
|
|
$ hg clone repo1 repo2
|
|
updating to branch default
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd repo2
|
|
|
|
Test that anonymous heads are disallowed by default
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m a
|
|
$ hg push
|
|
pushing to $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
abort: push would create new anonymous heads (cb9a9f314b8b)
|
|
(use --allow-anon to override this warning)
|
|
[255]
|
|
|
|
Test that config changes what is pushed by default
|
|
|
|
$ echo b > b
|
|
$ hg add b
|
|
$ hg commit -m b
|
|
$ hg up ".^"
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo c > c
|
|
$ hg add c
|
|
$ hg commit -m c
|
|
$ hg push -r 'head()'
|
|
pushing to $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
abort: push would create new anonymous heads (d2ae7f538514, d36c0562f908)
|
|
(use --allow-anon to override this warning)
|
|
[255]
|
|
$ hg push -r .
|
|
pushing to $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
abort: push would create new anonymous heads (d36c0562f908)
|
|
(use --allow-anon to override this warning)
|
|
[255]
|
|
$ hg debugstrip d36c0562f908 d2ae7f538514
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
Test that config allows anonymous heads to be pushed
|
|
|
|
$ hg push --config remotenames.pushanonheads=True
|
|
pushing to $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
Test that forceto works
|
|
|
|
$ setglobalconfig remotenames.forceto=true
|
|
$ hg push
|
|
abort: must specify --to when pushing
|
|
(see configuration option remotenames.forceto)
|
|
[255]
|
|
|
|
Test that --to limits other options
|
|
|
|
$ echo b >> a
|
|
$ hg commit -m b
|
|
$ hg push --to @ --rev . --rev ".^"
|
|
abort: --to requires exactly one rev to push
|
|
(use --rev BOOKMARK or omit --rev for current commit (.))
|
|
[255]
|
|
$ hg push --to @ --bookmark foo
|
|
abort: do not specify --to/-t and --bookmark/-B at the same time
|
|
[255]
|
|
|
|
Test that --create is required to create new bookmarks
|
|
|
|
$ hg push --to @
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: not creating new remote bookmark
|
|
(use --create to create a new bookmark)
|
|
[255]
|
|
$ hg push --to @ --create
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
exporting bookmark @
|
|
|
|
Test that --non-forward-move is required to move bookmarks to odd locations
|
|
|
|
$ hg push --to @
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
remote bookmark already points at pushed rev
|
|
no changes found
|
|
[1]
|
|
$ hg push --to @ -r ".^"
|
|
pushing rev cb9a9f314b8b to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: pushed rev is not in the foreground of remote bookmark
|
|
(use --non-forward-move flag to complete arbitrary moves)
|
|
[255]
|
|
$ hg up ".^"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c >> a
|
|
$ hg commit -m c
|
|
$ hg push --to @
|
|
pushing rev cc61aa6be3dc to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: pushed rev is not in the foreground of remote bookmark
|
|
(use --non-forward-move flag to complete arbitrary moves)
|
|
[255]
|
|
|
|
Test that --non-forward-move allows moving bookmark around arbitrarily
|
|
|
|
$ hg book -r 'desc(b)' headb
|
|
$ hg book -r 'desc(c)' headc
|
|
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
|
|
@ 2 c headc
|
|
|
|
|
| o 1 b headb default/@
|
|
|/
|
|
o 0 a
|
|
|
|
$ hg push --to @ -r headb
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
remote bookmark already points at pushed rev
|
|
no changes found
|
|
[1]
|
|
$ hg push --to @ -r headb
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
remote bookmark already points at pushed rev
|
|
no changes found
|
|
[1]
|
|
$ hg push --to @ -r headc
|
|
pushing rev cc61aa6be3dc to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: pushed rev is not in the foreground of remote bookmark
|
|
(use --non-forward-move flag to complete arbitrary moves)
|
|
[255]
|
|
$ hg push --to @ -r headc --non-forward-move --force
|
|
pushing rev cc61aa6be3dc to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating bookmark @
|
|
$ hg push --to @ -r 'desc(a)'
|
|
pushing rev cb9a9f314b8b to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: pushed rev is not in the foreground of remote bookmark
|
|
(use --non-forward-move flag to complete arbitrary moves)
|
|
[255]
|
|
$ hg push --to @ -r 'desc(a)' --non-forward-move
|
|
pushing rev cb9a9f314b8b to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark @
|
|
[1]
|
|
$ hg push --to @ -r headb
|
|
pushing rev 1846eede8b68 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark @
|
|
[1]
|
|
|
|
Test that local must have rev of remote to push --to without --non-forward-move
|
|
|
|
$ hg up -r 'desc(a)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg debugstrip -r headb
|
|
$ hg book -d headb
|
|
$ hg push --to @ -r headc
|
|
pushing rev cc61aa6be3dc to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
abort: remote bookmark revision is not in local repo
|
|
(pull and merge or rebase or use --non-forward-move)
|
|
[255]
|
|
|
|
Clean up repo1
|
|
|
|
$ cd ../repo1
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}\n'
|
|
o 2 c
|
|
|
|
|
| o 1 b @
|
|
|/
|
|
o 0 a
|
|
|
|
$ hg debugstrip 'desc(c)'
|
|
$ cd ../repo2
|
|
|
|
Test that rebasing and pushing works as expected
|
|
|
|
#testcases setdiscovery fastdiscovery
|
|
#if fastdiscovery
|
|
$ setconfig discovery.fastdiscovery=True
|
|
#else
|
|
$ setconfig remotenames.fastheaddiscovery=1
|
|
#endif
|
|
$ hg pull
|
|
pulling from $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 1 files
|
|
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
|
|
o 2 b default/@
|
|
|
|
|
| o 1 c headc
|
|
|/
|
|
@ 0 a
|
|
|
|
$ hg --config extensions.rebase= rebase -d default/@ -s headc 2>&1 | grep -v "^warning:" | grep -v incomplete
|
|
rebasing cc61aa6be3dc "c" (headc)
|
|
merging a
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
$ echo "a" > a
|
|
$ echo "b" >> a
|
|
$ echo "c" >> a
|
|
$ hg resolve --mark a
|
|
(no more unresolved files)
|
|
$ hg --config extensions.rebase= rebase --continue
|
|
rebasing cc61aa6be3dc "c" (headc)
|
|
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
|
|
o 3 c headc
|
|
|
|
|
o 2 b default/@
|
|
|
|
|
@ 0 a
|
|
|
|
$ hg up headc
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark headc)
|
|
$ hg push --to @
|
|
pushing rev 6683576730c5 to destination $TESTTMP/repo1 bookmark @
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating bookmark @
|
|
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
|
|
@ 3 c headc default/@
|
|
|
|
|
o 2 b
|
|
|
|
|
o 0 a
|
|
|
|
# Evolve related tests removed. see https://fburl.com/evolveeol
|