Mercurial > hg
annotate tests/test-diff-reverse.t @ 27738:a0e783d26e81
exchange: make clone bundles non-experimental and enabled by default
The clone bundles feature was introduced in Mercurial 3.6 behind an
experimental and disabled by default flag. The feature has been enabled
on hg.mozilla.org for a few months and has served many terabytes of
clones. Users have been encouraged to use the feature and reception
has been very positive (mainly due to faster clones as a result of
connecting to a CDN). I have heard no feedback about changing the
feature other than inquiries about when it will be enabled by default.
So, I think the feature is ready to be enabled by default.
This patch renames experimental.clonebundles to ui.clonebundles,
documents the option, and enables it by default. References to the
experimental state of clone bundles have been removed. The remaining
config option docs in clonebundles.py have been removed because they
are redudant with `hg help config`.
There are some oddities with behavior of clone bundles. Because clones
with clone bundles are effectively 2 `hg pull` operations, there may be
2 transactions. This could result in hooks running twice. If the
subsequent pull is aborted, it could result in partial rollback and an
incomplete clone. This behavior is a bit wonky and should probably
be documented. If this patch is accepted, I'll send a follow-up to
document it. I don't think this behavior should prevent the feature
being enabled by default. Reworking the clone mechanism to support
interrupted or multi-part clones feels like a major new feature and
something that when implemented can change the hook and rollback
semantics of clone bundles. Besides, partial clone is better than
full rollback and hooks running on initial clone are likely rare, so I
think the impact is minimal.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 08 Jan 2016 10:58:04 -0800 |
parents | c586cb50872b |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12139
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
1 $ hg init |
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
2 |
12139
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
3 $ cat > a <<EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
4 > a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
5 > b |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
6 > c |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
7 > EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
8 $ hg ci -Am adda |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
9 adding a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
10 |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
11 $ cat > a <<EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
12 > d |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
13 > e |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
14 > f |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
15 > EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
16 $ hg ci -m moda |
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
17 |
12139
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
18 $ hg diff --reverse -r0 -r1 |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
19 diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
20 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
21 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
22 @@ -1,3 +1,3 @@ |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
23 -d |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
24 -e |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
25 -f |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
26 +a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
27 +b |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
28 +c |
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
29 |
12139
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
30 $ cat >> a <<EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
31 > g |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
32 > h |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
33 > EOF |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
34 $ hg diff --reverse --nodates |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
35 diff -r 2855cdcfcbb7 a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
36 --- a/a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
37 +++ b/a |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
38 @@ -1,5 +1,3 @@ |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
39 d |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
40 e |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
41 f |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
42 -g |
5a69ea8d65b3
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com>
parents:
9857
diff
changeset
|
43 -h |
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
44 |
23080
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
45 should show removed file 'a' as being added |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
46 $ hg revert a |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
47 $ hg rm a |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
48 $ hg diff --reverse --nodates a |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
49 diff -r 2855cdcfcbb7 a |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
50 --- /dev/null |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
51 +++ b/a |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
52 @@ -0,0 +1,3 @@ |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
53 +d |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
54 +e |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
55 +f |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
56 |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
57 should show added file 'b' as being removed |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
58 $ echo b >> b |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
59 $ hg add b |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
60 $ hg diff --reverse --nodates b |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
61 diff -r 2855cdcfcbb7 b |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
62 --- a/b |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
63 +++ /dev/null |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
64 @@ -1,1 +0,0 @@ |
c586cb50872b
context.status: remove incorrect swapping of added/removed in workingctx
Martin von Zweigbergk <martinvonz@google.com>
parents:
12139
diff
changeset
|
65 -b |