Show More
@@ -429,7 +429,7 b' def roots(repo, subset, x):' | |||||
429 | def outgoing(repo, subset, x): |
|
429 | def outgoing(repo, subset, x): | |
430 | import hg # avoid start-up nasties |
|
430 | import hg # avoid start-up nasties | |
431 | l = getargs(x, 0, 1, _("outgoing wants a repository path")) |
|
431 | l = getargs(x, 0, 1, _("outgoing wants a repository path")) | |
432 | dest = l[1:] or '' |
|
432 | dest = l and getstring(l[0], _("outgoing wants a repository path")) or '' | |
433 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
|
433 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | |
434 | dest, branches = hg.parseurl(dest) |
|
434 | dest, branches = hg.parseurl(dest) | |
435 | other = hg.repository(hg.remoteui(repo, {}), dest) |
|
435 | other = hg.repository(hg.remoteui(repo, {}), dest) |
@@ -57,6 +57,11 b' hg ci -Aqm9' | |||||
57 |
|
57 | |||
58 | hg tag -r6 1.0 |
|
58 | hg tag -r6 1.0 | |
59 |
|
59 | |||
|
60 | hg clone --quiet -U -r 7 . ../remote1 | |||
|
61 | hg clone --quiet -U -r 8 . ../remote2 | |||
|
62 | echo "[paths]" >> .hg/hgrc | |||
|
63 | echo "default = ../remote1" >> .hg/hgrc | |||
|
64 | ||||
60 | # names that should work without quoting |
|
65 | # names that should work without quoting | |
61 | try a |
|
66 | try a | |
62 | try b-a |
|
67 | try b-a | |
@@ -112,6 +117,9 b" log 'limit(head(), 1)'" | |||||
112 | log 'max(contains(a))' |
|
117 | log 'max(contains(a))' | |
113 | log 'merge()' |
|
118 | log 'merge()' | |
114 | log 'modifies(b)' |
|
119 | log 'modifies(b)' | |
|
120 | log 'outgoing()' | |||
|
121 | log 'outgoing("../remote1")' | |||
|
122 | log 'outgoing("../remote2")' | |||
115 | log 'p1(merge())' |
|
123 | log 'p1(merge())' | |
116 | log 'p2(merge())' |
|
124 | log 'p2(merge())' | |
117 | log 'parents(merge())' |
|
125 | log 'parents(merge())' |
@@ -156,6 +156,18 b' 5' | |||||
156 | 6 |
|
156 | 6 | |
157 | % log 'modifies(b)' |
|
157 | % log 'modifies(b)' | |
158 | 4 |
|
158 | 4 | |
|
159 | % log 'outgoing()' | |||
|
160 | 8 | |||
|
161 | 9 | |||
|
162 | % log 'outgoing("../remote1")' | |||
|
163 | 8 | |||
|
164 | 9 | |||
|
165 | % log 'outgoing("../remote2")' | |||
|
166 | 3 | |||
|
167 | 5 | |||
|
168 | 6 | |||
|
169 | 7 | |||
|
170 | 9 | |||
159 | % log 'p1(merge())' |
|
171 | % log 'p1(merge())' | |
160 | 5 |
|
172 | 5 | |
161 | % log 'p2(merge())' |
|
173 | % log 'p2(merge())' |
General Comments 0
You need to be logged in to leave comments.
Login now