2015-03-31 06:15:03 +03:00
|
|
|
#require serve
|
|
|
|
|
|
|
|
$ request() {
|
2015-06-08 22:44:30 +03:00
|
|
|
> get-with-headers.py --json localhost:$HGPORT "$1"
|
2015-03-31 06:15:03 +03:00
|
|
|
> }
|
|
|
|
|
|
|
|
$ hg init test
|
|
|
|
$ cd test
|
|
|
|
$ mkdir da
|
|
|
|
$ echo foo > da/foo
|
|
|
|
$ echo foo > foo
|
|
|
|
$ hg -q ci -A -m initial
|
|
|
|
$ echo bar > foo
|
|
|
|
$ hg ci -m 'modify foo'
|
|
|
|
$ echo bar > da/foo
|
|
|
|
$ hg ci -m 'modify da/foo'
|
|
|
|
$ hg bookmark bookmark1
|
|
|
|
$ hg up default
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(leaving bookmark bookmark1)
|
|
|
|
$ hg mv foo foo-new
|
|
|
|
$ hg commit -m 'move foo'
|
|
|
|
$ hg tag -m 'create tag' tag1
|
2015-04-01 08:29:12 +03:00
|
|
|
$ hg phase --public -r .
|
2015-03-31 06:15:03 +03:00
|
|
|
$ echo baz > da/foo
|
|
|
|
$ hg commit -m 'another commit to da/foo'
|
|
|
|
$ hg tag -m 'create tag2' tag2
|
|
|
|
$ hg bookmark bookmark2
|
|
|
|
$ hg -q up -r 0
|
|
|
|
$ hg -q branch test-branch
|
|
|
|
$ echo branch > foo
|
|
|
|
$ hg commit -m 'create test branch'
|
2015-04-01 08:35:12 +03:00
|
|
|
$ echo branch_commit_2 > foo
|
|
|
|
$ hg commit -m 'another commit in test-branch'
|
|
|
|
$ hg -q up default
|
|
|
|
$ hg merge --tool :local test-branch
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg commit -m 'merge test-branch into default'
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
$ hg log -G
|
2015-04-01 08:35:12 +03:00
|
|
|
@ changeset: 9:cc725e08502a
|
|
|
|
|\ tag: tip
|
|
|
|
| | parent: 6:ceed296fe500
|
|
|
|
| | parent: 8:ed66c30e87eb
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: merge test-branch into default
|
|
|
|
| |
|
|
|
|
| o changeset: 8:ed66c30e87eb
|
|
|
|
| | branch: test-branch
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: another commit in test-branch
|
|
|
|
| |
|
|
|
|
| o changeset: 7:6ab967a8ab34
|
|
|
|
| | branch: test-branch
|
|
|
|
| | parent: 0:06e557f3edf6
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: create test branch
|
|
|
|
| |
|
|
|
|
o | changeset: 6:ceed296fe500
|
2015-03-31 06:15:03 +03:00
|
|
|
| | bookmark: bookmark2
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: create tag2
|
|
|
|
| |
|
2015-04-01 08:35:12 +03:00
|
|
|
o | changeset: 5:f2890a05fea4
|
2015-03-31 06:15:03 +03:00
|
|
|
| | tag: tag2
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: another commit to da/foo
|
|
|
|
| |
|
2015-04-01 08:35:12 +03:00
|
|
|
o | changeset: 4:93a8ce14f891
|
2015-03-31 06:15:03 +03:00
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: create tag
|
|
|
|
| |
|
2015-04-01 08:35:12 +03:00
|
|
|
o | changeset: 3:78896eb0e102
|
2015-03-31 06:15:03 +03:00
|
|
|
| | tag: tag1
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: move foo
|
|
|
|
| |
|
2015-04-01 08:35:12 +03:00
|
|
|
o | changeset: 2:8d7c456572ac
|
2015-03-31 06:15:03 +03:00
|
|
|
| | bookmark: bookmark1
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: modify da/foo
|
|
|
|
| |
|
2015-04-01 08:35:12 +03:00
|
|
|
o | changeset: 1:f8bbb9024b10
|
2015-03-31 06:15:03 +03:00
|
|
|
|/ user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: modify foo
|
|
|
|
|
|
|
|
|
o changeset: 0:06e557f3edf6
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: initial
|
|
|
|
|
|
|
|
|
2016-07-01 08:36:59 +03:00
|
|
|
$ echo '[web]' >> .hg/hgrc
|
|
|
|
$ echo 'allow_archive = bz2' >> .hg/hgrc
|
2015-03-31 06:15:03 +03:00
|
|
|
$ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
|
|
|
|
(Try to keep these in roughly the order they are defined in webcommands.py)
|
|
|
|
|
|
|
|
(log is handled by filelog/ and changelog/ - ignore it)
|
|
|
|
|
|
|
|
(rawfile/ doesn't use templating - nothing to test)
|
|
|
|
|
|
|
|
file/{revision}/{path} shows file revision
|
|
|
|
|
2016-06-03 13:32:42 +03:00
|
|
|
$ request json-file/78896eb0e102/foo-new
|
2015-03-31 06:15:03 +03:00
|
|
|
200 Script output follows
|
|
|
|
|
2016-06-03 13:32:42 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"lines": [
|
|
|
|
{
|
|
|
|
"line": "bar\n"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
|
|
|
"path": "foo-new",
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
file/{revision} shows root directory info
|
|
|
|
|
2015-04-02 08:04:03 +03:00
|
|
|
$ request json-file/cc725e08502a
|
2015-03-31 06:15:03 +03:00
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-02 08:04:03 +03:00
|
|
|
{
|
|
|
|
"abspath": "/",
|
|
|
|
"bookmarks": [],
|
|
|
|
"directories": [
|
|
|
|
{
|
|
|
|
"abspath": "/da",
|
|
|
|
"basename": "da",
|
|
|
|
"emptydirs": ""
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"files": [
|
|
|
|
{
|
|
|
|
"abspath": ".hgtags",
|
|
|
|
"basename": ".hgtags",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"flags": "",
|
|
|
|
"size": 92
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"abspath": "foo-new",
|
|
|
|
"basename": "foo-new",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"flags": "",
|
|
|
|
"size": 4
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
changelog/ shows information about several changesets
|
|
|
|
|
|
|
|
$ request json-changelog
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:53:48 +03:00
|
|
|
{
|
|
|
|
"changeset_count": 10,
|
|
|
|
"changesets": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "merge test-branch into default",
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"ed66c30e87eb65337c05a4229efaa5f1d5285a90"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "test-branch",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit in test-branch",
|
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"6ab967a8ab3489227a83f80e920faa039a71819f"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "test-branch",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark2"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag2",
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"f2890a05fea49bfaf9fb27ed5490894eba32da78"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit to da/foo",
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"93a8ce14f89156426b7fa981af8042da53f03aa0"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tag2"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag",
|
|
|
|
"node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"78896eb0e102174ce9278438a95e12543e4367a7"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
2015-04-01 08:53:48 +03:00
|
|
|
changelog/{revision} shows information starting at a specific changeset
|
2015-03-31 06:15:03 +03:00
|
|
|
|
2015-04-01 08:53:48 +03:00
|
|
|
$ request json-changelog/f8bbb9024b10
|
2015-03-31 06:15:03 +03:00
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:53:48 +03:00
|
|
|
{
|
|
|
|
"changeset_count": 10,
|
|
|
|
"changesets": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
shortlog/ shows information about a set of changesets
|
|
|
|
|
|
|
|
$ request json-shortlog
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:53:48 +03:00
|
|
|
{
|
|
|
|
"changeset_count": 10,
|
|
|
|
"changesets": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "merge test-branch into default",
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"ed66c30e87eb65337c05a4229efaa5f1d5285a90"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "test-branch",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit in test-branch",
|
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"6ab967a8ab3489227a83f80e920faa039a71819f"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "test-branch",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark2"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag2",
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"f2890a05fea49bfaf9fb27ed5490894eba32da78"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit to da/foo",
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"93a8ce14f89156426b7fa981af8042da53f03aa0"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tag2"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag",
|
|
|
|
"node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"78896eb0e102174ce9278438a95e12543e4367a7"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"branch": "default",
|
2015-04-01 08:53:48 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
2016-03-31 13:09:09 +03:00
|
|
|
"parents": [],
|
2016-06-03 12:28:22 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:53:48 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
changeset/ renders the tip changeset
|
|
|
|
|
|
|
|
$ request json-rev
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:35:12 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "merge test-branch into default",
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"parents": [
|
|
|
|
"ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"ed66c30e87eb65337c05a4229efaa5f1d5285a90"
|
|
|
|
],
|
2015-04-01 08:29:12 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:35:12 +03:00
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
changeset/{revision} shows tags
|
|
|
|
|
|
|
|
$ request json-rev/78896eb0e102
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:35:12 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
2015-04-01 08:29:12 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:35:12 +03:00
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
changeset/{revision} shows bookmarks
|
|
|
|
|
|
|
|
$ request json-rev/8d7c456572ac
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:35:12 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
2015-04-01 08:29:12 +03:00
|
|
|
"phase": "public",
|
2015-04-01 08:35:12 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
changeset/{revision} shows branches
|
|
|
|
|
|
|
|
$ request json-rev/6ab967a8ab34
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 08:35:12 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
2015-04-01 08:29:12 +03:00
|
|
|
"phase": "draft",
|
2015-04-01 08:35:12 +03:00
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
manifest/{revision}/{path} shows info about a directory at a revision
|
|
|
|
|
|
|
|
$ request json-manifest/06e557f3edf6/
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-02 08:04:03 +03:00
|
|
|
{
|
|
|
|
"abspath": "/",
|
|
|
|
"bookmarks": [],
|
|
|
|
"directories": [
|
|
|
|
{
|
|
|
|
"abspath": "/da",
|
|
|
|
"basename": "da",
|
|
|
|
"emptydirs": ""
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"files": [
|
|
|
|
{
|
|
|
|
"abspath": "foo",
|
|
|
|
"basename": "foo",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"flags": "",
|
|
|
|
"size": 4
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"tags": []
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
tags/ shows tags info
|
|
|
|
|
|
|
|
$ request json-tags
|
|
|
|
200 Script output follows
|
|
|
|
|
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).
2015-04-01 00:52:21 +03:00
|
|
|
{
|
2015-04-01 08:35:12 +03:00
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
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).
2015-04-01 00:52:21 +03:00
|
|
|
"tags": [
|
|
|
|
{
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
|
|
|
"tag": "tag2"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"tag": "tag1"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
bookmarks/ shows bookmarks info
|
|
|
|
|
|
|
|
$ request json-bookmarks
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-01 00:54:56 +03:00
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
{
|
2016-03-31 10:22:06 +03:00
|
|
|
"bookmark": "bookmark2",
|
2015-04-01 00:54:56 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
2016-03-31 10:22:06 +03:00
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45"
|
2015-04-01 00:54:56 +03:00
|
|
|
},
|
|
|
|
{
|
2016-03-31 10:22:06 +03:00
|
|
|
"bookmark": "bookmark1",
|
2015-04-01 00:54:56 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
2016-03-31 10:22:06 +03:00
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
2015-04-01 00:54:56 +03:00
|
|
|
}
|
|
|
|
],
|
2015-04-01 08:35:12 +03:00
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
|
2015-04-01 00:54:56 +03:00
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
branches/ shows branches info
|
|
|
|
|
|
|
|
$ request json-branches
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-03-31 07:37:24 +03:00
|
|
|
{
|
|
|
|
"branches": [
|
|
|
|
{
|
2015-04-01 08:35:12 +03:00
|
|
|
"branch": "default",
|
2015-03-31 07:37:24 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
2015-04-01 08:35:12 +03:00
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
2015-03-31 07:37:24 +03:00
|
|
|
"status": "open"
|
|
|
|
},
|
|
|
|
{
|
2015-04-01 08:35:12 +03:00
|
|
|
"branch": "test-branch",
|
2015-03-31 07:37:24 +03:00
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
2015-04-01 08:35:12 +03:00
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
|
|
|
"status": "inactive"
|
2015-03-31 07:37:24 +03:00
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
summary/ shows a summary of repository state
|
|
|
|
|
|
|
|
$ request json-summary
|
|
|
|
200 Script output follows
|
|
|
|
|
2016-06-06 16:14:11 +03:00
|
|
|
{
|
2016-07-01 08:36:59 +03:00
|
|
|
"archives": [
|
|
|
|
{
|
|
|
|
"extension": ".tar.bz2",
|
|
|
|
"node": "tip",
|
2016-07-01 08:54:35 +03:00
|
|
|
"type": "bz2",
|
|
|
|
"url": "http://*:$HGPORT/archive/tip.tar.bz2" (glob)
|
2016-07-01 08:36:59 +03:00
|
|
|
}
|
|
|
|
],
|
2016-06-06 16:14:11 +03:00
|
|
|
"bookmarks": [
|
|
|
|
{
|
|
|
|
"bookmark": "bookmark2",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmark": "bookmark1",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"branches": [
|
|
|
|
{
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"status": "open"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"branch": "test-branch",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
|
|
|
"status": "inactive"
|
|
|
|
}
|
|
|
|
],
|
2016-07-01 04:59:53 +03:00
|
|
|
"labels": [],
|
2016-06-06 16:14:11 +03:00
|
|
|
"lastchange": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"shortlog": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "merge test-branch into default",
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"parents": [
|
|
|
|
"ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"ed66c30e87eb65337c05a4229efaa5f1d5285a90"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit in test-branch",
|
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
|
|
|
"parents": [
|
|
|
|
"6ab967a8ab3489227a83f80e920faa039a71819f"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark2"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag2",
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"parents": [
|
|
|
|
"f2890a05fea49bfaf9fb27ed5490894eba32da78"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit to da/foo",
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
|
|
|
"parents": [
|
|
|
|
"93a8ce14f89156426b7fa981af8042da53f03aa0"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [
|
|
|
|
"tag2"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag",
|
|
|
|
"node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
|
|
|
|
"parents": [
|
|
|
|
"78896eb0e102174ce9278438a95e12543e4367a7"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"parents": [],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"tags": [
|
|
|
|
{
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
|
|
|
"tag": "tag2"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"tag": "tag1"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
2016-06-10 11:31:42 +03:00
|
|
|
$ request json-changelog?rev=create
|
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
{
|
|
|
|
"entries": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark2"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag2",
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"parents": [
|
|
|
|
"f2890a05fea49bfaf9fb27ed5490894eba32da78"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag",
|
|
|
|
"node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
|
|
|
|
"parents": [
|
|
|
|
"78896eb0e102174ce9278438a95e12543e4367a7"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"query": "create"
|
|
|
|
}
|
|
|
|
|
2015-03-31 06:15:03 +03:00
|
|
|
filediff/{revision}/{path} shows changes to a file in a revision
|
|
|
|
|
|
|
|
$ request json-diff/f8bbb9024b10/foo
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-11 05:39:22 +03:00
|
|
|
{
|
|
|
|
"author": "test",
|
|
|
|
"children": [],
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"diff": [
|
|
|
|
{
|
|
|
|
"blockno": 1,
|
|
|
|
"lines": [
|
|
|
|
{
|
|
|
|
"l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n",
|
|
|
|
"n": 1,
|
|
|
|
"t": "-"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n",
|
|
|
|
"n": 2,
|
|
|
|
"t": "+"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"l": "@@ -1,1 +1,1 @@\n",
|
|
|
|
"n": 3,
|
|
|
|
"t": "@"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"l": "-foo\n",
|
|
|
|
"n": 4,
|
|
|
|
"t": "-"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"l": "+bar\n",
|
|
|
|
"n": 5,
|
|
|
|
"t": "+"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"path": "foo"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
comparison/{revision}/{path} shows information about before and after for a file
|
|
|
|
|
|
|
|
$ request json-comparison/f8bbb9024b10/foo
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-11 05:26:53 +03:00
|
|
|
{
|
|
|
|
"author": "test",
|
|
|
|
"children": [],
|
|
|
|
"comparison": [
|
|
|
|
{
|
|
|
|
"lines": [
|
|
|
|
{
|
|
|
|
"ll": "foo",
|
|
|
|
"ln": 1,
|
|
|
|
"rl": "bar",
|
|
|
|
"rn": 1,
|
|
|
|
"t": "replace"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"leftnode": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"path": "foo",
|
|
|
|
"rightnode": "f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
annotate/{revision}/{path} shows annotations for each line
|
|
|
|
|
|
|
|
$ request json-annotate/f8bbb9024b10/foo
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-11 05:37:40 +03:00
|
|
|
{
|
|
|
|
"abspath": "foo",
|
|
|
|
"annotate": [
|
|
|
|
{
|
|
|
|
"abspath": "foo",
|
|
|
|
"author": "test",
|
|
|
|
"desc": "modify foo",
|
|
|
|
"line": "bar\n",
|
|
|
|
"lineno": 1,
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"revdate": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"targetline": 1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"author": "test",
|
|
|
|
"children": [],
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"permissions": ""
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
filelog/{revision}/{path} shows history of a single file
|
|
|
|
|
|
|
|
$ request json-filelog/f8bbb9024b10/foo
|
|
|
|
200 Script output follows
|
|
|
|
|
2016-06-03 12:28:22 +03:00
|
|
|
{
|
|
|
|
"entries": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"parents": [],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
|
|
|
|
$ request json-filelog/cc725e08502a/da/foo
|
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
{
|
|
|
|
"entries": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit to da/foo",
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"tags": [
|
|
|
|
"tag2"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"parents": [],
|
|
|
|
"phase": "public",
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
(archive/ doesn't use templating, so ignore it)
|
|
|
|
|
|
|
|
(static/ doesn't use templating, so ignore it)
|
|
|
|
|
|
|
|
graph/ shows information that can be used to render a graph of the DAG
|
|
|
|
|
|
|
|
$ request json-graph
|
|
|
|
200 Script output follows
|
|
|
|
|
2017-12-07 12:18:29 +03:00
|
|
|
{
|
|
|
|
"changeset_count": 10,
|
|
|
|
"changesets": [
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "merge test-branch into default",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
|
|
|
|
"parents": [
|
|
|
|
"ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"ed66c30e87eb65337c05a4229efaa5f1d5285a90"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"row": 0,
|
|
|
|
"tags": [
|
|
|
|
"tip"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit in test-branch",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
|
|
|
|
"parents": [
|
|
|
|
"6ab967a8ab3489227a83f80e920faa039a71819f"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"row": 1,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "test-branch",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create test branch",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "6ab967a8ab3489227a83f80e920faa039a71819f",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"row": 2,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark2"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag2",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
|
|
|
|
"parents": [
|
|
|
|
"f2890a05fea49bfaf9fb27ed5490894eba32da78"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"row": 3,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "another commit to da/foo",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
|
|
|
|
"parents": [
|
|
|
|
"93a8ce14f89156426b7fa981af8042da53f03aa0"
|
|
|
|
],
|
|
|
|
"phase": "draft",
|
|
|
|
"row": 4,
|
|
|
|
"tags": [
|
|
|
|
"tag2"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "create tag",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
|
|
|
|
"parents": [
|
|
|
|
"78896eb0e102174ce9278438a95e12543e4367a7"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"row": 5,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "move foo",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "78896eb0e102174ce9278438a95e12543e4367a7",
|
|
|
|
"parents": [
|
|
|
|
"8d7c456572acf3557e8ed8a07286b10c408bcec5"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"row": 6,
|
|
|
|
"tags": [
|
|
|
|
"tag1"
|
|
|
|
],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [
|
|
|
|
"bookmark1"
|
|
|
|
],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify da/foo",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 1,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
|
|
|
|
"parents": [
|
|
|
|
"f8bbb9024b10f93cdbb8d940337398291d40dea8"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"row": 7,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "modify foo",
|
|
|
|
"edges": [
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 0,
|
|
|
|
"color": 1,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bcolor": "",
|
|
|
|
"col": 1,
|
|
|
|
"color": 2,
|
|
|
|
"nextcol": 0,
|
|
|
|
"width": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
|
|
|
|
"parents": [
|
|
|
|
"06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
|
|
|
|
],
|
|
|
|
"phase": "public",
|
|
|
|
"row": 8,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bookmarks": [],
|
|
|
|
"branch": "default",
|
|
|
|
"col": 0,
|
|
|
|
"color": 2,
|
|
|
|
"date": [
|
|
|
|
0.0,
|
|
|
|
0
|
|
|
|
],
|
|
|
|
"desc": "initial",
|
|
|
|
"edges": [],
|
|
|
|
"node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
|
|
|
|
"parents": [],
|
|
|
|
"phase": "public",
|
|
|
|
"row": 9,
|
|
|
|
"tags": [],
|
|
|
|
"user": "test"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
help/ shows help topics
|
|
|
|
|
|
|
|
$ request json-help
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"earlycommands": [
|
|
|
|
{
|
|
|
|
"summary": "add the specified files on the next commit",
|
|
|
|
"topic": "add"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show changeset information by line for each file",
|
|
|
|
"topic": "annotate"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "make a copy of an existing repository",
|
|
|
|
"topic": "clone"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "commit the specified files or all outstanding changes",
|
|
|
|
"topic": "commit"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "diff repository (or selected files)",
|
|
|
|
"topic": "diff"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "dump the header and diffs for one or more changesets",
|
|
|
|
"topic": "export"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "forget the specified files on the next commit",
|
|
|
|
"topic": "forget"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "create a new repository in the given directory",
|
|
|
|
"topic": "init"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show revision history of entire repository or files",
|
|
|
|
"topic": "log"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "merge another revision into working directory",
|
|
|
|
"topic": "merge"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "pull changes from the specified source",
|
|
|
|
"topic": "pull"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "push changes to the specified destination",
|
|
|
|
"topic": "push"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "remove the specified files on the next commit",
|
|
|
|
"topic": "remove"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "start stand-alone webserver",
|
|
|
|
"topic": "serve"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show changed files in the working directory",
|
|
|
|
"topic": "status"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "summarize working directory state",
|
|
|
|
"topic": "summary"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "update working directory (or switch revisions)",
|
|
|
|
"topic": "update"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"othercommands": [
|
|
|
|
{
|
|
|
|
"summary": "add all new files, delete all missing files",
|
|
|
|
"topic": "addremove"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "create an unversioned archive of a repository revision",
|
|
|
|
"topic": "archive"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "reverse effect of earlier changeset",
|
|
|
|
"topic": "backout"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "subdivision search of changesets",
|
|
|
|
"topic": "bisect"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "create a new bookmark or list existing bookmarks",
|
|
|
|
"topic": "bookmarks"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "set or show the current branch name",
|
|
|
|
"topic": "branch"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "list repository named branches",
|
|
|
|
"topic": "branches"
|
|
|
|
},
|
|
|
|
{
|
2017-04-01 23:43:43 +03:00
|
|
|
"summary": "create a bundle file",
|
2015-04-02 08:16:05 +03:00
|
|
|
"topic": "bundle"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "output the current or given revision of files",
|
|
|
|
"topic": "cat"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show combined config settings from all hgrc files",
|
|
|
|
"topic": "config"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "mark files as copied for the next commit",
|
|
|
|
"topic": "copy"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "list tracked files",
|
|
|
|
"topic": "files"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "copy changes from other branches onto the current branch",
|
|
|
|
"topic": "graft"
|
|
|
|
},
|
|
|
|
{
|
2016-09-23 20:45:10 +03:00
|
|
|
"summary": "search revision history for a pattern in specified files",
|
2015-04-02 08:16:05 +03:00
|
|
|
"topic": "grep"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show branch heads",
|
|
|
|
"topic": "heads"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show help for a given topic or a help overview",
|
|
|
|
"topic": "help"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "identify the working directory or specified revision",
|
|
|
|
"topic": "identify"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "import an ordered set of patches",
|
|
|
|
"topic": "import"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show new changesets found in source",
|
|
|
|
"topic": "incoming"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "output the current or given revision of the project manifest",
|
|
|
|
"topic": "manifest"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show changesets not found in the destination",
|
|
|
|
"topic": "outgoing"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "show aliases for remote repositories",
|
|
|
|
"topic": "paths"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "set or show the current phase name",
|
|
|
|
"topic": "phase"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "roll back an interrupted transaction",
|
|
|
|
"topic": "recover"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "rename files; equivalent of copy + remove",
|
|
|
|
"topic": "rename"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "redo merges or set/view the merge status of files",
|
|
|
|
"topic": "resolve"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "restore files to their checkout state",
|
|
|
|
"topic": "revert"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "print the root (top) of the current working directory",
|
|
|
|
"topic": "root"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "add one or more tags for the current or given revision",
|
|
|
|
"topic": "tag"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "list repository tags",
|
|
|
|
"topic": "tags"
|
|
|
|
},
|
|
|
|
{
|
2017-04-01 23:43:52 +03:00
|
|
|
"summary": "apply one or more bundle files",
|
2015-04-02 08:16:05 +03:00
|
|
|
"topic": "unbundle"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "verify the integrity of the repository",
|
|
|
|
"topic": "verify"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "output version and copyright information",
|
|
|
|
"topic": "version"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"topics": [
|
2017-04-01 23:42:06 +03:00
|
|
|
{
|
|
|
|
"summary": "Bundle File Formats",
|
|
|
|
"topic": "bundlespec"
|
|
|
|
},
|
2017-03-01 22:22:04 +03:00
|
|
|
{
|
|
|
|
"summary": "Colorizing Outputs",
|
|
|
|
"topic": "color"
|
|
|
|
},
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"summary": "Configuration Files",
|
|
|
|
"topic": "config"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Date Formats",
|
|
|
|
"topic": "dates"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Diff Formats",
|
|
|
|
"topic": "diffs"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Environment Variables",
|
|
|
|
"topic": "environment"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Using Additional Features",
|
|
|
|
"topic": "extensions"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Specifying File Sets",
|
|
|
|
"topic": "filesets"
|
|
|
|
},
|
2017-10-31 06:35:30 +03:00
|
|
|
{
|
|
|
|
"summary": "Command-line flags",
|
|
|
|
"topic": "flags"
|
|
|
|
},
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"summary": "Glossary",
|
|
|
|
"topic": "glossary"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Syntax for Mercurial Ignore Files",
|
|
|
|
"topic": "hgignore"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Configuring hgweb",
|
|
|
|
"topic": "hgweb"
|
|
|
|
},
|
2015-12-13 21:35:03 +03:00
|
|
|
{
|
|
|
|
"summary": "Technical implementation topics",
|
|
|
|
"topic": "internals"
|
|
|
|
},
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"summary": "Merge Tools",
|
|
|
|
"topic": "merge-tools"
|
|
|
|
},
|
2017-02-07 08:07:53 +03:00
|
|
|
{
|
|
|
|
"summary": "Pager Support",
|
|
|
|
"topic": "pager"
|
|
|
|
},
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"summary": "File Name Patterns",
|
|
|
|
"topic": "patterns"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Working with Phases",
|
|
|
|
"topic": "phases"
|
|
|
|
},
|
|
|
|
{
|
2017-01-11 22:37:38 +03:00
|
|
|
"summary": "Specifying Revisions",
|
2015-04-02 08:16:05 +03:00
|
|
|
"topic": "revisions"
|
|
|
|
},
|
2015-07-19 03:10:28 +03:00
|
|
|
{
|
|
|
|
"summary": "Using Mercurial from scripts and automation",
|
|
|
|
"topic": "scripting"
|
|
|
|
},
|
2015-04-02 08:16:05 +03:00
|
|
|
{
|
|
|
|
"summary": "Subrepositories",
|
|
|
|
"topic": "subrepos"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "Template Usage",
|
|
|
|
"topic": "templating"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"summary": "URL Paths",
|
|
|
|
"topic": "urls"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
2015-03-31 06:15:03 +03:00
|
|
|
|
|
|
|
help/{topic} shows an individual help topic
|
|
|
|
|
|
|
|
$ request json-help/phases
|
|
|
|
200 Script output follows
|
|
|
|
|
2015-04-02 08:24:03 +03:00
|
|
|
{
|
|
|
|
"rawdoc": "Working with Phases\n*", (glob)
|
|
|
|
"topic": "phases"
|
|
|
|
}
|
2017-11-30 11:30:43 +03:00
|
|
|
|
|
|
|
Commit message with Japanese Kanji 'Noh', which ends with '\x5c'
|
|
|
|
|
|
|
|
$ echo foo >> da/foo
|
|
|
|
$ HGENCODING=cp932 hg ci -m `$PYTHON -c 'print("\x94\x5c")'`
|
|
|
|
|
|
|
|
Commit message with null character
|
|
|
|
|
|
|
|
$ echo foo >> da/foo
|
|
|
|
>>> open('msg', 'wb').write('commit with null character: \0\n')
|
|
|
|
$ hg ci -l msg
|
|
|
|
$ rm msg
|
|
|
|
|
|
|
|
Stop and restart with HGENCODING=cp932
|
|
|
|
|
|
|
|
$ killdaemons.py
|
|
|
|
$ HGENCODING=cp932 hg serve -p $HGPORT -d --pid-file=hg.pid \
|
|
|
|
> -A access.log -E error.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
|
|
|
|
Test json escape of multibyte characters
|
|
|
|
|
|
|
|
$ request json-filelog/tip/da/foo?revcount=2 | grep '"desc":'
|
|
|
|
"desc": "commit with null character: \u0000",
|
|
|
|
"desc": "\u80fd",
|