Commits

DominikP  committed f927f00

SyncMq: split patches into more atomar parts

  • Participants
  • Parent commits 34e5a1d

Comments (0)

Files changed (3)

 This patch adds a combobox to the sync options dialog if the mq extension is
 enabled. If one checks that combobox, the sync commands will work on the patch
 queue by using the --mq option. If the mq extension is disabled while the
-combobox is still checked, the mq option is removed.
+combobox is still checked, the mq option is removed.
+
+This patch adds the basic infrastructure and patches for each command will
+follow soon.
 
 diff -r 7c8ecf007c30 tortoisehg/hgqt/sync.py
 --- a/tortoisehg/hgqt/sync.py	Thu Nov 17 14:44:44 2011 -0500
-+++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 13:55:42 2011 +0100
++++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 15:50:01 2011 +0100
 @@ -92,10 +92,11 @@
          self.targetargs = []
  
          self.repo.incrementBusyCount()
          self.cmd.run(cmdline, display=display, useproc='p4://' in cururl)
  
-@@ -923,7 +925,7 @@
-         self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())
- 
-     def pushclicked(self, confirm, rev=None, branch=None):
--        validopts = ('force', 'new-branch', 'branch', 'rev', 'bookmark')
-+        validopts = ('force', 'new-branch', 'branch', 'rev', 'bookmark', 'mq')
-         self.syncStarted.emit()
-         url = self.currentUrl(True)
-         urlu = hglib.tounicode(url)
 @@ -1546,6 +1548,12 @@
          self.debugcb.setChecked(opts.get('debug', False))
          layout.addWidget(self.debugcb)

File SyncMqPush.diff

+# HG changeset patch
+# Parent a21eb9eca14c2a6629bbeacbad02c1d99e111195
+sync: add support for the --mq option in the sync tool for the push command
+
+diff -r a21eb9eca14c -r e5edb137d9c6 tortoisehg/hgqt/sync.py
+--- a/tortoisehg/hgqt/sync.py	Fri Nov 18 15:50:01 2011 +0100
++++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 15:51:02 2011 +0100
+@@ -925,7 +925,7 @@
+         self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())
+ 
+     def pushclicked(self, confirm, rev=None, branch=None):
+-        validopts = ('force', 'new-branch', 'branch', 'rev', 'bookmark')
++        validopts = ('force', 'new-branch', 'branch', 'rev', 'bookmark', 'mq')
+         self.syncStarted.emit()
+         url = self.currentUrl(True)
+         urlu = hglib.tounicode(url)
 SyncMq
+SyncMqPush.diff
 # Placed by Bitbucket