Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 980:5197fb9d65d5
Merge with MPM
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Wed, 17 Aug 2005 22:59:47 -0500 |
parents | 54b2a42e501e 1300271ba8de |
children | 4f81068ed8cd |
comparison
equal
deleted
inserted
replaced
979:87d40e085e08 | 980:5197fb9d65d5 |
---|---|
1310 "import|patch": | 1310 "import|patch": |
1311 (import_, | 1311 (import_, |
1312 [('p', 'strip', 1, 'path strip'), | 1312 [('p', 'strip', 1, 'path strip'), |
1313 ('b', 'base', "", 'base path')], | 1313 ('b', 'base', "", 'base path')], |
1314 "hg import [-p NUM] [-b BASE] PATCH..."), | 1314 "hg import [-p NUM] [-b BASE] PATCH..."), |
1315 "incoming": (incoming, [], 'hg incoming [SOURCE]'), | 1315 "incoming|in": (incoming, [], 'hg incoming [SOURCE]'), |
1316 "^init": (init, [], 'hg init [DEST]'), | 1316 "^init": (init, [], 'hg init [DEST]'), |
1317 "locate": | 1317 "locate": |
1318 (locate, | 1318 (locate, |
1319 [('r', 'rev', '', 'revision'), | 1319 [('r', 'rev', '', 'revision'), |
1320 ('0', 'print0', None, 'end records with NUL'), | 1320 ('0', 'print0', None, 'end records with NUL'), |
1326 (log, | 1326 (log, |
1327 [('r', 'rev', [], 'revision'), | 1327 [('r', 'rev', [], 'revision'), |
1328 ('p', 'patch', None, 'show patch')], | 1328 ('p', 'patch', None, 'show patch')], |
1329 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'), | 1329 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'), |
1330 "manifest": (manifest, [], 'hg manifest [REV]'), | 1330 "manifest": (manifest, [], 'hg manifest [REV]'), |
1331 "outgoing": (outgoing, [], 'hg outgoing [DEST]'), | 1331 "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'), |
1332 "parents": (parents, [], 'hg parents [REV]'), | 1332 "parents": (parents, [], 'hg parents [REV]'), |
1333 "paths": (paths, [], 'hg paths [NAME]'), | 1333 "paths": (paths, [], 'hg paths [NAME]'), |
1334 "^pull": | 1334 "^pull": |
1335 (pull, | 1335 (pull, |
1336 [('u', 'update', None, 'update working directory')], | 1336 [('u', 'update', None, 'update working directory')], |