mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
763e41cee8
Summary: Previously, smartlog use `tip` as the fallback master, and prompts: warning: there is no master changeset locally, try pulling from server if master is `tip`. That makes smartlog less friendly for external users. This patch removes the prompt and changes the fallback master to the last public revision so it works out-of-box. Test Plan: `arc unit` Reviewers: #mercurial, durham Reviewed By: durham Subscribers: durham, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4555346 Signature: t1:4555346:1487036530:35a5fa65d5419e7324d3203fa52de9a82b8132e3
109 lines
2.5 KiB
Perl
109 lines
2.5 KiB
Perl
$ . $TESTDIR/require-ext.sh remotenames
|
|
$ extpath=`dirname $TESTDIR`
|
|
$ cp $extpath/hgext3rd/smartlog.py $TESTTMP # use $TESTTMP substitution in message
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> smartlog=$TESTTMP/smartlog.py
|
|
> remotenames=
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo x > x
|
|
$ hg commit -qAm x
|
|
$ hg book master
|
|
$ echo x >> x
|
|
$ hg commit -qAm x2
|
|
|
|
Non-bookmarked public heads should not be visible in smartlog
|
|
|
|
$ cd ..
|
|
$ hg clone repo client
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd client
|
|
$ hg book mybook -r 0
|
|
$ hg up 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
o 1 default/master
|
|
|
|
|
@ 0 mybook
|
|
|
|
Old head (rev 1) should no longer be visible
|
|
|
|
$ echo z >> x
|
|
$ hg commit -qAm x3
|
|
$ hg push --non-forward-move -q --to master
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
@ 2 default/master
|
|
|
|
|
o 0 mybook
|
|
|
|
|
|
Test configuration of "interesting" bookmarks
|
|
|
|
$ hg up -q ".^"
|
|
$ echo x >> x
|
|
$ hg commit -qAm x4
|
|
$ hg push -q --to project/bookmark --create
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
o 2 default/master
|
|
|
|
|
| @ 3 default/project/bookmark
|
|
|/
|
|
o 0 mybook
|
|
|
|
|
|
$ hg up ".^"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
o 2 default/master
|
|
|
|
|
@ 0 mybook
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [smartlog]
|
|
> repos=default/
|
|
> names=project/bookmark
|
|
> EOF
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
o 3 default/project/bookmark
|
|
|
|
|
@ 0 mybook
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [smartlog]
|
|
> names=master project/bookmark
|
|
> EOF
|
|
$ hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'
|
|
o 2 default/master
|
|
|
|
|
| o 3 default/project/bookmark
|
|
|/
|
|
@ 0 mybook
|
|
|
|
|
|
Change remote master to a non-existing locally commit and check that warning
|
|
is shown to the user
|
|
$ cat > .hg/remotenames << EOF
|
|
> 6dd477f76ca35ae46e82972648735867cf335d3e bookmarks remote/master
|
|
> EOF
|
|
$ hg sl
|
|
o changeset: 3:8e2253d950ae
|
|
| tag: tip
|
|
| parent: 0:b292c1e3311f
|
|
| user: test
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
| summary: x4
|
|
|
|
|
@ changeset: 0:b292c1e3311f
|
|
bookmark: mybook
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: x
|
|
|
|
note: hiding 3 old heads without bookmarks
|
|
(use --all to see them)
|