Show More
@@ -259,13 +259,16 b' import [-p <n> -b <base> -f] <patches>::' | |||||
259 |
|
259 | |||
260 | aliases: patch |
|
260 | aliases: patch | |
261 |
|
261 | |||
262 | incoming [source]:: |
|
262 | incoming [-p] [source]:: | |
263 | Show new changesets found in the specified repo or the default |
|
263 | Show new changesets found in the specified repo or the default | |
264 | pull repo. These are the changesets that would be pulled if a pull |
|
264 | pull repo. These are the changesets that would be pulled if a pull | |
265 | was requested. |
|
265 | was requested. | |
266 |
|
266 | |||
267 | Currently only local repositories are supported. |
|
267 | Currently only local repositories are supported. | |
268 |
|
268 | |||
|
269 | options: | |||
|
270 | -p, --patch show patch | |||
|
271 | ||||
269 | aliases: in |
|
272 | aliases: in | |
270 |
|
273 | |||
271 | init [dest]:: |
|
274 | init [dest]:: | |
@@ -320,11 +323,14 b' manifest [revision]::' | |||||
320 | The manifest is the list of files being version controlled. If no revision |
|
323 | The manifest is the list of files being version controlled. If no revision | |
321 | is given then the tip is used. |
|
324 | is given then the tip is used. | |
322 |
|
325 | |||
323 | outgoing [dest]:: |
|
326 | outgoing [-p] [dest]:: | |
324 | Show changesets not found in the specified destination repo or the |
|
327 | Show changesets not found in the specified destination repo or the | |
325 | default push repo. These are the changesets that would be pushed |
|
328 | default push repo. These are the changesets that would be pushed | |
326 | if a push was requested. |
|
329 | if a push was requested. | |
327 |
|
330 | |||
|
331 | options: | |||
|
332 | -p, --patch show patch | |||
|
333 | ||||
328 | aliases: out |
|
334 | aliases: out | |
329 |
|
335 | |||
330 | parents:: |
|
336 | parents:: |
@@ -1058,7 +1058,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1058 | addremove(ui, repo, *files) |
|
1058 | addremove(ui, repo, *files) | |
1059 | repo.commit(files, message, user) |
|
1059 | repo.commit(files, message, user) | |
1060 |
|
1060 | |||
1061 | def incoming(ui, repo, source="default"): |
|
1061 | def incoming(ui, repo, source="default", **opts): | |
1062 | """show new changesets found in source""" |
|
1062 | """show new changesets found in source""" | |
1063 | source = ui.expandpath(source) |
|
1063 | source = ui.expandpath(source) | |
1064 | other = hg.repository(ui, source) |
|
1064 | other = hg.repository(ui, source) | |
@@ -1073,6 +1073,10 b' def incoming(ui, repo, source="default")' | |||||
1073 | o.reverse() |
|
1073 | o.reverse() | |
1074 | for n in o: |
|
1074 | for n in o: | |
1075 | show_changeset(ui, other, changenode=n) |
|
1075 | show_changeset(ui, other, changenode=n) | |
|
1076 | if opts['patch']: | |||
|
1077 | prev = other.changelog.parents(n)[0] | |||
|
1078 | dodiff(ui, ui, other, prev, n) | |||
|
1079 | ui.write("\n") | |||
1076 |
|
1080 | |||
1077 | def init(ui, dest="."): |
|
1081 | def init(ui, dest="."): | |
1078 | """create a new repository in the given directory""" |
|
1082 | """create a new repository in the given directory""" | |
@@ -1154,7 +1158,7 b' def manifest(ui, repo, rev=None):' | |||||
1154 | for f in files: |
|
1158 | for f in files: | |
1155 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) |
|
1159 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) | |
1156 |
|
1160 | |||
1157 | def outgoing(ui, repo, dest="default-push"): |
|
1161 | def outgoing(ui, repo, dest="default-push", **opts): | |
1158 | """show changesets not found in destination""" |
|
1162 | """show changesets not found in destination""" | |
1159 | dest = ui.expandpath(dest) |
|
1163 | dest = ui.expandpath(dest) | |
1160 | other = hg.repository(ui, dest) |
|
1164 | other = hg.repository(ui, dest) | |
@@ -1163,6 +1167,10 b' def outgoing(ui, repo, dest="default-pus' | |||||
1163 | o.reverse() |
|
1167 | o.reverse() | |
1164 | for n in o: |
|
1168 | for n in o: | |
1165 | show_changeset(ui, repo, changenode=n) |
|
1169 | show_changeset(ui, repo, changenode=n) | |
|
1170 | if opts['patch']: | |||
|
1171 | prev = repo.changelog.parents(n)[0] | |||
|
1172 | dodiff(ui, ui, repo, prev, n) | |||
|
1173 | ui.write("\n") | |||
1166 |
|
1174 | |||
1167 | def parents(ui, repo, rev=None): |
|
1175 | def parents(ui, repo, rev=None): | |
1168 | """show the parents of the working dir or revision""" |
|
1176 | """show the parents of the working dir or revision""" | |
@@ -1641,7 +1649,9 b' table = {' | |||||
1641 | ('f', 'force', None, 'skip check for outstanding changes'), |
|
1649 | ('f', 'force', None, 'skip check for outstanding changes'), | |
1642 | ('b', 'base', "", 'base path')], |
|
1650 | ('b', 'base', "", 'base path')], | |
1643 | "hg import [-f] [-p NUM] [-b BASE] PATCH..."), |
|
1651 | "hg import [-f] [-p NUM] [-b BASE] PATCH..."), | |
1644 |
"incoming|in": (incoming, |
|
1652 | "incoming|in": (incoming, | |
|
1653 | [('p', 'patch', None, 'show patch')], | |||
|
1654 | 'hg incoming [-p] [SOURCE]'), | |||
1645 | "^init": (init, [], 'hg init [DEST]'), |
|
1655 | "^init": (init, [], 'hg init [DEST]'), | |
1646 | "locate": |
|
1656 | "locate": | |
1647 | (locate, |
|
1657 | (locate, | |
@@ -1659,7 +1669,9 b' table = {' | |||||
1659 | ('p', 'patch', None, 'show patch')], |
|
1669 | ('p', 'patch', None, 'show patch')], | |
1660 | 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'), |
|
1670 | 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'), | |
1661 | "manifest": (manifest, [], 'hg manifest [REV]'), |
|
1671 | "manifest": (manifest, [], 'hg manifest [REV]'), | |
1662 |
"outgoing|out": (outgoing, |
|
1672 | "outgoing|out": (outgoing, | |
|
1673 | [('p', 'patch', None, 'show patch')], | |||
|
1674 | 'hg outgoing [-p] [DEST]'), | |||
1663 | "parents": (parents, [], 'hg parents [REV]'), |
|
1675 | "parents": (parents, [], 'hg parents [REV]'), | |
1664 | "paths": (paths, [], 'hg paths [NAME]'), |
|
1676 | "paths": (paths, [], 'hg paths [NAME]'), | |
1665 | "^pull": |
|
1677 | "^pull": |
General Comments 0
You need to be logged in to leave comments.
Login now