Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 5025:7041869a1bf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: add qnew --git option
author Patrick Mezard <pmezard@gmail.com>
date Sat, 28 Jul 2007 20:15:54 +0200
parents 30d4d8985dd8
children 47a8ea1eb2c3
comparison
equal deleted inserted replaced
5024:7963438881f5 5025:7041869a1bf6
633 p.close() 633 p.close()
634 wlock = None 634 wlock = None
635 r = self.qrepo() 635 r = self.qrepo()
636 if r: r.add([patch]) 636 if r: r.add([patch])
637 if commitfiles: 637 if commitfiles:
638 self.refresh(repo, short=True) 638 self.refresh(repo, short=True, git=opts.get('git'))
639 self.removeundo(repo) 639 self.removeundo(repo)
640 finally: 640 finally:
641 del wlock 641 del wlock
642 642
643 def strip(self, repo, rev, update=True, backup="all"): 643 def strip(self, repo, rev, update=True, backup="all"):
2181 _('hg qinit [-c]')), 2181 _('hg qinit [-c]')),
2182 "qnew": 2182 "qnew":
2183 (new, 2183 (new,
2184 [('e', 'edit', None, _('edit commit message')), 2184 [('e', 'edit', None, _('edit commit message')),
2185 ('f', 'force', None, _('import uncommitted changes into patch')), 2185 ('f', 'force', None, _('import uncommitted changes into patch')),
2186 ('g', 'git', None, _('use git extended diff format')),
2186 ('I', 'include', [], _('include names matching the given patterns')), 2187 ('I', 'include', [], _('include names matching the given patterns')),
2187 ('X', 'exclude', [], _('exclude names matching the given patterns')), 2188 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2188 ] + commands.commitopts, 2189 ] + commands.commitopts,
2189 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), 2190 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')),
2190 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), 2191 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),