Mercurial > hg
comparison hgext/mq.py @ 8761:0289f384e1e5
Generally replace "file name" with "filename" in help and comments.
author | timeless <timeless@gmail.com> |
---|---|
date | Tue, 09 Jun 2009 09:25:17 -0400 |
parents | bf17aeafb869 |
children | c5f36402daad |
comparison
equal
deleted
inserted
replaced
8760:bf17aeafb869 | 8761:0289f384e1e5 |
---|---|
501 self.save_dirty() | 501 self.save_dirty() |
502 return (0, head) | 502 return (0, head) |
503 | 503 |
504 def patch(self, repo, patchfile): | 504 def patch(self, repo, patchfile): |
505 '''Apply patchfile to the working directory. | 505 '''Apply patchfile to the working directory. |
506 patchfile: file name of patch''' | 506 patchfile: name of patch file''' |
507 files = {} | 507 files = {} |
508 try: | 508 try: |
509 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, | 509 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
510 files=files) | 510 files=files) |
511 except Exception, inst: | 511 except Exception, inst: |
2539 _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')), | 2539 _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')), |
2540 'qheader': (header, [], _('hg qheader [PATCH]')), | 2540 'qheader': (header, [], _('hg qheader [PATCH]')), |
2541 "^qimport": | 2541 "^qimport": |
2542 (qimport, | 2542 (qimport, |
2543 [('e', 'existing', None, _('import file in patch directory')), | 2543 [('e', 'existing', None, _('import file in patch directory')), |
2544 ('n', 'name', '', _('patch file name')), | 2544 ('n', 'name', '', _('name of patch file')), |
2545 ('f', 'force', None, _('overwrite existing files')), | 2545 ('f', 'force', None, _('overwrite existing files')), |
2546 ('r', 'rev', [], _('place existing revisions under mq control')), | 2546 ('r', 'rev', [], _('place existing revisions under mq control')), |
2547 ('g', 'git', None, _('use git extended diff format')), | 2547 ('g', 'git', None, _('use git extended diff format')), |
2548 ('P', 'push', None, _('qpush after importing'))], | 2548 ('P', 'push', None, _('qpush after importing'))], |
2549 _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')), | 2549 _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')), |