Merge remote-tracking branch 'esr/master'

* esr/master:
  Typo fix.

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/body
new file mode 100644 (file)
index 0000000..164115b
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/body
@@ -0,0 +1,49 @@
+matej@wycliff: CZEKMS-CSP_Bible (master *+%)$ locale
+LANG=en_US.utf8
+LC_CTYPE="en_US.utf8"
+LC_NUMERIC="en_US.utf8"
+LC_TIME="en_US.utf8"
+LC_COLLATE="en_US.utf8"
+LC_MONETARY="en_US.utf8"
+LC_MESSAGES="en_US.utf8"
+LC_PAPER="en_US.utf8"
+LC_NAME="en_US.utf8"
+LC_ADDRESS="en_US.utf8"
+LC_TELEPHONE="en_US.utf8"
+LC_MEASUREMENT="en_US.utf8"
+LC_IDENTIFICATION="en_US.utf8"
+LC_ALL=
+matej@wycliff: CZEKMS-CSP_Bible (master *+%)$ be new 'Incorporate errata into our texts'
+Traceback (most recent call last):
+  File "/home/matej/.local/bin/be", line 26, in <module>
+    sys.exit(libbe.ui.command_line.main())
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/ui/command_line.py", line 391, in main
+    ret = dispatch(ui, command, args)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/ui/command_line.py", line 304, in dispatch
+    ret = ui.run(command, options, args)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/command/base.py", line 590, in run
+    return command.run(options, args)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/command/base.py", line 302, in run
+    self.status = self._run(**params)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/command/new.py", line 132, in _run
+    bug.creator = self._get_user_id()
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/command/base.py", line 606, in _get_user_id
+    self.storage_callbacks.get_storage())
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/ui/util/user.py", line 145, in get_user_id
+    user = storage.get_user_id()
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/storage/vcs/base.py", line 630, in get_user_id
+    self.user_id = self._vcs_get_user_id()
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/storage/vcs/git.py", line 295, in _vcs_get_user_id
+    'config', 'user.name', expect=(0,1))
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/storage/vcs/base.py", line 934, in _u_invoke_client
+    return self._u_invoke(cl_args, **kwargs)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/storage/vcs/base.py", line 929, in _u_invoke
+    return invoke(*args, **kwargs)
+  File "/home/matej/.local/lib/python2.7/site-packages/libbe/util/subproc.py", line 90, in invoke
+    libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr))
+UnicodeEncodeError: 'ascii' codec can't encode character u'\u011b' in position 3: ordinal not in range(128)
+matej@wycliff: CZEKMS-CSP_Bible (master *+%)$ git config user.name
+Matěj Cepl
+matej@wycliff: CZEKMS-CSP_Bible (master *+%)$ 
+
+

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/values
new file mode 100644 (file)
index 0000000..8d6fdcb
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/94e55330-a4d5-41f5-bc4d-1c7a73964224/values
@@ -0,0 +1,29 @@
+{
+
+
+
+
+
+
+    "Author": "Matej Cepl <mcepl@redhat.com>", 
+
+
+
+
+
+
+    "Content-type": "text/plain", 
+
+
+
+
+
+
+    "Date": "Mon, 22 Jul 2013 18:02:44 +0000"
+
+
+
+
+
+
+}

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/body
new file mode 100644 (file)
index 0000000..4c91e9f
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/body
@@ -0,0 +1 @@
+Another testing comment.

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/values
new file mode 100644 (file)
index 0000000..2dfc51e
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/comments/c9e4523f-c016-4139-81ba-f130a1e5323c/values
@@ -0,0 +1,29 @@
+{
+
+
+
+
+
+
+    "Author": "Mat\u011bj Cepl <mcepl@redhat.com>", 
+
+
+
+
+
+
+    "Content-type": "text/plain", 
+
+
+
+
+
+
+    "Date": "Mon, 22 Jul 2013 18:29:04 +0000"
+
+
+
+
+
+
+}

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/values
new file mode 100644 (file)
index 0000000..0174507
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/742c86f3-0693-4d75-bdee-1785bcebdd43/values
@@ -0,0 +1,50 @@
+{
+
+
+
+
+
+
+    "creator": "Matej Cepl <mcepl@redhat.com>", 
+
+
+
+
+
+
+    "reporter": "Matej Cepl <mcepl@redhat.com>", 
+
+
+
+
+
+
+    "severity": "minor", 
+
+
+
+
+
+
+    "status": "fixed", 
+
+
+
+
+
+
+    "summary": "Crash of 'be new' with non-ASCII user name", 
+
+
+
+
+
+
+    "time": "Mon, 22 Jul 2013 17:59:19 +0000"
+
+
+
+
+
+
+}

diff --git a/libbe/command/html.py b/libbe/command/html.py
index 2b7dcf8bac27d8c4374565014adedf9dff6a7944..5186417f9da08bc375f729e298938b055ebeb6ec 100644 (file)
--- a/libbe/command/html.py
+++ b/libbe/command/html.py
@@ -698,6 +698,7 @@ div.root.comment {
 
 {% if comments %}
 {% for depth,comment in comments %}
+{{ div_close(depth) }}
 {% if depth == 0 %}
 <div class="comment root" id="C{{ comment_dir(comment) }}">
 {% else %}
@@ -707,11 +708,8 @@ div.root.comment {
        'depth':depth, 'bug': bug, 'comment':comment, 'comment_dir':comment_dir,
        'format_body': format_body, 'div_close': div_close,
        'strip_email': strip_email}) }}
-{{ div_close(depth) }}
 {% endfor %}
-{% if comments[-1][0] > 0 %}
 {{ div_close(0) }}
-{% endif %}
 {% else %}
 <p>No comments.</p>
 {% endif %}
@@ -953,7 +951,7 @@ Html = HTML # alias for libbe.command.base.get_command_class()
 
 
 class _DivCloser (object):
-    def __init__(self, depth=0):
+    def __init__(self, depth=-1):
         self.depth = depth
 
     def __call__(self, depth):

diff --git a/libbe/command/target.py b/libbe/command/target.py
index 6cf9cc6513d8fdbc86785801f8d41ab48bd173eb..20ffb578c1cbada8ecf5502ef5a6d337228749d2 100644 (file)
--- a/libbe/command/target.py
+++ b/libbe/command/target.py
@@ -109,7 +109,7 @@ class Target (libbe.command.Command):
             if bug == None:
                 print >> self.stdout, 'No target assigned.'
             else:
-                print >> self.stdout, bug.uuid
+                print >> self.stdout, bug.id.long_user()
             return 0
         bugdir,bug,comment = (
             libbe.command.util.bugdir_bug_comment_from_user_id(

diff --git a/libbe/ui/command_line.py b/libbe/ui/command_line.py
index d94da80c5586dda3bd8a8b6c59c839c85008d6ca..614366d8a6edbea4320302be953ced1a66c48d7d 100644 (file)
--- a/libbe/ui/command_line.py
+++ b/libbe/ui/command_line.py
@@ -23,6 +23,7 @@ A command line interface to Bugs Everywhere.
 import optparse
 import os
 import sys
+import locale
 
 import libbe
 import libbe.bugdir
@@ -340,6 +341,7 @@ def dispatch(ui, command, args):
     return ret
 
 def main():
+    locale.setlocale(locale.LC_ALL, '')
     io = libbe.command.StdInputOutput()
     ui = CommandLine(io)
     be = BE(ui=ui)

diff --git a/libbe/util/subproc.py b/libbe/util/subproc.py
index f1f04c10abeea3fdb5ae1159cebde59534cfff56..0ad010c6b253ae45c0ea31138484fc33c6607e98 100644 (file)
--- a/libbe/util/subproc.py
+++ b/libbe/util/subproc.py
@@ -87,7 +87,9 @@ def invoke(args, stdin=None, stdout=PIPE, stderr=PIPE, expect=(0,),
             stdout = unicode(stdout, encoding)
         if stderr != None:
             stderr = unicode(stderr, encoding)
-    libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr))
+        libbe.LOG.debug(u'{0}\n{1}{2}'.format(status, stdout, stderr))
+    else:
+        libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr))
     if status not in expect:
         raise CommandError(list_args, status, stdout, stderr)
     return status, stdout, stderr