Mercurial > hg
annotate tests/test-changelog-exec.t @ 24545:9e0c67e84896
json: implement {tags} template
Tags is pretty easy to implement. Let's start there.
The output is slightly different from `hg tags -Tjson`. For reference,
the CLI has the following output:
[
{
"node": "e2049974f9a23176c2addb61d8f5b86e0d620490",
"rev": 29880,
"tag": "tip",
"type": ""
},
...
]
Our output has the format:
{
"node": "0aeb19ea57a6d223bacddda3871cb78f24b06510",
"tags": [
{
"node": "e2049974f9a23176c2addb61d8f5b86e0d620490",
"tag": "tag1",
"date": [1427775457.0, 25200]
},
...
]
}
"rev" is omitted because it isn't a reliable identifier. We shouldn't
be exposing them in web APIs and giving the impression it remotely
resembles a stable identifier. Perhaps we could one day hide this behind
a config option (it might be useful to expose when running servers
locally).
The "type" of the tag isn't defined because this information isn't yet
exposed to the hgweb templater (it could be in a follow-up) and because
it is questionable whether different types should be exposed at all.
(Should the web interface really be exposing "local" tags?)
We use an object for the outer type instead of Array for a few reasons.
First, it is extensible. If we ever need to throw more global properties
into the output, we can do that without breaking backwards compatibility
(property additions should be backwards compatible). Second, uniformity
in web APIs is nice. Having everything return objects seems much saner than
a mix of array and object. Third, there are security issues with arrays
in older browsers. The JSON web services world almost never uses arrays
as the main type for this reason.
Another possibly controversial part about this patch is how dates are
defined. While JSON has a Date type, it is based on the JavaScript Date
type, which is widely considered a pile of garbage. It is a non-starter
for this reason.
Many of Mercurial's built-in date filters drop seconds resolution. So
that's a non-starter as well, since we want the API to be lossless where
possible. rfc3339date, rfc822date, isodatesec, and date are all lossless.
However, they each require the client to perform string parsing on top of
JSON decoding. While date parsing libraries are pretty ubiquitous, some
languages don't have them out of the box. However, pretty much every
programming language can deal with UNIX timestamps (which are just
integers or floats). So, we choose to use Mercurial's internal date
representation, which in JSON is modeled as float seconds since UNIX
epoch and an integer timezone offset from UTC (keep in mind
JavaScript/JSON models all "Numbers" as double prevision floating point
numbers, so there isn't a difference between ints and floats in JSON).
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 31 Mar 2015 14:52:21 -0700 |
parents | e6e7ef68c879 |
children | 009d0283de5f |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
1 #require execbit |
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
2 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
3 b51a8138292a introduced a regression where we would mention in the |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
4 changelog executable files added by the second parent of a merge. Test |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
5 that that doesn't happen anymore |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
6 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
7 $ hg init repo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
8 $ cd repo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
9 $ echo foo > foo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
10 $ hg ci -qAm 'add foo' |
5227
466323968b23
Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
12 $ echo bar > bar |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
13 $ chmod +x bar |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
14 $ hg ci -qAm 'add bar' |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
15 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
16 manifest of p2: |
5227
466323968b23
Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
18 $ hg manifest |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
19 bar |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
20 foo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
21 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
22 $ hg up -qC 0 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
23 $ echo >> foo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
24 $ hg ci -m 'change foo' |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
25 created new head |
5227
466323968b23
Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
26 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
27 manifest of p1: |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
28 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
29 $ hg manifest |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
30 foo |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
31 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
32 $ hg merge |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
34 (branch merge, don't forget to commit) |
22492
d5261db0011f
commit: catch changed exec bit on files from p1 (issue4382)
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
35 $ chmod +x foo |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
36 $ hg ci -m 'merge' |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
37 |
22492
d5261db0011f
commit: catch changed exec bit on files from p1 (issue4382)
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
38 this should not mention bar but should mention foo: |
5227
466323968b23
Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
39 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
40 $ hg tip -v |
22492
d5261db0011f
commit: catch changed exec bit on files from p1 (issue4382)
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
41 changeset: 3:c53d17ff3380 |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
42 tag: tip |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
43 parent: 2:ed1b79f46b9a |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
44 parent: 1:d394a8db219b |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
45 user: test |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
46 date: Thu Jan 01 00:00:00 1970 +0000 |
22492
d5261db0011f
commit: catch changed exec bit on files from p1 (issue4382)
Matt Mackall <mpm@selenic.com>
parents:
17132
diff
changeset
|
47 files: foo |
11875
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
48 description: |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
49 merge |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
50 |
88f5b5c058b5
tests: unify test-changelog-exec
Martin Geisler <mg@lazybytes.net>
parents:
8167
diff
changeset
|
51 |
5227
466323968b23
Avoid adding to the changelog executable files added by the second parent.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
52 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
11875
diff
changeset
|
53 $ hg debugindex bar |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
54 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
55 0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
56 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
57 $ cd .. |