Show More
@@ -222,6 +222,9 b' def show_changeset(ui, repo, rev=0, chan' | |||||
222 |
|
222 | |||
223 | changes = changelog.read(changenode) |
|
223 | changes = changelog.read(changenode) | |
224 |
|
224 | |||
|
225 | t, tz = changes[2].split(' ') | |||
|
226 | date = time.asctime(time.localtime(float(t))) + " %+05d" % (int(tz)/-36) | |||
|
227 | ||||
225 | parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p)) |
|
228 | parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p)) | |
226 | for p in log.parents(node) |
|
229 | for p in log.parents(node) | |
227 | if ui.debugflag or p != hg.nullid] |
|
230 | if ui.debugflag or p != hg.nullid] | |
@@ -247,8 +250,7 b' def show_changeset(ui, repo, rev=0, chan' | |||||
247 | ui.debug("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]), |
|
250 | ui.debug("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]), | |
248 | hg.hex(changes[0]))) |
|
251 | hg.hex(changes[0]))) | |
249 | ui.status("user: %s\n" % changes[1]) |
|
252 | ui.status("user: %s\n" % changes[1]) | |
250 |
ui.status("date: %s\n" % |
|
253 | ui.status("date: %s\n" % date) | |
251 | time.localtime(float(changes[2].split(' ')[0])))) |
|
|||
252 |
|
254 | |||
253 | if ui.debugflag: |
|
255 | if ui.debugflag: | |
254 | files = repo.changes(changelog.parents(changenode)[0], changenode) |
|
256 | files = repo.changes(changelog.parents(changenode)[0], changenode) |
@@ -1,7 +1,7 b'' | |||||
1 | changeset: 0:acb14030fe0a |
|
1 | changeset: 0:acb14030fe0a | |
2 | tag: tip |
|
2 | tag: tip | |
3 | user: test |
|
3 | user: test | |
4 | date: Thu Jan 1 00:00:00 1970 |
|
4 | date: Thu Jan 1 00:00:00 1970 +0000 | |
5 | summary: test |
|
5 | summary: test | |
6 |
|
6 | |||
7 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
|
7 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
@@ -4,17 +4,17 b' b' | |||||
4 | changeset: 1:3b5b84850bbe |
|
4 | changeset: 1:3b5b84850bbe | |
5 | tag: tip |
|
5 | tag: tip | |
6 | user: test |
|
6 | user: test | |
7 | date: Thu Jan 1 00:00:00 1970 |
|
7 | date: Thu Jan 1 00:00:00 1970 +0000 | |
8 | summary: 2 |
|
8 | summary: 2 | |
9 |
|
9 | |||
10 | changeset: 0:c19d34741b0a |
|
10 | changeset: 0:c19d34741b0a | |
11 | user: test |
|
11 | user: test | |
12 | date: Thu Jan 1 00:00:00 1970 |
|
12 | date: Thu Jan 1 00:00:00 1970 +0000 | |
13 | summary: 1 |
|
13 | summary: 1 | |
14 |
|
14 | |||
15 | changeset: 0:c19d34741b0a |
|
15 | changeset: 0:c19d34741b0a | |
16 | user: test |
|
16 | user: test | |
17 | date: Thu Jan 1 00:00:00 1970 |
|
17 | date: Thu Jan 1 00:00:00 1970 +0000 | |
18 | summary: 1 |
|
18 | summary: 1 | |
19 |
|
19 | |||
20 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
|
20 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
@@ -16,29 +16,29 b' changeset: 2:3ef543305655' | |||||
16 | tag: tip |
|
16 | tag: tip | |
17 | parent: 0:22a449e20da5 |
|
17 | parent: 0:22a449e20da5 | |
18 | user: test |
|
18 | user: test | |
19 | date: Thu Jan 1 00:00:00 1970 |
|
19 | date: Thu Jan 1 00:00:00 1970 +0000 | |
20 | summary: chmod +x a |
|
20 | summary: chmod +x a | |
21 |
|
21 | |||
22 | changeset: 1:c6ecefc45368 |
|
22 | changeset: 1:c6ecefc45368 | |
23 | user: test |
|
23 | user: test | |
24 | date: Thu Jan 1 00:00:00 1970 |
|
24 | date: Thu Jan 1 00:00:00 1970 +0000 | |
25 | summary: a updated |
|
25 | summary: a updated | |
26 |
|
26 | |||
27 | changeset: 2:3ef543305655 |
|
27 | changeset: 2:3ef543305655 | |
28 | tag: tip |
|
28 | tag: tip | |
29 | parent: 0:22a449e20da5 |
|
29 | parent: 0:22a449e20da5 | |
30 | user: test |
|
30 | user: test | |
31 | date: Thu Jan 1 00:00:00 1970 |
|
31 | date: Thu Jan 1 00:00:00 1970 +0000 | |
32 | summary: chmod +x a |
|
32 | summary: chmod +x a | |
33 |
|
33 | |||
34 | changeset: 1:c6ecefc45368 |
|
34 | changeset: 1:c6ecefc45368 | |
35 | user: test |
|
35 | user: test | |
36 | date: Thu Jan 1 00:00:00 1970 |
|
36 | date: Thu Jan 1 00:00:00 1970 +0000 | |
37 | summary: a updated |
|
37 | summary: a updated | |
38 |
|
38 | |||
39 | changeset: 0:22a449e20da5 |
|
39 | changeset: 0:22a449e20da5 | |
40 | user: test |
|
40 | user: test | |
41 | date: Thu Jan 1 00:00:00 1970 |
|
41 | date: Thu Jan 1 00:00:00 1970 +0000 | |
42 | summary: added a b |
|
42 | summary: added a b | |
43 |
|
43 | |||
44 | resolving manifests |
|
44 | resolving manifests |
@@ -6,7 +6,7 b' 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00' | |||||
6 | changeset: 2:9f827976dae4 |
|
6 | changeset: 2:9f827976dae4 | |
7 | tag: tip |
|
7 | tag: tip | |
8 | user: test |
|
8 | user: test | |
9 | date: Thu Jan 1 00:00:00 1970 |
|
9 | date: Thu Jan 1 00:00:00 1970 +0000 | |
10 | summary: 2 |
|
10 | summary: 2 | |
11 |
|
11 | |||
12 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
12 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
@@ -14,7 +14,7 b' 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00' | |||||
14 | changeset: 3:c8225a106186 |
|
14 | changeset: 3:c8225a106186 | |
15 | tag: tip |
|
15 | tag: tip | |
16 | user: test |
|
16 | user: test | |
17 | date: Thu Jan 1 00:00:00 1970 |
|
17 | date: Thu Jan 1 00:00:00 1970 +0000 | |
18 | summary: 3 |
|
18 | summary: 3 | |
19 |
|
19 | |||
20 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
20 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
@@ -22,7 +22,7 b' 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00' | |||||
22 | changeset: 4:8dfeee82a94b |
|
22 | changeset: 4:8dfeee82a94b | |
23 | tag: tip |
|
23 | tag: tip | |
24 | user: test |
|
24 | user: test | |
25 | date: Thu Jan 1 00:00:00 1970 |
|
25 | date: Thu Jan 1 00:00:00 1970 +0000 | |
26 | summary: 4 |
|
26 | summary: 4 | |
27 |
|
27 | |||
28 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
28 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
@@ -30,7 +30,7 b' 54837d97f2932a8194e69745a280a2c11e61ff9c' | |||||
30 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
|
30 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c | |
31 | changeset: 4:8dfeee82a94b |
|
31 | changeset: 4:8dfeee82a94b | |
32 | user: test |
|
32 | user: test | |
33 | date: Thu Jan 1 00:00:00 1970 |
|
33 | date: Thu Jan 1 00:00:00 1970 +0000 | |
34 | summary: 4 |
|
34 | summary: 4 | |
35 |
|
35 | |||
36 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
36 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
@@ -40,7 +40,7 b' tag: tip' | |||||
40 | parent: 4:8dfeee82a94b |
|
40 | parent: 4:8dfeee82a94b | |
41 | parent: 5:a7925a42d0df |
|
41 | parent: 5:a7925a42d0df | |
42 | user: test |
|
42 | user: test | |
43 | date: Thu Jan 1 00:00:00 1970 |
|
43 | date: Thu Jan 1 00:00:00 1970 +0000 | |
44 | summary: 6 |
|
44 | summary: 6 | |
45 |
|
45 | |||
46 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
46 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
@@ -48,6 +48,6 b' 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00' | |||||
48 | changeset: 7:3a157da4365d |
|
48 | changeset: 7:3a157da4365d | |
49 | tag: tip |
|
49 | tag: tip | |
50 | user: test |
|
50 | user: test | |
51 | date: Thu Jan 1 00:00:00 1970 |
|
51 | date: Thu Jan 1 00:00:00 1970 +0000 | |
52 | summary: 7 |
|
52 | summary: 7 | |
53 |
|
53 |
@@ -1,19 +1,19 b'' | |||||
1 | changeset: 0:acb14030fe0a |
|
1 | changeset: 0:acb14030fe0a | |
2 | tag: tip |
|
2 | tag: tip | |
3 | user: test |
|
3 | user: test | |
4 | date: Thu Jan 1 00:00:00 1970 |
|
4 | date: Thu Jan 1 00:00:00 1970 +0000 | |
5 | summary: test |
|
5 | summary: test | |
6 |
|
6 | |||
7 | changeset: 1:863197ef0378 |
|
7 | changeset: 1:863197ef0378 | |
8 | tag: tip |
|
8 | tag: tip | |
9 | user: test |
|
9 | user: test | |
10 | date: Thu Jan 1 00:00:00 1970 |
|
10 | date: Thu Jan 1 00:00:00 1970 +0000 | |
11 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
11 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 | |
12 |
|
12 | |||
13 | changeset: 0:acb14030fe0a |
|
13 | changeset: 0:acb14030fe0a | |
14 | tag: bleah |
|
14 | tag: bleah | |
15 | user: test |
|
15 | user: test | |
16 | date: Thu Jan 1 00:00:00 1970 |
|
16 | date: Thu Jan 1 00:00:00 1970 +0000 | |
17 | summary: test |
|
17 | summary: test | |
18 |
|
18 | |||
19 | abort: working copy of .hgtags is changed! |
|
19 | abort: working copy of .hgtags is changed! |
@@ -6,7 +6,7 b' 1 files, 1 changesets, 1 total revisions' | |||||
6 | changeset: 0:acb14030fe0a |
|
6 | changeset: 0:acb14030fe0a | |
7 | tag: tip |
|
7 | tag: tip | |
8 | user: test |
|
8 | user: test | |
9 | date: Thu Jan 1 00:00:00 1970 |
|
9 | date: Thu Jan 1 00:00:00 1970 +0000 | |
10 | summary: test |
|
10 | summary: test | |
11 |
|
11 | |||
12 | rolling back last transaction |
|
12 | rolling back last transaction |
@@ -9,11 +9,11 b' added 1 changesets with 1 changes to 1 f' | |||||
9 | changeset: 1:9a79c33a9db3 |
|
9 | changeset: 1:9a79c33a9db3 | |
10 | tag: tip |
|
10 | tag: tip | |
11 | user: a |
|
11 | user: a | |
12 | date: Thu Jan 1 00:00:00 1970 |
|
12 | date: Thu Jan 1 00:00:00 1970 +0000 | |
13 | summary: a |
|
13 | summary: a | |
14 |
|
14 | |||
15 | changeset: 0:01f8062b2de5 |
|
15 | changeset: 0:01f8062b2de5 | |
16 | user: b |
|
16 | user: b | |
17 | date: Thu Jan 1 00:00:00 1970 |
|
17 | date: Thu Jan 1 00:00:00 1970 +0000 | |
18 | summary: b |
|
18 | summary: b | |
19 |
|
19 |
@@ -22,13 +22,13 b' resolving manifests' | |||||
22 | changeset: 1:1e71731e6fbb |
|
22 | changeset: 1:1e71731e6fbb | |
23 | tag: tip |
|
23 | tag: tip | |
24 | user: test |
|
24 | user: test | |
25 | date: Thu Jan 1 00:00:00 1970 |
|
25 | date: Thu Jan 1 00:00:00 1970 +0000 | |
26 | summary: 2 |
|
26 | summary: 2 | |
27 |
|
27 | |||
28 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
28 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
29 | tag: tip |
|
29 | tag: tip | |
30 | user: test |
|
30 | user: test | |
31 | date: Thu Jan 1 00:00:00 1970 |
|
31 | date: Thu Jan 1 00:00:00 1970 +0000 | |
32 | files: a b |
|
32 | files: a b | |
33 | description: |
|
33 | description: | |
34 | 2 |
|
34 | 2 | |
@@ -36,7 +36,7 b' 2' | |||||
36 |
|
36 | |||
37 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
37 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
38 | user: test |
|
38 | user: test | |
39 | date: Thu Jan 1 00:00:00 1970 |
|
39 | date: Thu Jan 1 00:00:00 1970 +0000 | |
40 | files: a |
|
40 | files: a | |
41 | description: |
|
41 | description: | |
42 | 1 |
|
42 | 1 |
General Comments 0
You need to be logged in to leave comments.
Login now