Show More
@@ -16,6 +16,7 b' Core:' | |||
|
16 | 16 | - better push support (hack exists) |
|
17 | 17 | - hg over ssh:// and https:// |
|
18 | 18 | - commit mailinglist/trigger/hooks |
|
19 | - make showing removed files (in history etc.) faster. | |
|
19 | 20 | |
|
20 | 21 | Commands: |
|
21 | 22 | - hg status <filename>: file rev, changeset rev, changed, added, |
@@ -25,7 +26,6 b' Commands:' | |||
|
25 | 26 | - automatic pull fallback to old-http:// |
|
26 | 27 | - hg init|pull http://example.com doesn't say that no repo was found |
|
27 | 28 | - hg annotate -u and hgweb annotate with long $EMAIL |
|
28 | - hg -v history doesn't show tkmerge as modified (removed). | |
|
29 | 29 | - hg pull default in a subdir doesn't work, if it is a relative path |
|
30 | 30 | - optionally only show merges (two parents or parent != changeset-1, etc.) |
|
31 | 31 |
@@ -123,7 +123,13 b' def show_changeset(ui, repo, rev=0, chan' | |||
|
123 | 123 | ui.status("user: %s\n" % changes[1]) |
|
124 | 124 | ui.status("date: %s\n" % time.asctime( |
|
125 | 125 | time.localtime(float(changes[2].split(' ')[0])))) |
|
126 | ui.note("files: %s\n" % " ".join(changes[3])) | |
|
126 | if ui.debugflag: | |
|
127 | files = repo.diffrevs(changelog.parents(changenode)[0], changenode) | |
|
128 | for key, value in zip(["files:", "files+:", "files-:"], files): | |
|
129 | if value: | |
|
130 | ui.note("%-12s %s\n" % (key, " ".join(value))) | |
|
131 | else: | |
|
132 | ui.note("files: %s\n" % " ".join(changes[3])) | |
|
127 | 133 | description = changes[4].strip() |
|
128 | 134 | if description: |
|
129 | 135 | if ui.verbose: |
@@ -1,3 +1,15 b'' | |||
|
1 | + umask 027 | |
|
2 | + mkdir test1 | |
|
3 | + cd test1 | |
|
4 | + hg init | |
|
5 | + touch a b | |
|
6 | + hg add a b | |
|
7 | + hg ci -t 'added a b' -u test -d '0 0' | |
|
8 | + cd .. | |
|
9 | + mkdir test2 | |
|
10 | + cd test2 | |
|
11 | + hg init | |
|
12 | + hg pull ../test1 | |
|
1 | 13 | pulling from ../test1 |
|
2 | 14 | requesting all changes |
|
3 | 15 | adding changesets |
@@ -5,6 +17,13 b' adding manifests' | |||
|
5 | 17 | adding file revisions |
|
6 | 18 | modified 2 files, added 1 changesets and 2 new revisions |
|
7 | 19 | (run 'hg update' to get a working copy) |
|
20 | + hg co | |
|
21 | + chmod +x a | |
|
22 | + hg ci -t 'chmod +x a' -u test -d '0 0' | |
|
23 | + cd ../test1 | |
|
24 | + echo 123 | |
|
25 | + hg ci -t 'a updated' -u test -d '0 0' | |
|
26 | + hg pull ../test2 | |
|
8 | 27 | pulling from ../test2 |
|
9 | 28 | searching for changes |
|
10 | 29 | adding changesets |
@@ -12,6 +31,7 b' adding manifests' | |||
|
12 | 31 | adding file revisions |
|
13 | 32 | modified 1 files, added 1 changesets and 1 new revisions |
|
14 | 33 | (run 'hg update' to get a working copy) |
|
34 | + hg heads | |
|
15 | 35 | changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
|
16 | 36 | tag: tip |
|
17 | 37 | parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
@@ -24,6 +44,7 b' user: test' | |||
|
24 | 44 | date: Thu Jan 1 00:00:00 1970 |
|
25 | 45 | summary: a updated |
|
26 | 46 | |
|
47 | + hg history | |
|
27 | 48 | changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
|
28 | 49 | tag: tip |
|
29 | 50 | parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
@@ -41,11 +62,14 b' user: test' | |||
|
41 | 62 | date: Thu Jan 1 00:00:00 1970 |
|
42 | 63 | summary: added a b |
|
43 | 64 | |
|
65 | + hg -dv co -m | |
|
44 | 66 | resolving manifests |
|
45 | 67 | ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e |
|
46 | 68 | a versions differ, resolve |
|
47 | 69 | merging a |
|
48 | 70 | resolving a |
|
49 | 71 | file a: other 37c42bd6cc03 ancestor b80de5d13875 |
|
50 | -rwxr-xr-x | |
|
51 | -rwxr-xr-x | |
|
72 | + ls -l ../test1/a ../test2/a | |
|
73 | + cut -b 0-10 | |
|
74 | -rwxr-x--- | |
|
75 | -rwxr-x--- |
@@ -24,7 +24,7 b' parent: -1:000000000000000000000000' | |||
|
24 | 24 | manifest: 2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6 |
|
25 | 25 | user: user |
|
26 | 26 | date: Thu Jan 1 00:00:00 1970 |
|
27 |
files: |
|
|
27 | files+: c | |
|
28 | 28 | description: |
|
29 | 29 | 2 |
|
30 | 30 | |
@@ -41,7 +41,7 b' parent: -1:000000000000000000000000' | |||
|
41 | 41 | manifest: 3:1102cb6dde652ec2ba8cc2777e464853afa67cef |
|
42 | 42 | user: user |
|
43 | 43 | date: Thu Jan 1 00:00:00 1970 |
|
44 |
files: |
|
|
44 | files-: b | |
|
45 | 45 | description: |
|
46 | 46 | 3 |
|
47 | 47 | |
@@ -91,7 +91,6 b' parent: 5:f8292b00383d88b470efcb2ea' | |||
|
91 | 91 | manifest: 6:71c4262e09a89666ee12a92fefa12085aad53243 |
|
92 | 92 | user: user |
|
93 | 93 | date: Thu Jan 1 00:00:00 1970 |
|
94 | files: | |
|
95 | 94 | description: |
|
96 | 95 | 6 |
|
97 | 96 | |
@@ -107,7 +106,6 b' parent: -1:000000000000000000000000' | |||
|
107 | 106 | manifest: 7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2 |
|
108 | 107 | user: user |
|
109 | 108 | date: Thu Jan 1 00:00:00 1970 |
|
110 | files: | |
|
111 | 109 | description: |
|
112 | 110 | 7 |
|
113 | 111 |
General Comments 0
You need to be logged in to leave comments.
Login now