##// END OF EJS Templates
record: check patch name is valid before prompting in qrecord
Idan Kamara -
r14424:4eb88d29 default
parent child Browse files
Show More
@@ -892,7 +892,8 b' class queue(object):'
892 if date:
892 if date:
893 date = util.parsedate(date)
893 date = util.parsedate(date)
894 diffopts = self.diffopts({'git': opts.get('git')})
894 diffopts = self.diffopts({'git': opts.get('git')})
895 self.checkpatchname(patchfn)
895 if opts.get('checkname', True):
896 self.checkpatchname(patchfn)
896 inclsubs = self.check_substate(repo)
897 inclsubs = self.check_substate(repo)
897 if inclsubs:
898 if inclsubs:
898 inclsubs.append('.hgsubstate')
899 inclsubs.append('.hgsubstate')
@@ -389,7 +389,10 b' def qrecord(ui, repo, patch, *pats, **op'
389 except KeyError:
389 except KeyError:
390 raise util.Abort(_("'mq' extension not loaded"))
390 raise util.Abort(_("'mq' extension not loaded"))
391
391
392 repo.mq.checkpatchname(patch)
393
392 def committomq(ui, repo, *pats, **opts):
394 def committomq(ui, repo, *pats, **opts):
395 opts['checkname'] = False
393 mq.new(ui, repo, patch, *pats, **opts)
396 mq.new(ui, repo, patch, *pats, **opts)
394
397
395 dorecord(ui, repo, committomq, 'qnew', *pats, **opts)
398 dorecord(ui, repo, committomq, 'qnew', *pats, **opts)
@@ -219,6 +219,12 b' Whole diff'
219 someone
219 someone
220 up
220 up
221
221
222 qrecord with bad patch name, should abort before prompting
223
224 $ hg qrecord .hg
225 abort: patch name cannot begin with ".hg"
226 [255]
227
222 qrecord a.patch
228 qrecord a.patch
223
229
224 $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
230 $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
General Comments 0
You need to be logged in to leave comments. Login now