Merge lp:~kvilhaugsvik/qbzr/qshelve_all into lp:qbzr

[Sveinung Kvilhaugsvik]

Add the option --all to qshelve so it acts a bit more like shelve.

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

It appears that -m also was missing.

[Alexander Belchenko (bialix)]

Thank you for your patch.
Mostly looks good, although I'd prefer that you added all new parameters to the end of arguments list in functions (__init__ and other). This is kind of backward compatibility, I try to follow this pattern. If you don't mind to change it I'd be grateful.
Also we need some text about changes in NEWS.txt. Can you provide some?

review: Needs Fixing

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Erm... I messed up my history. Sorry for the noise.

[Alexander Belchenko (bialix)]

Use command
bzr heads --dead
to find your lost revisions. You need revision-id. It has form like <user@host-datestamp-random>. You need this revision id.
Then do
bzr pull . -r <your-lost-revision-id>
And you will restore your history.

[Alexander Belchenko (bialix)]

I suppose your last revision was
HEAD: revision-id: <email address hidden> (dead)
  committer: Sveinung Kvilhaugsvik <email address hidden>
  branch nick: 1233909
  timestamp: Tue 2013-10-15 15:10:17 +0200
  message:
    Add NEWS entry about "qshelve -m"

Your dead revision id therefore
<email address hidden>
So you can do
bzr pull . -r revid:<email address hidden>
After you restore your branch do `bzr push --overwrite` to launchpad.

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Fixed. I didn't loose it. I merged in a way that made it lie. (The previous version had the data from your commit today but didn't list it as a parent)

[Alexander Belchenko (bialix)]

Many thanks for your changes! I'll merge it.

review: Approve

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Great! Thanks for your help!

=== modified file 'NEWS.txt'
--- NEWS.txt	2013-10-15 10:11:40 +0000
+++ NEWS.txt	2013-10-15 13:39:11 +0000
@@ -2,6 +2,12 @@
 ----------------------------------
 Maintenance release.
 
+ * qshelve:
+   * New command line option --all to start with all changes selected.
+     (Sveinung Kvilhaugsvik, Bug #1227914)
+   * New command line option --m to set the message string.
+     (Sveinung Kvilhaugsvik, Bug #1233909)
+
 
 0.23.1 - 2013/07/29
 -------------------

=== modified file 'lib/commands.py'
--- lib/commands.py	2012-09-18 08:22:25 +0000
+++ lib/commands.py	2013-10-15 13:39:11 +0000
@@ -1114,6 +1114,8 @@
         ui_mode_option,
         bzr_option('shelve', 'list'),
         bzr_option('shelve', 'directory'),
+        bzr_option('shelve', 'message'),
+        Option('all', help='Select all changes.'),
         Option('complete', help='Show complete files.'),
         Option('ignore-whitespace', short_name='w',
                help="Ignore whitespace when finding differences.(Only work when --list specified)"),
@@ -1122,14 +1124,16 @@
         ]
 
     def _qbzr_run(self, file_list=None, list=False, directory=None, ui_mode=False, 
-                            complete=False, ignore_whitespace=False, encoding=None):
+                            complete=False, ignore_whitespace=False, encoding=None,
+                             all=False, message=None):
         if list:
             initial_tab = 1
         else:
             initial_tab = 0
         self.main_window = ShelveWindow(file_list=file_list, directory=directory, ui_mode=ui_mode,
                                 initial_tab=initial_tab, complete=complete, 
-                                ignore_whitespace=ignore_whitespace, encoding=encoding)
+                                ignore_whitespace=ignore_whitespace, encoding=encoding,
+                                select_all=all, message=message)
         self.main_window.show()
         self._application.exec_()
 

=== modified file 'lib/shelvewindow.py'
--- lib/shelvewindow.py	2012-05-14 11:27:11 +0000
+++ lib/shelvewindow.py	2013-10-15 13:39:11 +0000
@@ -59,7 +59,8 @@
 class ShelveWindow(QBzrWindow):
 
     def __init__(self, initial_tab=0, directory=None, file_list=None, complete=False,
-                 ignore_whitespace=False, encoding=None, parent=None, ui_mode=True):
+                 ignore_whitespace=False, encoding=None, parent=None, ui_mode=True,
+                 select_all=False, message=None):
         QBzrWindow.__init__(self,
                             [gettext("Shelve Manager")],
                             parent, ui_mode=ui_mode)
@@ -78,7 +79,8 @@
 
         shelve_view = ShelveWidget(file_list=file_list, directory=self.directory,
                                     complete=complete, encoding=encoding, 
-                                    splitters=self.splitters, parent=self)
+                                    splitters=self.splitters, parent=self,
+                                    select_all=select_all, init_msg=message)
         shelvelist_view = ShelveListWidget(directory=self.directory,
                                     complete=complete, ignore_whitespace=ignore_whitespace,
                                     encoding=encoding, splitters=self.splitters, parent=self)

=== modified file 'lib/widgets/shelve.py'
--- lib/widgets/shelve.py	2012-05-14 11:31:32 +0000
+++ lib/widgets/shelve.py	2013-10-15 13:39:11 +0000
@@ -237,7 +237,7 @@
 class ShelveWidget(ToolbarPanel):
 
     def __init__(self, file_list=None, directory=None, complete=False, encoding=None, 
-                splitters=None, parent=None):
+                splitters=None, parent=None, select_all=False, init_msg=None):
         ToolbarPanel.__init__(self, slender=False, icon_size=22, parent=parent)
 
         self.revision = None
@@ -246,6 +246,7 @@
         self.message = None
 
         self.initial_encoding = encoding
+        self.select_all = select_all
 
         self.current_layout = -1
         self.load_settings()
@@ -276,6 +277,8 @@
         self.completer.setModel(self.completer_model)
         self.message.setCompleter(self.completer)
         self.message.setAcceptRichText(False)
+        if init_msg is not None:
+            self.message.setText(init_msg)
         SpellCheckHighlighter(self.message.document(), spell_checker)
 
         message_layout.addWidget(self.message)
@@ -485,6 +488,10 @@
             for func in cleanup:
                 func()
 
+        if self.select_all:
+            self.check_all(True)
+            self.select_all = False
+
         self.loaded = True
 
     def _create_item(self, change, shelver, trees, old_changes):