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