Anonymous avatar Anonymous committed 34e5a1d

SyncMq: reduce complexity

Comments (0)

Files changed (1)

 
 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 08:47:15 2011 +0100
++++ b/tortoisehg/hgqt/sync.py	Fri Nov 18 13:55:42 2011 +0100
 @@ -92,10 +92,11 @@
          self.targetargs = []
  
          self.repo.incrementBusyCount()
          self.cmd.run(cmdline, display=display, useproc='p4://' in cururl)
  
-@@ -796,7 +798,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:
-@@ -807,7 +809,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()
-@@ -846,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()
-@@ -873,11 +875,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)
 @@ -923,7 +925,7 @@
          self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())
  
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.