The default patch_name format caused multiple patches to all try to use the same name. r=jdm
authorSteve Fink <sfink@mozilla.com>
Tue, 24 Jan 2012 09:01:10 -0800
changeset 67 f302ad097f33
parent 66 b86343ae2917
child 68 6237bc0a91fa
push id49
push usersfink@mozilla.com
push dateTue, 24 Jan 2012 17:03:39 +0000
reviewersjdm
The default patch_name format caused multiple patches to all try to use the same name. r=jdm
__init__.py
bz.py
--- a/__init__.py
+++ b/__init__.py
@@ -25,17 +25,17 @@ There are 7 pieces of patch metadata ava
   "title" : the bug title
   "desc" : the patch description
   "flags" : all the flags
   "filename" : the initial patch filename
   "bugdesc" : the bug description
 
 The default values are::
 
-  patch_format = bug-%(bugnum)s.diff
+  patch_format = %(filename)s
   msg_format = Bug %(bugnum)s - "%(title)s" [%(flags)s]
 """
 from mercurial import commands, cmdutil, extensions, url, error
 from hgext import mq
 
 import re
 import os
 import urllib
--- a/bz.py
+++ b/bz.py
@@ -15,17 +15,17 @@ from mercurial import patch
 cache = {}
 
 class Settings(object):
   def __init__(self, ui):
     self.ui = ui
     self.msg_format = ui.config('qimportbz', 'msg_format',
                                 'Bug %(bugnum)s - "%(title)s" [%(flags)s]')
     self.joinstr = ui.config('qimportbz', 'joinstr', ' ')
-    self.patch_format = ui.config('qimportbz', 'patch_format', "bug-%(bugnum)s.diff")
+    self.patch_format = ui.config('qimportbz', 'patch_format', "%(filename)s")
 
 class Attachment(object):
   def __init__(self, bug, node):
     self.bug = bug
     self.obsolete = node.attrib['isobsolete'] == "1"
     self.id = node.find('attachid').text
     self.desc = node.find('desc').text
     self.filename = node.find('filename').text