mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
311 lines
7.3 KiB
Perl
311 lines
7.3 KiB
Perl
#chg-compatible
|
|
|
|
Set up extension and repos
|
|
|
|
$ enable remotenames
|
|
$ setconfig phases.publish=false
|
|
$ hg init repo1
|
|
|
|
Make sure we don't fail when rebase doesn't exist
|
|
|
|
$ hg rebase
|
|
unknown command 'rebase'
|
|
(use 'hg help' to get help)
|
|
[255]
|
|
$ setglobalconfig extensions.rebase=
|
|
|
|
Create a tracking bookmark
|
|
|
|
$ cd repo1
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m a1
|
|
$ echo a >> a
|
|
$ hg commit -m a2
|
|
$ hg book a
|
|
$ hg up ".^"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark a)
|
|
$ echo b > b
|
|
$ echo b > a
|
|
$ hg add b
|
|
$ hg commit -m b
|
|
$ hg book b -t a
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ b b
|
|
│
|
|
│ o a2 a
|
|
├─╯
|
|
o a1
|
|
|
|
$ hg book -v
|
|
a fdceb0e57656
|
|
* b dea4e1d2ca0e [a: 1 ahead, 1 behind]
|
|
$ hg rebase --tool :fail
|
|
rebasing dea4e1d2ca0e "b" (b)
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ echo aa > a
|
|
$ hg resolve --mark a 2>&1 | grep -v "^continue:"
|
|
(no more unresolved files)
|
|
$ hg rebase --continue
|
|
rebasing dea4e1d2ca0e "b" (b)
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}'
|
|
@ b b
|
|
│
|
|
o a2 a
|
|
│
|
|
o a1
|
|
|
|
$ hg book -v
|
|
a fdceb0e57656
|
|
* b 2623fce7de21 [a: 1 ahead, 0 behind]
|
|
|
|
Test push tracking
|
|
|
|
$ cd ..
|
|
$ hg clone repo1 repo2
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd repo2
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ b default/b
|
|
│
|
|
o a2 default/a
|
|
│
|
|
o a1
|
|
|
|
|
|
$ hg boo c -t default/b
|
|
$ echo c > c
|
|
$ hg add c
|
|
$ hg commit -m c
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ c c
|
|
│
|
|
o b default/b
|
|
│
|
|
o a2 default/a
|
|
│
|
|
o a1
|
|
|
|
$ hg push
|
|
pushing rev e305ab9fea99 to destination $TESTTMP/repo1 bookmark b
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating bookmark b
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ c c default/b
|
|
│
|
|
o b
|
|
│
|
|
o a2 default/a
|
|
│
|
|
o a1
|
|
|
|
Test push with explicit default path
|
|
|
|
$ hg push `hg paths default`
|
|
pushing rev e305ab9fea99 to destination $TESTTMP/repo1 bookmark b
|
|
searching for changes
|
|
remote bookmark already points at pushed rev
|
|
no changes found
|
|
[1]
|
|
|
|
Test that we don't try to push if tracking bookmark isn't a remote bookmark
|
|
|
|
$ setglobalconfig remotenames.forceto=true
|
|
$ hg book c -t foo
|
|
$ hg push
|
|
abort: must specify --to when pushing
|
|
(see configuration option remotenames.forceto)
|
|
[255]
|
|
|
|
Test renaming a remote and tracking
|
|
|
|
$ hg dbsh -c "with repo.lock(), repo.transaction('tr'): repo.svfs.writeutf8('remotenames', '')"
|
|
$ setglobalconfig remotenames.rename.default=remote
|
|
$ hg pull
|
|
pulling from $TESTTMP/repo1 (glob)
|
|
searching for changes
|
|
no changes found
|
|
$ hg book c -t remote/a
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ c c remote/b
|
|
│
|
|
o b
|
|
│
|
|
o a2 remote/a
|
|
│
|
|
o a1
|
|
|
|
$ hg push
|
|
pushing rev e305ab9fea99 to destination $TESTTMP/repo1 bookmark a
|
|
searching for changes
|
|
no changes found
|
|
updating bookmark a
|
|
[1]
|
|
$ hg log -G -T '{desc} {bookmarks} {remotebookmarks}\n'
|
|
@ c c remote/a remote/b
|
|
│
|
|
o b
|
|
│
|
|
o a2
|
|
│
|
|
o a1
|
|
|
|
|
|
Test untracking
|
|
|
|
$ hg book -v
|
|
* c e305ab9fea99 [remote/a]
|
|
$ hg book -u c
|
|
$ hg book -v
|
|
* c e305ab9fea99
|
|
|
|
Test that tracking isn't over-eager on rebase
|
|
|
|
$ hg up 'desc(a2)'
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
(leaving bookmark c)
|
|
$ touch e
|
|
$ hg commit -qAm e
|
|
$ hg book c -r 'desc(a2)' -t remote/a -f
|
|
$ hg up c
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(activating bookmark c)
|
|
$ touch d
|
|
$ hg commit -qAm d
|
|
$ hg log -G -T '{node|short} {bookmarks} {remotebookmarks}\n'
|
|
@ ff58066d17c3 c
|
|
│
|
|
│ o 364e447d28f4
|
|
├─╯
|
|
│ o e305ab9fea99 remote/a remote/b
|
|
│ │
|
|
│ o 2623fce7de21
|
|
├─╯
|
|
o fdceb0e57656
|
|
│
|
|
o 07199ae38cd5
|
|
|
|
$ hg bookmarks -v
|
|
* c ff58066d17c3 [remote/a: 1 ahead, 2 behind]
|
|
$ hg rebase -s .
|
|
abort: no matching bookmark to rebase - please rebase to an explicit rev or bookmark
|
|
(run 'hg heads' to see all heads)
|
|
[255]
|
|
$ hg log -G -T '{node|short} {bookmarks} {remotebookmarks}\n'
|
|
@ ff58066d17c3 c
|
|
│
|
|
│ o 364e447d28f4
|
|
├─╯
|
|
│ o e305ab9fea99 remote/a remote/b
|
|
│ │
|
|
│ o 2623fce7de21
|
|
├─╯
|
|
o fdceb0e57656
|
|
│
|
|
o 07199ae38cd5
|
|
|
|
Test implicit rebase destination
|
|
|
|
$ hg log -G -T '{node|short} {bookmarks} {remotebookmarks}\n'
|
|
@ ff58066d17c3 c
|
|
│
|
|
│ o 364e447d28f4
|
|
├─╯
|
|
│ o e305ab9fea99 remote/a remote/b
|
|
│ │
|
|
│ o 2623fce7de21
|
|
├─╯
|
|
o fdceb0e57656
|
|
│
|
|
o 07199ae38cd5
|
|
|
|
$ hg bookmarks -v
|
|
* c ff58066d17c3 [remote/a: 1 ahead, 2 behind]
|
|
$ hg rebase
|
|
rebasing ff58066d17c3 "d" (c)
|
|
$ hg log -G -T '{node|short} {bookmarks} {remotebookmarks}\n'
|
|
@ 8d13dc14fef1 c
|
|
│
|
|
│ o 364e447d28f4
|
|
│ │
|
|
o │ e305ab9fea99 remote/a remote/b
|
|
│ │
|
|
o │ 2623fce7de21
|
|
├─╯
|
|
o fdceb0e57656
|
|
│
|
|
o 07199ae38cd5
|
|
|
|
|
|
Test distance to tip calculation
|
|
|
|
$ test -f .hg/cache/distance.current
|
|
[1]
|
|
$ hg up 'desc(c)'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(leaving bookmark c)
|
|
$ cat .hg/cache/distance.current
|
|
c 1 (no-eol)
|
|
$ hg up 'desc(b)'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ cat .hg/cache/distance.current
|
|
c 2 (no-eol)
|
|
$ hg up 'desc(e)'
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ test -f .hg/cache/distance.current
|
|
[1]
|
|
$ hg up c
|
|
4 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(activating bookmark c)
|
|
|
|
Test when a local bookmark that was tracking goes missing
|
|
|
|
$ hg book -v
|
|
* c 8d13dc14fef1 [remote/a: 1 ahead, 0 behind]
|
|
$ hg book -d c
|
|
$ hg book d
|
|
$ hg book -v
|
|
* d 8d13dc14fef1
|
|
|
|
Test renaming a bookmark with tracking
|
|
|
|
$ hg book d -t remote/a
|
|
$ hg book -v
|
|
* d 8d13dc14fef1 [remote/a: 1 ahead, 0 behind]
|
|
$ hg book -m d x
|
|
$ hg book -v
|
|
* x 8d13dc14fef1 [remote/a: 1 ahead, 0 behind]
|
|
|
|
Test renaming a bookmark without tracking
|
|
|
|
$ hg book -u x
|
|
$ hg book -v
|
|
* x 8d13dc14fef1
|
|
$ hg book -m x d
|
|
$ hg book -v
|
|
* d 8d13dc14fef1
|
|
$ hg book -d d
|
|
|
|
Test bookmarks with difficult characters
|
|
|
|
$ hg book -t remote/a "bookmark with spaces"
|
|
$ hg book -t remote/b "with tab too"
|
|
$ hg book -t remote/a "bookmark/with/slashes"
|
|
$ hg book -v
|
|
bookmark with spaces 8d13dc14fef1
|
|
* bookmark/with/slashes 8d13dc14fef1 [remote/a: 1 ahead, 0 behind]
|
|
with tab too 8d13dc14fef1
|
|
$ hg update bookmark/with/slashes
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg book -v
|
|
bookmark with spaces 8d13dc14fef1
|
|
* bookmark/with/slashes 8d13dc14fef1 [remote/a: 1 ahead, 0 behind]
|
|
with tab too 8d13dc14fef1
|