mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
8041ff9e82
Summary: Revision numbers are deprecated, let's not print them in the bisect output. Reviewed By: DurhamG Differential Revision: D19539678 fbshipit-source-id: 29bca3ee38cb390bdef8dd88cb912aa3dc452065
234 lines
6.0 KiB
Perl
234 lines
6.0 KiB
Perl
#chg-compatible
|
|
|
|
To run this test against other shells, use the shell argument, eg:
|
|
run-tests.py --shell=zsh test-scm-prompt*
|
|
|
|
$ configure evolution
|
|
|
|
Initialize scm prompt
|
|
$ . $TESTDIR/../contrib/scm-prompt.sh
|
|
|
|
$ cmd() {
|
|
> "$@"
|
|
> _scm_prompt "(%s)\n"
|
|
> }
|
|
|
|
Throw some ridiculous functions at it
|
|
$ grep() {
|
|
> grep -V
|
|
> }
|
|
$ cat() {
|
|
> true
|
|
> }
|
|
|
|
Outside of a repo, should have no output
|
|
$ _scm_prompt
|
|
|
|
Test basic repo behaviors
|
|
$ hg init repo
|
|
$ cmd cd repo
|
|
(empty)
|
|
$ echo a > a
|
|
$ cmd hg add a
|
|
(00000000)
|
|
$ cmd hg commit -m 'c1'
|
|
(5cad84d1)
|
|
$ cmd hg book active
|
|
(active)
|
|
$ cmd hg book -i
|
|
(5cad84d1)
|
|
$ echo b > b
|
|
$ cmd hg add b
|
|
(5cad84d1)
|
|
$ cmd hg commit -m 'c2'
|
|
(775bfddd)
|
|
$ cmd hg up -q active
|
|
(active)
|
|
$ echo bb > b
|
|
$ hg add b
|
|
$ cmd hg commit -m 'c3'
|
|
(active)
|
|
$ hg log -T '{node|short} {desc}\n' -G
|
|
@ 4b6cc7d5194b c3
|
|
|
|
|
| o 775bfdddc842 c2
|
|
|/
|
|
o 5cad84d1726f c1
|
|
|
|
|
|
Test rebase
|
|
$ cmd hg rebase -d 775bfdd --config "extensions.rebase="
|
|
rebasing 4b6cc7d5194b "c3" (active)
|
|
merging b
|
|
warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
(775bfddd|REBASE)
|
|
$ cmd hg book rebase
|
|
(rebase|REBASE)
|
|
$ cmd hg rebase --abort --config "extensions.rebase="
|
|
rebase aborted
|
|
(active)
|
|
$ cmd hg book -i
|
|
(4b6cc7d5)
|
|
|
|
Test histedit
|
|
$ command cat > commands <<EOF
|
|
> edit 4b6cc7d5194b
|
|
> EOF
|
|
$ cmd hg histedit --config "extensions.histedit=" --commands commands
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
adding b
|
|
Editing (4b6cc7d5194b), you may commit or record as needed now.
|
|
(hg histedit --continue to resume)
|
|
(5cad84d1|HISTEDIT)
|
|
$ cmd hg histedit --config "extensions.histedit=" --abort
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(4b6cc7d5)
|
|
|
|
Test graft
|
|
$ cmd hg graft 775bfdddc842
|
|
grafting 775bfdddc842 "c2" (rebase)
|
|
merging b
|
|
warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
|
|
abort: unresolved conflicts, can't continue
|
|
(use 'hg resolve' and 'hg graft --continue')
|
|
(4b6cc7d5|GRAFT)
|
|
$ cmd hg revert -r 775bfdddc842 b
|
|
(4b6cc7d5|GRAFT)
|
|
$ cmd hg resolve --mark b
|
|
(no more unresolved files)
|
|
continue: hg graft --continue
|
|
(4b6cc7d5|GRAFT)
|
|
$ cmd hg graft --continue
|
|
grafting 775bfdddc842 "c2" (rebase)
|
|
(42eaf5ca)
|
|
|
|
Test bisect
|
|
$ cmd hg bisect -b .
|
|
(42eaf5ca|BISECT)
|
|
$ cmd hg bisect -g ".^^"
|
|
Testing changeset 4b6cc7d5194b (2 changesets remaining, ~1 tests)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(4b6cc7d5|BISECT)
|
|
$ cmd hg bisect -r
|
|
(4b6cc7d5)
|
|
|
|
Test unshelve
|
|
$ echo b >> b
|
|
$ cmd hg shelve --config "extensions.shelve="
|
|
shelved as default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(4b6cc7d5)
|
|
$ cmd hg up -q ".^"
|
|
(5cad84d1)
|
|
$ cmd hg unshelve --config "extensions.shelve="
|
|
unshelving change 'default'
|
|
rebasing shelved changes
|
|
rebasing 19f7fec7f80b "shelve changes to: c3"
|
|
other [source] changed b which local [dest] deleted
|
|
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
|
|
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
|
|
(5cad84d1|UNSHELVE)
|
|
$ cmd hg unshelve --config "extensions.shelve=" --abort
|
|
rebase aborted
|
|
unshelve of 'default' aborted
|
|
(5cad84d1)
|
|
|
|
Test merge
|
|
$ cmd hg up -q 4b6cc7d5194b
|
|
(4b6cc7d5)
|
|
$ cmd hg merge 775bfdddc842
|
|
merging b
|
|
warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
(4b6cc7d5|MERGE)
|
|
$ cmd hg up -q -C .
|
|
(4b6cc7d5)
|
|
|
|
Test out-of-date bookmark
|
|
$ echo rebase > .hg/bookmarks.current
|
|
$ cmd hg book
|
|
active 2:4b6cc7d5194b
|
|
rebase 1:775bfdddc842
|
|
(rebase|UPDATE_NEEDED)
|
|
$ hg up -q .
|
|
|
|
Test remotenames
|
|
$ hg log -r . -T '{node}\n'
|
|
4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba
|
|
$ echo 4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba bookmarks remote/@ > .hg/store/remotenames
|
|
$ cmd
|
|
(4b6cc7d5|remote/@)
|
|
|
|
Test shared bookmarks
|
|
$ cmd cd ..
|
|
$ cmd hg share -B repo share --config "extensions.share="
|
|
updating working directory
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cmd cd share
|
|
(42eaf5ca)
|
|
$ echo rebase > .hg/bookmarks.current
|
|
$ cmd
|
|
(rebase|UPDATE_NEEDED)
|
|
$ cd ../repo
|
|
|
|
Test unshared bookmarks
|
|
$ cmd cd ..
|
|
$ cmd hg share repo share2 --config "extensions.share="
|
|
updating working directory
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cmd cd share2
|
|
(42eaf5ca)
|
|
$ cmd hg book unshared
|
|
(unshared)
|
|
$ cmd hg up -q ".^"
|
|
(4b6cc7d5|remote/@)
|
|
$ echo unshared > .hg/bookmarks.current
|
|
$ cmd
|
|
(unshared|remote/@|UPDATE_NEEDED)
|
|
$ cd ../repo
|
|
|
|
Test with symlinks to inside of subdir of repo
|
|
$ mkdir subdir
|
|
$ echo contents > subdir/file
|
|
$ hg add subdir/file
|
|
$ cmd hg commit -m subdir
|
|
(ced0c431)
|
|
$ cd ..
|
|
$ cmd ln -s repo/subdir
|
|
$ cmd cd subdir
|
|
(ced0c431)
|
|
$ cd ../repo
|
|
|
|
Test formatting options
|
|
$ _scm_prompt ' %s \n'
|
|
ced0c431
|
|
$ _scm_prompt ':%s:'
|
|
:ced0c431: (no-eol)
|
|
|
|
Test locked repo states (generally due to concurrency so tests are kinda fake)
|
|
$ cmd ln -s "${HOSTNAME}:12345" .hg/wlock
|
|
(ced0c431|WDIR-LOCKED)
|
|
$ cmd ln -s "${HOSTNAME}:12345" .hg/store/lock
|
|
(ced0c431|STORE-LOCKED)
|
|
$ cmd rm .hg/wlock
|
|
(ced0c431|STORE-LOCKED)
|
|
$ cmd rm .hg/store/lock
|
|
(ced0c431)
|
|
|
|
Test many remotenames
|
|
$ hg log -r . -T '{node}\n'
|
|
ced0c431a4731a9d5048efdb60a3535f5450167e
|
|
$ for i in `$PYTHON $TESTDIR/seq.py 1 10`; do
|
|
> echo ced0c431a4731a9d5048efdb60a3535f5450167e bookmarks remote/remote$i >> .hg/store/remotenames
|
|
> done
|
|
$ cmd
|
|
(ced0c431|remote/remote9...)
|
|
$ echo 97af35b3648c0098cbd8114ae1b1bafab997ac20 bookmarks remote/abc/master >> .hg/store/remotenames
|
|
$ cmd
|
|
(ced0c431|remote/remote9...)
|
|
$ echo 97af35b3648c0098cbd8114ae1b1bafab997ac20 bookmarks remote/@ >> .hg/store/remotenames
|
|
$ cmd
|
|
(ced0c431|remote/remote9...)
|