mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
ad813edcbd
Summary: Now that all our repos are treemanifest, let's enable the extension by default in tests. Once we're certain no one needs it in production we'll also make it the default in core Mercurial. This diff includes a minor fix in treemanifest to be aware of always-enabled extensions. It won't matter until we actually add treemanifest to the list of default enabled extensions, but I caught this while testing things. Reviewed By: ikostia Differential Revision: D15030253 fbshipit-source-id: d8361f915928b6ad90665e6ed330c1df5c8d8d86
192 lines
4.7 KiB
Perl
192 lines
4.7 KiB
Perl
$ setconfig extensions.treemanifest=!
|
|
$ hg init t
|
|
$ cd t
|
|
$ echo 1 > foo
|
|
$ hg ci -Am m
|
|
adding foo
|
|
|
|
$ cd ..
|
|
$ hg clone t tt
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd tt
|
|
$ echo 1.1 > foo
|
|
$ hg ci -Am m
|
|
|
|
$ cd ../t
|
|
$ echo 1.2 > foo
|
|
$ hg ci -Am m
|
|
|
|
Should respect config to disable dirty update
|
|
$ hg co -qC 0
|
|
$ echo 2 > foo
|
|
$ hg --config commands.update.check=abort pull -u ../tt
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 107cefe13e42
|
|
abort: uncommitted changes
|
|
[255]
|
|
$ hg debugstrip --no-backup tip
|
|
$ hg co -qC tip
|
|
|
|
Should not update to the other topological branch:
|
|
|
|
$ hg pull -u ../tt
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 107cefe13e42
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updated to "800c91d5bfc1: m"
|
|
1 other heads for branch "default"
|
|
|
|
$ cd ../tt
|
|
|
|
Should not update to the other branch:
|
|
|
|
$ hg pull -u ../t
|
|
pulling from ../t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 800c91d5bfc1
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updated to "107cefe13e42: m"
|
|
1 other heads for branch "default"
|
|
|
|
$ HGMERGE=true hg merge
|
|
merging foo
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg ci -mm
|
|
|
|
$ cd ../t
|
|
|
|
Should work:
|
|
|
|
$ hg pull -u ../tt
|
|
pulling from ../tt
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (-1 heads)
|
|
new changesets 483b76ad4309
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Similarity between "hg update" and "hg pull -u" in handling bookmark
|
|
====================================================================
|
|
|
|
Test that updating activates the bookmark, which matches with the
|
|
explicit destination of the update.
|
|
|
|
$ echo 4 >> foo
|
|
$ hg commit -m "#4"
|
|
$ hg bookmark active-after-pull
|
|
$ cd ../tt
|
|
|
|
(1) activating by --rev BOOKMARK
|
|
|
|
$ hg bookmark -f active-before-pull
|
|
$ hg bookmarks
|
|
* active-before-pull 3:483b76ad4309
|
|
|
|
$ hg pull -u -r active-after-pull
|
|
pulling from $TESTTMP/t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
adding remote bookmark active-after-pull
|
|
new changesets f815b3da6163
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark active-after-pull)
|
|
|
|
$ hg parents -q
|
|
4:f815b3da6163
|
|
$ hg bookmarks
|
|
* active-after-pull 4:f815b3da6163
|
|
active-before-pull 3:483b76ad4309
|
|
|
|
(discard pulled changes)
|
|
|
|
$ hg update -q 483b76ad4309
|
|
$ hg rollback -q
|
|
|
|
(2) activating by URL#BOOKMARK
|
|
|
|
$ hg bookmark -f active-before-pull
|
|
$ hg bookmarks
|
|
* active-before-pull 3:483b76ad4309
|
|
|
|
$ hg pull -u $TESTTMP/t#active-after-pull
|
|
pulling from $TESTTMP/t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
adding remote bookmark active-after-pull
|
|
new changesets f815b3da6163
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark active-after-pull)
|
|
|
|
$ hg parents -q
|
|
4:f815b3da6163
|
|
$ hg bookmarks
|
|
* active-after-pull 4:f815b3da6163
|
|
active-before-pull 3:483b76ad4309
|
|
|
|
(discard pulled changes)
|
|
|
|
$ hg update -q 483b76ad4309
|
|
$ hg rollback -q
|
|
|
|
Test that updating deactivates current active bookmark, if the
|
|
destination of the update is explicitly specified, and it doesn't
|
|
match with the name of any existing bookmarks.
|
|
|
|
$ cd ../t
|
|
$ hg bookmark -d active-after-pull
|
|
$ hg commit -m "#5 (bar #1)" --config ui.allowemptycommit=1
|
|
$ cd ../tt
|
|
|
|
(1) deactivating by --rev REV
|
|
|
|
$ hg bookmark -f active-before-pull
|
|
$ hg bookmarks
|
|
* active-before-pull 3:483b76ad4309
|
|
|
|
$ hg pull -u -r f815b3da6163
|
|
pulling from $TESTTMP/t
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets f815b3da6163
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark active-before-pull)
|
|
|
|
$ hg parents -q
|
|
4:f815b3da6163
|
|
$ hg bookmarks
|
|
active-before-pull 3:483b76ad4309
|
|
|
|
(discard pulled changes)
|
|
|
|
$ hg update -q 483b76ad4309
|
|
$ hg rollback -q
|
|
|
|
$ cd ..
|