Commits

Anonymous committed 7878944

SyncMqPush: rename push to push pull

Comments (0)

Files changed (3)

SyncMqPush

-# HG changeset patch
-# Parent ddbb98a8476a5bd0f339a04c5d85b6b7313bc837
-sync: add support for --mq to the sync push command
-
-diff -r ddbb98a8476a tortoisehg/hgqt/sync.py
---- a/tortoisehg/hgqt/sync.py	Fri Nov 18 16:01:05 2011 +0100
-+++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 16:39:02 2011 +0100
-@@ -500,6 +500,8 @@
-             if port:
-                 parts.extend([':', hglib.fromunicode(port)])
-             parts.extend(['/', hglib.fromunicode(path)])
-+            if self.opts['mq']:
-+                parts.extend(['/', '.hg', '/', 'patches'])
-             return ''.join(parts)
- 
-     def pathSelected(self, index):
-@@ -798,7 +800,7 @@
-             self.finishfunc = finished
-             cmdline = ['--repository', self.repo.root, 'incoming', '--quiet',
-                        '--bundle', bfile]
--            self.run(cmdline, ('force', 'branch', 'rev'))
-+            self.run(cmdline, ('force', 'branch', 'rev', 'mq'))
-         else:
-             def finished(ret, output):
-                 if ret == 0:
-@@ -809,7 +811,7 @@
-                     self.showMessage.emit(_('Incoming from %s aborted, ret %d') % (urlu, ret))
-             self.finishfunc = finished
-             cmdline = ['--repository', self.repo.root, 'incoming']
--            self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))
-+            self.run(cmdline, ('force', 'branch', 'rev', 'subrepos', 'mq'))
- 
-     def pullclicked(self):
-         self.syncStarted.emit()
-@@ -848,7 +850,7 @@
-             cmdline += ['--update', '--config', uimerge]
-         elif self.cachedpp == 'fetch':
-             cmdline[2] = 'fetch'
--        self.run(cmdline, ('force', 'branch', 'rev', 'bookmark'))
-+        self.run(cmdline, ('force', 'branch', 'rev', 'bookmark', 'mq'))
- 
-     def outclicked(self):
-         self.syncStarted.emit()
-@@ -875,11 +877,11 @@
-             self.finishfunc = outputnodes
-             cmdline = ['--repository', self.repo.root, 'outgoing', '--quiet',
-                        '--template', '{node}\n']
--            self.run(cmdline, ('force', 'branch', 'rev'))
-+            self.run(cmdline, ('force', 'branch', 'rev', 'mq'))
-         else:
-             self.finishfunc = None
-             cmdline = ['--repository', self.repo.root, 'outgoing']
--            self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))
-+            self.run(cmdline, ('force', 'branch', 'rev', 'subrepos', 'mq'))
- 
-     def p4pending(self):
-         p4url = self.currentUrl(False)
-@@ -925,7 +927,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)
+# HG changeset patch
+# Parent ddbb98a8476a5bd0f339a04c5d85b6b7313bc837
+sync: add support for --mq to the sync push and pull command
+
+diff -r ddbb98a8476a tortoisehg/hgqt/sync.py
+--- a/tortoisehg/hgqt/sync.py	Fri Nov 18 16:01:05 2011 +0100
++++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 16:50:41 2011 +0100
+@@ -848,7 +848,7 @@
+             cmdline += ['--update', '--config', uimerge]
+         elif self.cachedpp == 'fetch':
+             cmdline[2] = 'fetch'
+-        self.run(cmdline, ('force', 'branch', 'rev', 'bookmark'))
++        self.run(cmdline, ('force', 'branch', 'rev', 'bookmark', 'mq'))
+ 
+     def outclicked(self):
+         self.syncStarted.emit()
+@@ -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
+SyncMqPushPull
 # Placed by Bitbucket