Show More
@@ -266,16 +266,13 b' import [-p <n> -b <base> -f] <patches>::' | |||||
266 |
|
266 | |||
267 | aliases: patch |
|
267 | aliases: patch | |
268 |
|
268 | |||
269 |
incoming [ |
|
269 | incoming [source]:: | |
270 | Show new changesets found in the specified repo or the default |
|
270 | Show new changesets found in the specified repo or the default | |
271 | pull repo. These are the changesets that would be pulled if a pull |
|
271 | pull repo. These are the changesets that would be pulled if a pull | |
272 | was requested. |
|
272 | was requested. | |
273 |
|
273 | |||
274 | Currently only local repositories are supported. |
|
274 | Currently only local repositories are supported. | |
275 |
|
275 | |||
276 | options: |
|
|||
277 | -p, --patch show patch |
|
|||
278 |
|
||||
279 | aliases: in |
|
276 | aliases: in | |
280 |
|
277 | |||
281 | init [dest]:: |
|
278 | init [dest]:: | |
@@ -330,14 +327,11 b' manifest [revision]::' | |||||
330 | The manifest is the list of files being version controlled. If no revision |
|
327 | The manifest is the list of files being version controlled. If no revision | |
331 | is given then the tip is used. |
|
328 | is given then the tip is used. | |
332 |
|
329 | |||
333 |
outgoing [ |
|
330 | outgoing [dest]:: | |
334 | Show changesets not found in the specified destination repo or the |
|
331 | Show changesets not found in the specified destination repo or the | |
335 | default push repo. These are the changesets that would be pushed |
|
332 | default push repo. These are the changesets that would be pushed | |
336 | if a push was requested. |
|
333 | if a push was requested. | |
337 |
|
334 | |||
338 | options: |
|
|||
339 | -p, --patch show patch |
|
|||
340 |
|
||||
341 | aliases: out |
|
335 | aliases: out | |
342 |
|
336 | |||
343 | parents:: |
|
337 | parents:: |
@@ -1064,7 +1064,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1064 | addremove(ui, repo, *files) |
|
1064 | addremove(ui, repo, *files) | |
1065 | repo.commit(files, message, user) |
|
1065 | repo.commit(files, message, user) | |
1066 |
|
1066 | |||
1067 |
def incoming(ui, repo, source="default" |
|
1067 | def incoming(ui, repo, source="default"): | |
1068 | """show new changesets found in source""" |
|
1068 | """show new changesets found in source""" | |
1069 | source = ui.expandpath(source) |
|
1069 | source = ui.expandpath(source) | |
1070 | other = hg.repository(ui, source) |
|
1070 | other = hg.repository(ui, source) | |
@@ -1079,10 +1079,6 b' def incoming(ui, repo, source="default",' | |||||
1079 | o.reverse() |
|
1079 | o.reverse() | |
1080 | for n in o: |
|
1080 | for n in o: | |
1081 | show_changeset(ui, other, changenode=n) |
|
1081 | show_changeset(ui, other, changenode=n) | |
1082 | if opts['patch']: |
|
|||
1083 | prev = other.changelog.parents(n)[0] |
|
|||
1084 | dodiff(ui, ui, other, prev, n) |
|
|||
1085 | ui.write("\n") |
|
|||
1086 |
|
1082 | |||
1087 | def init(ui, dest="."): |
|
1083 | def init(ui, dest="."): | |
1088 | """create a new repository in the given directory""" |
|
1084 | """create a new repository in the given directory""" | |
@@ -1164,7 +1160,7 b' def manifest(ui, repo, rev=None):' | |||||
1164 | for f in files: |
|
1160 | for f in files: | |
1165 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) |
|
1161 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) | |
1166 |
|
1162 | |||
1167 |
def outgoing(ui, repo, dest="default-push" |
|
1163 | def outgoing(ui, repo, dest="default-push"): | |
1168 | """show changesets not found in destination""" |
|
1164 | """show changesets not found in destination""" | |
1169 | dest = ui.expandpath(dest) |
|
1165 | dest = ui.expandpath(dest) | |
1170 | other = hg.repository(ui, dest) |
|
1166 | other = hg.repository(ui, dest) | |
@@ -1173,10 +1169,6 b' def outgoing(ui, repo, dest="default-pus' | |||||
1173 | o.reverse() |
|
1169 | o.reverse() | |
1174 | for n in o: |
|
1170 | for n in o: | |
1175 | show_changeset(ui, repo, changenode=n) |
|
1171 | show_changeset(ui, repo, changenode=n) | |
1176 | if opts['patch']: |
|
|||
1177 | prev = repo.changelog.parents(n)[0] |
|
|||
1178 | dodiff(ui, ui, repo, prev, n) |
|
|||
1179 | ui.write("\n") |
|
|||
1180 |
|
1172 | |||
1181 | def parents(ui, repo, rev=None): |
|
1173 | def parents(ui, repo, rev=None): | |
1182 | """show the parents of the working dir or revision""" |
|
1174 | """show the parents of the working dir or revision""" | |
@@ -1671,9 +1663,7 b' table = {' | |||||
1671 | ('b', 'base', "", 'base path'), |
|
1663 | ('b', 'base', "", 'base path'), | |
1672 | ('m', 'mail-like', None, 'apply a patch that looks like email')], |
|
1664 | ('m', 'mail-like', None, 'apply a patch that looks like email')], | |
1673 | "hg import [-f] [-p NUM] [-b BASE] PATCH..."), |
|
1665 | "hg import [-f] [-p NUM] [-b BASE] PATCH..."), | |
1674 | "incoming|in": (incoming, |
|
1666 | "incoming|in": (incoming, [], 'hg incoming [SOURCE]'), | |
1675 | [('p', 'patch', None, 'show patch')], |
|
|||
1676 | 'hg incoming [-p] [SOURCE]'), |
|
|||
1677 | "^init": (init, [], 'hg init [DEST]'), |
|
1667 | "^init": (init, [], 'hg init [DEST]'), | |
1678 | "locate": |
|
1668 | "locate": | |
1679 | (locate, |
|
1669 | (locate, | |
@@ -1691,9 +1681,7 b' table = {' | |||||
1691 | ('p', 'patch', None, 'show patch')], |
|
1681 | ('p', 'patch', None, 'show patch')], | |
1692 | 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'), |
|
1682 | 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'), | |
1693 | "manifest": (manifest, [], 'hg manifest [REV]'), |
|
1683 | "manifest": (manifest, [], 'hg manifest [REV]'), | |
1694 | "outgoing|out": (outgoing, |
|
1684 | "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'), | |
1695 | [('p', 'patch', None, 'show patch')], |
|
|||
1696 | 'hg outgoing [-p] [DEST]'), |
|
|||
1697 | "parents": (parents, [], 'hg parents [REV]'), |
|
1685 | "parents": (parents, [], 'hg parents [REV]'), | |
1698 | "paths": (paths, [], 'hg paths [NAME]'), |
|
1686 | "paths": (paths, [], 'hg paths [NAME]'), | |
1699 | "^pull": |
|
1687 | "^pull": |
General Comments 0
You need to be logged in to leave comments.
Login now