changeset 9343:3ebb457d2189

Merge with i18n

--- a/hgext/mq.py	Tue Aug 11 18:27:34 2009 -0300
+++ b/hgext/mq.py	Wed Aug 12 12:05:35 2009 -0500
@@ -143,14 +143,27 @@
         if not self.updateheader(['From: ', '# User '], user):
             try:
                 patchheaderat = self.comments.index('# HG changeset patch')
-                self.comments.insert(patchheaderat + 1,'# User ' + user)
+                self.comments.insert(patchheaderat + 1, '# User ' + user)
             except ValueError:
-                self.comments = ['From: ' + user, ''] + self.comments
+                if self._hasheader(['Date: ']):
+                    self.comments = ['From: ' + user] + self.comments
+                else:
+                    tmp = ['# HG changeset patch', '# User ' + user, '']
+                    self.comments = tmp + self.comments
         self.user = user
 
     def setdate(self, date):
-        if self.updateheader(['# Date '], date):
-            self.date = date
+        if not self.updateheader(['Date: ', '# Date '], date):
+            try:
+                patchheaderat = self.comments.index('# HG changeset patch')
+                self.comments.insert(patchheaderat + 1, '# Date ' + date)
+            except ValueError:
+                if self._hasheader(['From: ']):
+                    self.comments = ['Date: ' + date] + self.comments
+                else:
+                    tmp = ['# HG changeset patch', '# Date ' + date, '']
+                    self.comments = tmp + self.comments
+        self.date = date
 
     def setmessage(self, message):
         if self.comments:
@@ -170,6 +183,14 @@
                     break
         return res
 
+    def _hasheader(self, prefixes):
+        '''Check if a header starts with any of the given prefixes.'''
+        for prefix in prefixes:
+            for comment in self.comments:
+                if comment.startswith(prefix):
+                    return True
+        return False
+
     def __str__(self):
         if not self.comments:
             return ''
@@ -2585,10 +2606,10 @@
          [('e', 'edit', None, _('edit commit message')),
           ('g', 'git', None, _('use git extended diff format')),
           ('s', 'short', None, _('refresh only files already in the patch and specified files')),
-          ('U', 'currentuser', None, _('add/update "From: <current user>" in patch')),
-          ('u', 'user', '', _('add/update "From: <given user>" in patch')),
-          ('D', 'currentdate', None, _('update "Date: <current date>" in patch (if present)')),
-          ('d', 'date', '', _('update "Date: <given date>" in patch (if present)'))
+          ('U', 'currentuser', None, _('add/update author field in patch with current user')),
+          ('u', 'user', '', _('add/update author field in patch with given user')),
+          ('D', 'currentdate', None, _('add/update date field in patch with current date')),
+          ('d', 'date', '', _('add/update date field in patch with given date'))
           ] + commands.walkopts + commands.commitopts,
          _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
     'qrename|qmv':

--- a/mercurial/config.py	Tue Aug 11 18:27:34 2009 -0300
+++ b/mercurial/config.py	Wed Aug 12 12:05:35 2009 -0500
@@ -80,7 +80,7 @@
         section = ""
         item = None
         line = 0
-        cont = 0
+        cont = False
 
         for l in data.splitlines(True):
             line += 1
@@ -114,7 +114,7 @@
             m = itemre.match(l)
             if m:
                 item = m.group(1)
-                cont = 1
+                cont = True
                 if sections and section not in sections:
                     continue
                 self.set(section, item, m.group(2), "%s:%d" % (src, line))
@@ -128,7 +128,7 @@
                     del self._data[section][name]
                 continue
 
-            raise error.ConfigError(_('config error at %s:%d: \'%s\'')
+            raise error.ConfigError(_("config error at %s:%d: '%s'")
                                     % (src, line, l.rstrip()))
 
     def read(self, path, fp=None, sections=None, remap=None):

--- a/tests/test-mq-header-date.out	Tue Aug 11 18:27:34 2009 -0300
+++ b/tests/test-mq-header-date.out	Wed Aug 12 12:05:35 2009 -0500
@@ -35,6 +35,10 @@
 1: [mq]: 2.patch - test
 0: [mq]: 1.patch - test
 ==== qref -d
+# HG changeset patch
+# Date 5 0
+
+
 diff -r ... 2
 --- /dev/null
 +++ b/2
@@ -118,6 +122,9 @@
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -d
+# HG changeset patch
+# Date 9 0
+
 Four
 
 diff -r ... 4
@@ -177,6 +184,7 @@
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -d
+Date: 12 0
 From: jane
 
 diff -r ... 6
@@ -231,7 +239,9 @@
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -u -d
-From: john
+# HG changeset patch
+# Date 14 0
+# User john
 
 
 diff -r ... 8
@@ -261,7 +271,9 @@
 1: Three (again) - test
 0: [mq]: 1.patch - test
 ==== qref -u -d
-From: john
+# HG changeset patch
+# Date 15 0
+# User john
 
 Nine
 

--- a/tests/test-mq-header-from.out	Tue Aug 11 18:27:34 2009 -0300
+++ b/tests/test-mq-header-from.out	Wed Aug 12 12:05:35 2009 -0500
@@ -32,7 +32,8 @@
 1: [mq]: 2.patch - test
 0: [mq]: 1.patch - mary
 ==== qref -u
-From: jane
+# HG changeset patch
+# User jane
 
 
 diff -r ... 2
@@ -117,7 +118,8 @@
 1: [mq]: 2.patch - jane
 0: [mq]: 1.patch - mary
 ==== qref -u
-From: jane
+# HG changeset patch
+# User jane
 
 Four