author | Pulkit Goyal <7895pulkit@gmail.com> |
Fri, 13 May 2016 03:09:30 +0530 | |
changeset 29153 | 90d84e1e427a |
parent 28549 | e01bd7385f4f |
child 29229 | 89bba2beb03e |
permissions | -rw-r--r-- |
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
21580
diff
changeset
|
1 |
#require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
2 |
|
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
3 |
$ cat << EOF >> $HGRCPATH |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
4 |
> [ui] |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
5 |
> logtemplate={rev}:{node|short} {desc|firstline} |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
6 |
> [phases] |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
7 |
> publish=False |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22659
diff
changeset
|
8 |
> [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22659
diff
changeset
|
9 |
> evolution=createmarkers,exchange |
25352
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
10 |
> # drop me once bundle2 is the default, |
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
11 |
> # added to get test change early. |
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
12 |
> bundle2-exp = True |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
13 |
> EOF |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
14 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
15 |
initialize |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
16 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
17 |
$ hg init a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
18 |
$ cd a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
19 |
$ echo 'test' > test |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
20 |
$ hg commit -Am'test' |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
21 |
adding test |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
22 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
23 |
set bookmarks |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
24 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
25 |
$ hg bookmark X |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
26 |
$ hg bookmark Y |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
27 |
$ hg bookmark Z |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
28 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
29 |
import bookmark by name |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
30 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
31 |
$ hg init ../b |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
32 |
$ cd ../b |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
33 |
$ hg book Y |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
34 |
$ hg book |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
35 |
* Y -1:000000000000 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
36 |
$ hg pull ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
37 |
pulling from ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
38 |
requesting all changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
39 |
adding changesets |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
40 |
adding manifests |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
41 |
adding file changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
42 |
added 1 changesets with 1 changes to 1 files |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
43 |
adding remote bookmark X |
13662
80d6e1f63ed9
localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
44 |
updating bookmark Y |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
45 |
adding remote bookmark Z |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
46 |
(run 'hg update' to get a working copy) |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
47 |
$ hg bookmarks |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
48 |
X 0:4e3505fd9583 |
18479
0efd5686f80c
bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents:
18470
diff
changeset
|
49 |
* Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
50 |
Z 0:4e3505fd9583 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
51 |
$ hg debugpushkey ../a namespaces |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
52 |
bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
53 |
namespaces |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
54 |
obsolete |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
55 |
phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
56 |
$ hg debugpushkey ../a bookmarks |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
57 |
X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
58 |
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
59 |
Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
23199
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
60 |
|
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23416
diff
changeset
|
61 |
delete the bookmark to re-pull it |
23199
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
62 |
|
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
63 |
$ hg book -d X |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
64 |
$ hg pull -B X ../a |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
65 |
pulling from ../a |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
66 |
no changes found |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
67 |
adding remote bookmark X |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
68 |
|
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
69 |
finally no-op pull |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
70 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
71 |
$ hg pull -B X ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
72 |
pulling from ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
73 |
no changes found |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
74 |
$ hg bookmark |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
75 |
X 0:4e3505fd9583 |
18479
0efd5686f80c
bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents:
18470
diff
changeset
|
76 |
* Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
77 |
Z 0:4e3505fd9583 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
78 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
79 |
export bookmark by name |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
80 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
81 |
$ hg bookmark W |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
82 |
$ hg bookmark foo |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
83 |
$ hg bookmark foobar |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
84 |
$ hg push -B W ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
85 |
pushing to ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
86 |
searching for changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
87 |
no changes found |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
88 |
exporting bookmark W |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
89 |
[1] |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
90 |
$ hg -R ../a bookmarks |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
91 |
W -1:000000000000 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
92 |
X 0:4e3505fd9583 |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
93 |
Y 0:4e3505fd9583 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
94 |
* Z 0:4e3505fd9583 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
95 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
96 |
delete a remote bookmark |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
97 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
98 |
$ hg book -d W |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
99 |
$ hg push -B W ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
100 |
pushing to ../a |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
101 |
searching for changes |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
102 |
no changes found |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
103 |
deleting remote bookmark W |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
104 |
[1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
105 |
|
28182
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
106 |
export the active bookmark |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
107 |
|
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
108 |
$ hg bookmark V |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
109 |
$ hg push -B . ../a |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
110 |
pushing to ../a |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
111 |
searching for changes |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
112 |
no changes found |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
113 |
exporting bookmark V |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
114 |
[1] |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
115 |
|
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
116 |
delete the bookmark |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
117 |
|
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
118 |
$ hg book -d V |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
119 |
$ hg push -B V ../a |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
120 |
pushing to ../a |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
121 |
searching for changes |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
122 |
no changes found |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
123 |
deleting remote bookmark V |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
124 |
[1] |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
125 |
$ hg up foobar |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
126 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
127 |
(activating bookmark foobar) |
e4fe4e903e97
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents:
28082
diff
changeset
|
128 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
129 |
push/pull name that doesn't exist |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
130 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
131 |
$ hg push -B badname ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
132 |
pushing to ../a |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
133 |
searching for changes |
22651
b901645a8784
push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
134 |
bookmark badname does not exist on the local or remote repository! |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
135 |
no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
136 |
[2] |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
137 |
$ hg pull -B anotherbadname ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
138 |
pulling from ../a |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
139 |
abort: remote bookmark anotherbadname not found! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
140 |
[255] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
141 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
142 |
divergent bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
143 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
144 |
$ cd ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
145 |
$ echo c1 > f1 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
146 |
$ hg ci -Am1 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
147 |
adding f1 |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
148 |
$ hg book -f @ |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
149 |
$ hg book -f X |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
150 |
$ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
151 |
@ 1:0d2164f0ce0d |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
152 |
* X 1:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
153 |
Y 0:4e3505fd9583 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
154 |
Z 1:0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
155 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
156 |
$ cd ../b |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
157 |
$ hg up |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
158 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16010
c7811ca6fb94
update: note updated bookmark
Kevin Bullock <kbullock@ringworld.org>
parents:
15935
diff
changeset
|
159 |
updating bookmark foobar |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
160 |
$ echo c2 > f2 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
161 |
$ hg ci -Am2 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
162 |
adding f2 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
163 |
$ hg book -if @ |
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
164 |
$ hg book -if X |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
165 |
$ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
166 |
@ 1:9b140be10808 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
167 |
X 1:9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
168 |
Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
169 |
Z 0:4e3505fd9583 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
170 |
foo -1:000000000000 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
171 |
* foobar 1:9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
172 |
|
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
173 |
$ hg pull --config paths.foo=../a foo |
17021
955662c1d0e9
test-bookmarks-pushpull: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
174 |
pulling from $TESTTMP/a (glob) |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
175 |
searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
176 |
adding changesets |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
177 |
adding manifests |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
178 |
adding file changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
179 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
180 |
divergent bookmark @ stored as @foo |
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
181 |
divergent bookmark X stored as X@foo |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
182 |
updating bookmark Z |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
183 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
184 |
$ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
185 |
@ 1:9b140be10808 |
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
186 |
@foo 2:0d2164f0ce0d |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
187 |
X 1:9b140be10808 |
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
188 |
X@foo 2:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
189 |
Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
190 |
Z 2:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
191 |
foo -1:000000000000 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
192 |
* foobar 1:9b140be10808 |
24353
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
193 |
|
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
194 |
(test that too many divergence of bookmark) |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
195 |
|
24361
8de8cd34f2e3
tests: replace uses of 'seq' with portable 'seq.py'
Matt Harbison <matt_harbison@yahoo.com>
parents:
24355
diff
changeset
|
196 |
$ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done |
24353
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
197 |
$ hg pull ../a |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
198 |
pulling from ../a |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
199 |
searching for changes |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
200 |
no changes found |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
201 |
warning: failed to assign numbered name to divergent bookmark X |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
202 |
divergent bookmark @ stored as @1 |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
203 |
$ hg bookmarks | grep '^ X' | grep -v ':000000000000' |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
204 |
X 1:9b140be10808 |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
205 |
X@foo 2:0d2164f0ce0d |
24355
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
206 |
|
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
207 |
(test that remotely diverged bookmarks are reused if they aren't changed) |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
208 |
|
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
209 |
$ hg bookmarks | grep '^ @' |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
210 |
@ 1:9b140be10808 |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
211 |
@1 2:0d2164f0ce0d |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
212 |
@foo 2:0d2164f0ce0d |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
213 |
$ hg pull ../a |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
214 |
pulling from ../a |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
215 |
searching for changes |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
216 |
no changes found |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
217 |
warning: failed to assign numbered name to divergent bookmark X |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
218 |
divergent bookmark @ stored as @1 |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
219 |
$ hg bookmarks | grep '^ @' |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
220 |
@ 1:9b140be10808 |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
221 |
@1 2:0d2164f0ce0d |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
222 |
@foo 2:0d2164f0ce0d |
ca4b89683078
bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24353
diff
changeset
|
223 |
|
24361
8de8cd34f2e3
tests: replace uses of 'seq' with portable 'seq.py'
Matt Harbison <matt_harbison@yahoo.com>
parents:
24355
diff
changeset
|
224 |
$ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done |
24353
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
225 |
$ hg bookmarks -d "@1" |
3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23543
diff
changeset
|
226 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
227 |
$ hg push -f ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
228 |
pushing to ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
229 |
searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
230 |
adding changesets |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
231 |
adding manifests |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
232 |
adding file changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
233 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
234 |
$ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
235 |
@ 1:0d2164f0ce0d |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
236 |
* X 1:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
237 |
Y 0:4e3505fd9583 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
238 |
Z 1:0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
239 |
|
23543
4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23416
diff
changeset
|
240 |
explicit pull should overwrite the local version (issue4439) |
23199
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
241 |
|
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
242 |
$ hg pull --config paths.foo=../a foo -B X |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
243 |
pulling from $TESTTMP/a (glob) |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
244 |
no changes found |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
245 |
divergent bookmark @ stored as @foo |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
246 |
importing bookmark X |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
247 |
|
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
248 |
reinstall state for further testing: |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
249 |
|
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
250 |
$ hg book -fr 9b140be10808 X |
c35ffa4249ca
bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23082
diff
changeset
|
251 |
|
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
252 |
revsets should not ignore divergent bookmarks |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
253 |
|
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
254 |
$ hg bookmark -fr 1 Z |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
255 |
$ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
256 |
0:4e3505fd9583 Y |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
257 |
1:9b140be10808 @ X Z foobar |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
258 |
2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
259 |
$ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
260 |
2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
261 |
$ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
262 |
2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
263 |
|
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
264 |
update a remote bookmark from a non-head to a head |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
265 |
|
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
266 |
$ hg up -q Y |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
267 |
$ echo c3 > f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
268 |
$ hg ci -Am3 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
269 |
adding f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
270 |
created new head |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
271 |
$ hg push ../a |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
272 |
pushing to ../a |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
273 |
searching for changes |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
274 |
adding changesets |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
275 |
adding manifests |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
276 |
adding file changes |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
277 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
278 |
updating bookmark Y |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
279 |
$ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
280 |
@ 1:0d2164f0ce0d |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
281 |
* X 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
282 |
Y 3:f6fc62dde3c0 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
283 |
Z 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
284 |
|
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
285 |
update a bookmark in the middle of a client pulling changes |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
286 |
|
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
287 |
$ cd .. |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
288 |
$ hg clone -q a pull-race |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
289 |
|
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
290 |
We want to use http because it is stateless and therefore more susceptible to |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
291 |
race conditions |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
292 |
|
28549 | 293 |
$ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
294 |
$ cat pull-race.pid >> $DAEMON_PIDS |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
295 |
|
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
296 |
$ hg clone -q http://localhost:$HGPORT/ pull-race2 |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
297 |
$ cd pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
298 |
$ hg up -q Y |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
299 |
$ echo c4 > f2 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
300 |
$ hg ci -Am4 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
301 |
$ echo c5 > f3 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
302 |
$ cat <<EOF > .hg/hgrc |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
303 |
> [hooks] |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
304 |
> outgoing.makecommit = hg ci -Am5; echo committed in pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
305 |
> EOF |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
306 |
|
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
307 |
(new config needs a server restart) |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
308 |
|
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
309 |
$ cd .. |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
310 |
$ killdaemons.py |
28549 | 311 |
$ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
312 |
$ cat pull-race.pid >> $DAEMON_PIDS |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
313 |
$ cd pull-race2 |
25441
58b766a21189
test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25357
diff
changeset
|
314 |
$ hg -R $TESTTMP/pull-race book |
58b766a21189
test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25357
diff
changeset
|
315 |
@ 1:0d2164f0ce0d |
58b766a21189
test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25357
diff
changeset
|
316 |
X 1:0d2164f0ce0d |
58b766a21189
test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25357
diff
changeset
|
317 |
* Y 4:b0a5eff05604 |
58b766a21189
test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25357
diff
changeset
|
318 |
Z 1:0d2164f0ce0d |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
319 |
$ hg pull |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
320 |
pulling from http://localhost:$HGPORT/ |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
321 |
searching for changes |
25352
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
322 |
adding changesets |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
323 |
adding manifests |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
324 |
adding file changes |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
325 |
added 1 changesets with 1 changes to 1 files |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
326 |
updating bookmark Y |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
327 |
(run 'hg update' to get a working copy) |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
328 |
$ hg book |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
329 |
* @ 1:0d2164f0ce0d |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
330 |
X 1:0d2164f0ce0d |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
331 |
Y 4:b0a5eff05604 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
332 |
Z 1:0d2164f0ce0d |
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
333 |
|
25446
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
334 |
Update a bookmark right after the initial lookup -B (issue4689) |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
335 |
|
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
336 |
$ echo c6 > ../pull-race/f3 # to be committed during the race |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
337 |
$ cat <<EOF > ../pull-race/.hg/hgrc |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
338 |
> [hooks] |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
339 |
> # If anything to commit, commit it right after the first key listing used |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
340 |
> # during lookup. This makes the commit appear before the actual getbundle |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
341 |
> # call. |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
342 |
> listkeys.makecommit= ((hg st | grep -q M) && (hg commit -m race; echo commited in pull-race)) || exit 0 |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
343 |
> EOF |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
344 |
|
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
345 |
(new config need server restart) |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
346 |
|
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
347 |
$ killdaemons.py |
28549 | 348 |
$ hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log |
25446
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
349 |
$ cat ../pull-race.pid >> $DAEMON_PIDS |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
350 |
|
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
351 |
$ hg -R $TESTTMP/pull-race book |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
352 |
@ 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
353 |
X 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
354 |
* Y 5:35d1ef0a8d1b |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
355 |
Z 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
356 |
$ hg pull -B Y |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
357 |
pulling from http://localhost:$HGPORT/ |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
358 |
searching for changes |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
359 |
adding changesets |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
360 |
adding manifests |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
361 |
adding file changes |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
362 |
added 1 changesets with 1 changes to 1 files |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
363 |
updating bookmark Y |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
364 |
(run 'hg update' to get a working copy) |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
365 |
$ hg book |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
366 |
* @ 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
367 |
X 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
368 |
Y 5:35d1ef0a8d1b |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
369 |
Z 1:0d2164f0ce0d |
b5311068077e
pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25442
diff
changeset
|
370 |
|
25442
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
371 |
(done with this section of the test) |
9ee395dffac9
test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25441
diff
changeset
|
372 |
|
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
373 |
$ killdaemons.py |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
374 |
$ cd ../b |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
375 |
|
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
376 |
diverging a remote bookmark fails |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
377 |
|
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
378 |
$ hg up -q 4e3505fd9583 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
379 |
$ echo c4 > f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
380 |
$ hg ci -Am4 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
381 |
adding f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
382 |
created new head |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
383 |
$ echo c5 > f2 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
384 |
$ hg ci -Am5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
385 |
$ hg log -G |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
386 |
@ 5:c922c0139ca0 5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
387 |
| |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
388 |
o 4:4efff6d98829 4 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
389 |
| |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
390 |
| o 3:f6fc62dde3c0 3 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
391 |
|/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
392 |
| o 2:0d2164f0ce0d 1 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
393 |
|/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
394 |
| o 1:9b140be10808 2 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
395 |
|/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
396 |
o 0:4e3505fd9583 test |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
397 |
|
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
398 |
|
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
399 |
$ hg book -f Y |
17043
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
400 |
|
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
401 |
$ cat <<EOF > ../a/.hg/hgrc |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
402 |
> [web] |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
403 |
> push_ssl = false |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
404 |
> allow_push = * |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
405 |
> EOF |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
406 |
|
28549 | 407 |
$ hg serve -R ../a -p $HGPORT2 -d --pid-file=../hg2.pid |
17043
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
408 |
$ cat ../hg2.pid >> $DAEMON_PIDS |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
409 |
|
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
410 |
$ hg push http://localhost:$HGPORT2/ |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
411 |
pushing to http://localhost:$HGPORT2/ |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
412 |
searching for changes |
21580
32601b0b74c0
discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents:
21404
diff
changeset
|
413 |
abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19515
diff
changeset
|
414 |
(merge or see "hg help push" for details about pushing new heads) |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
415 |
[255] |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
416 |
$ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
417 |
@ 1:0d2164f0ce0d |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
418 |
* X 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
419 |
Y 3:f6fc62dde3c0 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
420 |
Z 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
421 |
|
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
422 |
|
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
423 |
Unrelated marker does not alter the decision |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
424 |
|
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
425 |
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
426 |
$ hg push http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
427 |
pushing to http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
428 |
searching for changes |
21580
32601b0b74c0
discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents:
21404
diff
changeset
|
429 |
abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19515
diff
changeset
|
430 |
(merge or see "hg help push" for details about pushing new heads) |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
431 |
[255] |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
432 |
$ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
433 |
@ 1:0d2164f0ce0d |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
434 |
* X 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
435 |
Y 3:f6fc62dde3c0 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
436 |
Z 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
437 |
|
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
438 |
Update to a successor works |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
439 |
|
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
440 |
$ hg id --debug -r 3 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
441 |
f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
442 |
$ hg id --debug -r 4 |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
443 |
4efff6d98829d9c824c621afd6e3f01865f5439f |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
444 |
$ hg id --debug -r 5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
445 |
c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
17865
daf32ebfde6b
bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17864
diff
changeset
|
446 |
$ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
daf32ebfde6b
bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17864
diff
changeset
|
447 |
$ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
448 |
$ hg push http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
449 |
pushing to http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
450 |
searching for changes |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
451 |
remote: adding changesets |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
452 |
remote: adding manifests |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
453 |
remote: adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
454 |
remote: added 2 changesets with 2 changes to 1 files (+1 heads) |
25352
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
455 |
remote: 2 new obsolescence markers |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
456 |
updating bookmark Y |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
457 |
$ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
458 |
@ 1:0d2164f0ce0d |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
459 |
* X 1:0d2164f0ce0d |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
460 |
Y 5:c922c0139ca0 |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
461 |
Z 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
462 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
463 |
hgweb |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
464 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
465 |
$ cat <<EOF > .hg/hgrc |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
466 |
> [web] |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
467 |
> push_ssl = false |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
468 |
> allow_push = * |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
469 |
> EOF |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
470 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
471 |
$ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
472 |
$ cat ../hg.pid >> $DAEMON_PIDS |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
473 |
$ cd ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
474 |
|
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17298
diff
changeset
|
475 |
$ hg debugpushkey http://localhost:$HGPORT/ namespaces |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
476 |
bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
477 |
namespaces |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
478 |
obsolete |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
479 |
phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
480 |
$ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
481 |
@ 9b140be1080824d768c5a4691a564088eede71f9 |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
482 |
X 9b140be1080824d768c5a4691a564088eede71f9 |
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
483 |
Y c922c0139ca03858f655e4a2af4dd02796a63969 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
484 |
Z 9b140be1080824d768c5a4691a564088eede71f9 |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
485 |
foo 0000000000000000000000000000000000000000 |
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
486 |
foobar 9b140be1080824d768c5a4691a564088eede71f9 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
487 |
$ hg out -B http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
488 |
comparing with http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
489 |
searching for changed bookmarks |
24658
8ea893ab0572
bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24657
diff
changeset
|
490 |
@ 0d2164f0ce0d |
8ea893ab0572
bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24657
diff
changeset
|
491 |
X 0d2164f0ce0d |
8ea893ab0572
bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24657
diff
changeset
|
492 |
Z 0d2164f0ce0d |
8ea893ab0572
bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24657
diff
changeset
|
493 |
foo |
8ea893ab0572
bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24657
diff
changeset
|
494 |
foobar |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
495 |
$ hg push -B Z http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
496 |
pushing to http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
497 |
searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
498 |
no changes found |
22651
b901645a8784
push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
499 |
updating bookmark Z |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
500 |
[1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
501 |
$ hg book -d Z |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
502 |
$ hg in -B http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
503 |
comparing with http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
504 |
searching for changed bookmarks |
24657
3d7c512b258d
bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24400
diff
changeset
|
505 |
@ 9b140be10808 |
3d7c512b258d
bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24400
diff
changeset
|
506 |
X 9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
507 |
Z 0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
508 |
foo 000000000000 |
15935
6c97eb445341
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents:
15648
diff
changeset
|
509 |
foobar 9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
510 |
$ hg pull -B Z http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
511 |
pulling from http://localhost:$HGPORT/ |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
512 |
no changes found |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
513 |
divergent bookmark @ stored as @1 |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
514 |
divergent bookmark X stored as X@1 |
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
515 |
adding remote bookmark Z |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
516 |
adding remote bookmark foo |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
517 |
adding remote bookmark foobar |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
518 |
$ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
519 |
requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
520 |
adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
521 |
adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
522 |
adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
523 |
added 5 changesets with 5 changes to 3 files (+2 heads) |
25352
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
524 |
2 new obsolescence markers |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17872
diff
changeset
|
525 |
updating to bookmark @ |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
526 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
527 |
$ hg -R cloned-bookmarks bookmarks |
17870
7d2dd10ce9ea
clone: activate @ bookmark if updating to it
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17865
diff
changeset
|
528 |
* @ 1:9b140be10808 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
529 |
X 1:9b140be10808 |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
530 |
Y 4:c922c0139ca0 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
531 |
Z 2:0d2164f0ce0d |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
532 |
foo -1:000000000000 |
15935
6c97eb445341
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents:
15648
diff
changeset
|
533 |
foobar 1:9b140be10808 |
17346
2944a6d35158
check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
534 |
|
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
535 |
$ cd .. |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
536 |
|
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
537 |
Test to show result of bookmarks comparision |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
538 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
539 |
$ mkdir bmcomparison |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
540 |
$ cd bmcomparison |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
541 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
542 |
$ hg init source |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
543 |
$ hg -R source debugbuilddag '+2*2*3*4' |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
544 |
$ hg -R source log -G --template '{rev}:{node|short}' |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
545 |
o 4:e7bd5218ca15 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
546 |
| |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
547 |
| o 3:6100d3090acf |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
548 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
549 |
| o 2:fa942426a6fd |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
550 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
551 |
| o 1:66f7d451a68b |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
552 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
553 |
o 0:1ea73414a91b |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
554 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
555 |
$ hg -R source bookmarks -r 0 SAME |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
556 |
$ hg -R source bookmarks -r 0 ADV_ON_REPO1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
557 |
$ hg -R source bookmarks -r 0 ADV_ON_REPO2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
558 |
$ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
559 |
$ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
560 |
$ hg -R source bookmarks -r 1 DIVERGED |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
561 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
562 |
$ hg clone -U source repo1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
563 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
564 |
(test that incoming/outgoing exit with 1, if there is no bookmark to |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
25501
diff
changeset
|
565 |
be exchanged) |
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
566 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
567 |
$ hg -R repo1 incoming -B |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
568 |
comparing with $TESTTMP/bmcomparison/source |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
569 |
searching for changed bookmarks |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
570 |
no changed bookmarks found |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
571 |
[1] |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
572 |
$ hg -R repo1 outgoing -B |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
573 |
comparing with $TESTTMP/bmcomparison/source |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
574 |
searching for changed bookmarks |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
575 |
no changed bookmarks found |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
576 |
[1] |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
577 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
578 |
$ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
579 |
$ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
580 |
$ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
581 |
$ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
582 |
$ hg -R repo1 -q --config extensions.mq= strip 4 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
583 |
$ hg -R repo1 log -G --template '{node|short} ({bookmarks})' |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
584 |
o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
585 |
| |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
586 |
| o fa942426a6fd (ADV_ON_REPO1) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
587 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
588 |
| o 66f7d451a68b (ADD_ON_REPO1 DIVERGED) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
589 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
590 |
o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
591 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
592 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
593 |
$ hg clone -U source repo2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
594 |
$ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
595 |
$ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
596 |
$ hg -R repo2 bookmarks -f -r 2 DIVERGED |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
597 |
$ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
598 |
$ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
599 |
$ hg -R repo2 -q --config extensions.mq= strip 3 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
600 |
$ hg -R repo2 log -G --template '{node|short} ({bookmarks})' |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
601 |
o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
602 |
| |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
603 |
| o fa942426a6fd (DIVERGED) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
604 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
605 |
| o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
606 |
|/ |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
607 |
o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
608 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
609 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
610 |
(test that difference of bookmarks between repositories are fully shown) |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
611 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
612 |
$ hg -R repo1 incoming -B repo2 -v |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
613 |
comparing with repo2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
614 |
searching for changed bookmarks |
24660
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
615 |
ADD_ON_REPO2 66f7d451a68b added |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
616 |
ADV_ON_REPO2 66f7d451a68b advanced |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
617 |
DIFF_ADV_ON_REPO2 e7bd5218ca15 changed |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
618 |
DIFF_DIVERGED e7bd5218ca15 changed |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
619 |
DIVERGED fa942426a6fd diverged |
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
620 |
$ hg -R repo1 outgoing -B repo2 -v |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
621 |
comparing with repo2 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
622 |
searching for changed bookmarks |
24661
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
623 |
ADD_ON_REPO1 66f7d451a68b added |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
624 |
ADD_ON_REPO2 deleted |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
625 |
ADV_ON_REPO1 fa942426a6fd advanced |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
626 |
DIFF_ADV_ON_REPO1 6100d3090acf advanced |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
627 |
DIFF_ADV_ON_REPO2 1ea73414a91b changed |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
628 |
DIFF_DIVERGED 6100d3090acf changed |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
629 |
DIVERGED 66f7d451a68b diverged |
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
630 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
631 |
$ hg -R repo2 incoming -B repo1 -v |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
632 |
comparing with repo1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
633 |
searching for changed bookmarks |
24660
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
634 |
ADD_ON_REPO1 66f7d451a68b added |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
635 |
ADV_ON_REPO1 fa942426a6fd advanced |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
636 |
DIFF_ADV_ON_REPO1 6100d3090acf changed |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
637 |
DIFF_DIVERGED 6100d3090acf changed |
bf13b44bbb0a
bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24659
diff
changeset
|
638 |
DIVERGED 66f7d451a68b diverged |
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
639 |
$ hg -R repo2 outgoing -B repo1 -v |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
640 |
comparing with repo1 |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
641 |
searching for changed bookmarks |
24661
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
642 |
ADD_ON_REPO1 deleted |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
643 |
ADD_ON_REPO2 66f7d451a68b added |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
644 |
ADV_ON_REPO2 66f7d451a68b advanced |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
645 |
DIFF_ADV_ON_REPO1 1ea73414a91b changed |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
646 |
DIFF_ADV_ON_REPO2 e7bd5218ca15 advanced |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
647 |
DIFF_DIVERGED e7bd5218ca15 changed |
8cf70c97a6e1
bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24660
diff
changeset
|
648 |
DIVERGED fa942426a6fd diverged |
24659
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
649 |
|
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
650 |
$ cd .. |
4ee00d6b0e29
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24658
diff
changeset
|
651 |
|
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
652 |
Pushing a bookmark should only push the changes required by that |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
653 |
bookmark, not all outgoing changes: |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
654 |
$ hg clone http://localhost:$HGPORT/ addmarks |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
655 |
requesting all changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
656 |
adding changesets |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
657 |
adding manifests |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
658 |
adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
659 |
added 5 changesets with 5 changes to 3 files (+2 heads) |
25352
ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24661
diff
changeset
|
660 |
2 new obsolescence markers |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17872
diff
changeset
|
661 |
updating to bookmark @ |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
662 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
663 |
$ cd addmarks |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
664 |
$ echo foo > foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
665 |
$ hg add foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
666 |
$ hg commit -m 'add foo' |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
667 |
$ echo bar > bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
668 |
$ hg add bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
669 |
$ hg commit -m 'add bar' |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
670 |
$ hg co "tip^" |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
671 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21404
ca275f7ec576
update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com>
parents:
20184
diff
changeset
|
672 |
(leaving bookmark @) |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
673 |
$ hg book add-foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
674 |
$ hg book -r tip add-bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
675 |
Note: this push *must* push only a single changeset, as that's the point |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
676 |
of this test. |
17548
eaa5fcc5bd20
checkheads: check successors for new heads in both missing and common
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17346
diff
changeset
|
677 |
$ hg push -B add-foo --traceback |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
678 |
pushing to http://localhost:$HGPORT/ |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
679 |
searching for changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
680 |
remote: adding changesets |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
681 |
remote: adding manifests |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
682 |
remote: adding file changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
683 |
remote: added 1 changesets with 1 changes to 1 files |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
684 |
exporting bookmark add-foo |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
685 |
|
20184
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
686 |
pushing a new bookmark on a new head does not require -f if -B is specified |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
687 |
|
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
688 |
$ hg up -q X |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
689 |
$ hg book W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
690 |
$ echo c5 > f2 |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
691 |
$ hg ci -Am5 |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
692 |
created new head |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
693 |
$ hg push -B W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
694 |
pushing to http://localhost:$HGPORT/ |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
695 |
searching for changes |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
696 |
remote: adding changesets |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
697 |
remote: adding manifests |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
698 |
remote: adding file changes |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
699 |
remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
700 |
exporting bookmark W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
701 |
$ hg -R ../b id -r W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
702 |
cc978a373a53 tip W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
703 |
|
26819
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
704 |
pushing an existing but divergent bookmark with -B still requires -f |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
705 |
|
28082
db90cb1e89c8
bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents:
26819
diff
changeset
|
706 |
$ hg clone -q . ../r |
26819
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
707 |
$ hg up -q X |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
708 |
$ echo 1 > f2 |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
709 |
$ hg ci -qAml |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
710 |
|
28082
db90cb1e89c8
bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents:
26819
diff
changeset
|
711 |
$ cd ../r |
26819
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
712 |
$ hg up -q X |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
713 |
$ echo 2 > f2 |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
714 |
$ hg ci -qAmr |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
715 |
$ hg push -B X |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
716 |
pushing to $TESTTMP/addmarks (glob) |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
717 |
searching for changes |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
718 |
remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
719 |
abort: push creates new remote head 54694f811df9 with bookmark 'X'! |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
720 |
(pull and merge or see "hg help push" for details about pushing new heads) |
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
721 |
[255] |
28082
db90cb1e89c8
bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents:
26819
diff
changeset
|
722 |
$ cd ../addmarks |
26819
ba7eeeac9603
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents:
26781
diff
changeset
|
723 |
|
24400
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
724 |
Check summary output for incoming/outgoing bookmarks |
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
725 |
|
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
726 |
$ hg bookmarks -d X |
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
727 |
$ hg bookmarks -d Y |
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
728 |
$ hg summary --remote | grep '^remote:' |
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
729 |
remote: *, 2 incoming bookmarks, 1 outgoing bookmarks (glob) |
03c84c966ef5
bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
730 |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16835
diff
changeset
|
731 |
$ cd .. |
23082
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
732 |
|
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
733 |
pushing an unchanged bookmark should result in no changes |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
734 |
|
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
735 |
$ hg init unchanged-a |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
736 |
$ hg init unchanged-b |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
737 |
$ cd unchanged-a |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
738 |
$ echo initial > foo |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
739 |
$ hg commit -A -m initial |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
740 |
adding foo |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
741 |
$ hg bookmark @ |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
742 |
$ hg push -B @ ../unchanged-b |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
743 |
pushing to ../unchanged-b |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
744 |
searching for changes |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
745 |
adding changesets |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
746 |
adding manifests |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
747 |
adding file changes |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
748 |
added 1 changesets with 1 changes to 1 files |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
749 |
exporting bookmark @ |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
750 |
|
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
751 |
$ hg push -B @ ../unchanged-b |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
752 |
pushing to ../unchanged-b |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
753 |
searching for changes |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
754 |
no changes found |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
755 |
[1] |
0fc4686de1d7
exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents:
22955
diff
changeset
|
756 |
|
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
757 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
758 |
Check hook preventing push (issue4455) |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
759 |
====================================== |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
760 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
761 |
$ hg bookmarks |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
762 |
* @ 0:55482a6fb4b1 |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
763 |
$ hg log -G |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
764 |
@ 0:55482a6fb4b1 initial |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
765 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
766 |
$ hg init ../issue4455-dest |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
767 |
$ hg push ../issue4455-dest # changesets only |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
768 |
pushing to ../issue4455-dest |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
769 |
searching for changes |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
770 |
adding changesets |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
771 |
adding manifests |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
772 |
adding file changes |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
773 |
added 1 changesets with 1 changes to 1 files |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
774 |
$ cat >> .hg/hgrc << EOF |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
775 |
> [paths] |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
776 |
> local=../issue4455-dest/ |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
777 |
> ssh=ssh://user@dummy/issue4455-dest |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
778 |
> http=http://localhost:$HGPORT/ |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
779 |
> [ui] |
25495
c63bf97cf7c7
tests: restore 'python' and '$TESTDIR/' for dummyssh invocation
Matt Harbison <matt_harbison@yahoo.com>
parents:
25476
diff
changeset
|
780 |
> ssh=python "$TESTDIR/dummyssh" |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
781 |
> EOF |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
782 |
$ cat >> ../issue4455-dest/.hg/hgrc << EOF |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
783 |
> [hooks] |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
784 |
> prepushkey=false |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
785 |
> [web] |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
786 |
> push_ssl = false |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
787 |
> allow_push = * |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
788 |
> EOF |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
789 |
$ killdaemons.py |
28549 | 790 |
$ hg serve -R ../issue4455-dest -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
791 |
$ cat ../issue4455.pid >> $DAEMON_PIDS |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
792 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
793 |
Local push |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
794 |
---------- |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
795 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
796 |
$ hg push -B @ local |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
797 |
pushing to $TESTTMP/issue4455-dest (glob) |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
798 |
searching for changes |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
799 |
no changes found |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
800 |
pushkey-abort: prepushkey hook exited with status 1 |
25501
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
801 |
abort: exporting bookmark @ failed! |
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
802 |
[255] |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
803 |
$ hg -R ../issue4455-dest/ bookmarks |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
804 |
no bookmarks set |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
805 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
806 |
Using ssh |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
807 |
--------- |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
808 |
|
25357
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
809 |
$ hg push -B @ ssh --config experimental.bundle2-exp=True |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
810 |
pushing to ssh://user@dummy/issue4455-dest |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
811 |
searching for changes |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
812 |
no changes found |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
813 |
remote: pushkey-abort: prepushkey hook exited with status 1 |
25501
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
814 |
abort: exporting bookmark @ failed! |
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
815 |
[255] |
25357
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
816 |
$ hg -R ../issue4455-dest/ bookmarks |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
817 |
no bookmarks set |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
818 |
|
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
819 |
$ hg push -B @ ssh --config experimental.bundle2-exp=False |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
820 |
pushing to ssh://user@dummy/issue4455-dest |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
821 |
searching for changes |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
822 |
no changes found |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
823 |
remote: pushkey-abort: prepushkey hook exited with status 1 |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
824 |
exporting bookmark @ failed! |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
825 |
[1] |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
826 |
$ hg -R ../issue4455-dest/ bookmarks |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
827 |
no bookmarks set |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
828 |
|
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
829 |
Using http |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
830 |
---------- |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
831 |
|
25357
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
832 |
$ hg push -B @ http --config experimental.bundle2-exp=True |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
833 |
pushing to http://localhost:$HGPORT/ |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
834 |
searching for changes |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
835 |
no changes found |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
836 |
remote: pushkey-abort: prepushkey hook exited with status 1 |
25501
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
837 |
abort: exporting bookmark @ failed! |
a99fee62611d
bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25495
diff
changeset
|
838 |
[255] |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
839 |
$ hg -R ../issue4455-dest/ bookmarks |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23199
diff
changeset
|
840 |
no bookmarks set |
25357
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
841 |
|
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
842 |
$ hg push -B @ http --config experimental.bundle2-exp=False |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
843 |
pushing to http://localhost:$HGPORT/ |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
844 |
searching for changes |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
845 |
no changes found |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
846 |
remote: pushkey-abort: prepushkey hook exited with status 1 |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
847 |
exporting bookmark @ failed! |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
848 |
[1] |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
849 |
$ hg -R ../issue4455-dest/ bookmarks |
efa2621c2859
test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25352
diff
changeset
|
850 |
no bookmarks set |