Mercurial > evolve
annotate tests/test-wireproto-bundle1.t @ 1786:b674277ea4ef stable
uncommit: don't lose copy information of remaining files (issue5403)
As reported in the issue, "hg uncommit" would lose copy information of
the files that remained in the commit. The problem was simply that the
a dict of copies was iterated as "src, dst in copies.items()" where it
should have been "dst, src ...".
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 31 Jan 2017 12:32:45 -0800 |
parents | 34e0b17858e3 |
children | e359d33856c3 9f42f819267b |
rev | line source |
---|---|
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 $ cat >> $HGRCPATH <<EOF |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 > [defaults] |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 > amend=-d "0 0" |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 > [ui] |
1523
34e0b17858e3
test: use 'dummyssh' from the run-tests directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1453
diff
changeset
|
6 > ssh=python "$RUNTESTDIR/dummyssh" |
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 > [phases] |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 > publish = False |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 > [extensions] |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 > EOF |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 $ mkcommit() { |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 > echo "$1" > "$1" |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 > hg add "$1" |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 > hg ci -m "add $1" |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 > } |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 setup repo |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 $ hg init server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 $ hg clone ssh://user@dummy/server client |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 no changes found |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 updating to branch default |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 $ cp -r client other |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 Smoke testing |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 =============== |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 $ cd client |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 $ mkcommit 0 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 $ mkcommit a |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 $ hg push |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 pushing to ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 remote: adding changesets |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 remote: adding manifests |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 remote: adding file changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 remote: added 2 changesets with 2 changes to 2 files |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 $ hg pull |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 pulling from ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 no changes found |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 $ hg pull -R ../other |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 pulling from ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 requesting all changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 adding changesets |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 adding manifests |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 adding file changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 added 2 changesets with 2 changes to 2 files |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 (run 'hg update' to get a working copy) |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 $ hg push -R ../other |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 pushing to ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 no changes found |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 [1] |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 Push |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 ============= |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 $ echo 'A' > a |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 $ hg amend |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 $ hg push |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 pushing to ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 remote: adding changesets |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 remote: adding manifests |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 remote: adding file changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1451
diff
changeset
|
72 remote: 2 new obsolescence markers |
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 $ hg push |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 pushing to ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 no changes found |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 [1] |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 Pull |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 ============= |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 $ hg -R ../other pull |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 pulling from ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
84 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 adding changesets |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 adding manifests |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 adding file changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1451
diff
changeset
|
89 2 new obsolescence markers |
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1451
diff
changeset
|
90 (run 'hg heads' to see heads, 'hg merge' to merge) |
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
91 $ hg -R ../other pull |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 pulling from ssh://user@dummy/server |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 searching for changes |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 no changes found |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 $ cd .. |
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |