Mercurial > hg
changeset 980:5197fb9d65d5
Merge with MPM
| author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
|---|---|
| date | Wed, 17 Aug 2005 22:59:47 -0500 |
| parents | 87d40e085e08 (current diff) 1300271ba8de (diff) |
| children | 4f81068ed8cd |
| files | doc/hg.1.txt mercurial/commands.py mercurial/hgweb.py templates/changelog.tmpl templates/fileannotate.tmpl templates/filelog.tmpl templates/filerevision.tmpl templates/manifest.tmpl templates/tags.tmpl |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hg.1.txt Wed Aug 17 22:32:47 2005 -0500 +++ b/doc/hg.1.txt Wed Aug 17 22:59:47 2005 -0500 @@ -203,6 +203,8 @@ Currently only local repositories are supported. + aliases: in + init [dest]:: Initialize a new repository in the given directory. If the given directory does not exist, it is created. @@ -262,6 +264,8 @@ default push repo. These are the changesets that would be pushed if a push was requested. + aliases: out + parents:: Print the working directory's parent revisions.
--- a/mercurial/commands.py Wed Aug 17 22:32:47 2005 -0500 +++ b/mercurial/commands.py Wed Aug 17 22:59:47 2005 -0500 @@ -1312,7 +1312,7 @@ [('p', 'strip', 1, 'path strip'), ('b', 'base', "", 'base path')], "hg import [-p NUM] [-b BASE] PATCH..."), - "incoming": (incoming, [], 'hg incoming [SOURCE]'), + "incoming|in": (incoming, [], 'hg incoming [SOURCE]'), "^init": (init, [], 'hg init [DEST]'), "locate": (locate, @@ -1328,7 +1328,7 @@ ('p', 'patch', None, 'show patch')], 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'), "manifest": (manifest, [], 'hg manifest [REV]'), - "outgoing": (outgoing, [], 'hg outgoing [DEST]'), + "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'), "parents": (parents, [], 'hg parents [REV]'), "paths": (paths, [], 'hg paths [NAME]'), "^pull":
--- a/mercurial/hgweb.py Wed Aug 17 22:32:47 2005 -0500 +++ b/mercurial/hgweb.py Wed Aug 17 22:59:47 2005 -0500 @@ -558,7 +558,7 @@ yield {"parity": parity, "path": os.path.join(path, f), "manifest": mnode, - "basename": f[:-1]} + "basename": f[:-1]} parity = 1 - parity yield self.t("manifest", @@ -738,7 +738,6 @@ if not address: address = u.config("web", "address", "") if not port: - print port port = int(u.config("web", "port", 8000)) if not use_ipv6: use_ipv6 = u.configbool("web", "ipv6")