1. Yuya Nishihara
  2. thg-qt-mq

Commits

Yuya Nishihara  committed 1b558c1

fold, etc.

  • Participants
  • Parent commits 51927d3
  • Branches default

Comments (0)

Files changed (5)

File repow-to-sync-seturl.diff

-# HG changeset patch
-# Parent cc9d2f61ff6d5825dfb18c12c2fdeef7c8187f8b
-diff --git a/tortoisehg/hgqt/repowidget.py b/tortoisehg/hgqt/repowidget.py
---- a/tortoisehg/hgqt/repowidget.py
-+++ b/tortoisehg/hgqt/repowidget.py
-@@ -1208,6 +1208,11 @@ class RepoWidget(QWidget):
-         self.repoview.saveSettings(s)
-         return True
- 
-+    def setSyncUrl(self, url):
-+        """Change the current peer-repo url of the sync widget; url may be
-+        a symbolic name defined in [paths] section"""
-+        self.syncDemand.get().setUrl(url)
-+
-     def incoming(self):
-         self.syncDemand.get().incoming()
- 

File series

View file
 sync-seletcapi.diff
 sync-selectapiuse.diff
 wb-synchandler.diff
-repow-to-sync-seturl.diff
 wb-urlcombo-tuple.diff
 wb-synchandler-url.diff
 thread-dup-repoerror.diff

File wb-synchandler-url.diff

View file
 # HG changeset patch
-# Parent a0bbd5786d3982d231c535845694a2666fbf6b7b
+# Parent d4253aa8de224fa7e7c96e1dbb27eb332b9c197d
 
+diff --git a/tortoisehg/hgqt/repowidget.py b/tortoisehg/hgqt/repowidget.py
+--- a/tortoisehg/hgqt/repowidget.py
++++ b/tortoisehg/hgqt/repowidget.py
+@@ -1208,6 +1208,11 @@ class RepoWidget(QWidget):
+         self.repoview.saveSettings(s)
+         return True
+ 
++    def setSyncUrl(self, url):
++        """Change the current peer-repo url of the sync widget; url may be
++        a symbolic name defined in [paths] section"""
++        self.syncDemand.get().setUrl(url)
++
+     def incoming(self):
+         self.syncDemand.get().incoming()
+ 
 diff --git a/tortoisehg/hgqt/workbench.py b/tortoisehg/hgqt/workbench.py
 --- a/tortoisehg/hgqt/workbench.py
 +++ b/tortoisehg/hgqt/workbench.py
      def _setupCustomTools(self, ui):
          tools, toollist = hglib.tortoisehgtools(ui,
              selectedlocation='workbench.custom-toolbar')
-@@ -880,8 +886,9 @@ class Workbench(QMainWindow):
-     def _runSyncAction(self, action):
+@@ -881,6 +887,7 @@ class Workbench(QMainWindow):
          w = self.repoTabsWidget.currentWidget()
          if w:
--            req = str(action.data().toString())
--            getattr(w, req)()
-+            op = str(action.data().toString())
+             op = str(action.data().toString())
 +            w.setSyncUrl(self._syncUrlFor(op))
-+            getattr(w, op)()
+             getattr(w, op)()
  
      def serve(self):
-         w = self.repoTabsWidget.currentWidget()

File wb-synchandler.diff

View file
 # HG changeset patch
-# Parent 868fc68d4b2f134bb6d5a6fd2149118e54089da8
+# Date 1366461843 -32400
+# Parent 9eab5675b407bd8cbd6f9ffe8c5a14af343a71c1
+workbench: add stub to switch peer URL before sync operation
 
 diff --git a/tortoisehg/hgqt/workbench.py b/tortoisehg/hgqt/workbench.py
 --- a/tortoisehg/hgqt/workbench.py
  
          self.updateMenu()
  
-@@ -876,6 +877,13 @@ class Workbench(QMainWindow):
+@@ -869,6 +870,13 @@ class Workbench(QMainWindow):
  
          return forwarder
  
 +    def _runSyncAction(self, action):
 +        w = self.repoTabsWidget.currentWidget()
 +        if w:
-+            req = str(action.data().toString())
-+            getattr(w, req)()
++            op = str(action.data().toString())
++            getattr(w, op)()
 +
      def serve(self):
          w = self.repoTabsWidget.currentWidget()

File wb-urlcombo-tuple.diff

View file
 # HG changeset patch
-# Parent 471254bc9191ab215ef55f297367c9a608527c22
+# Date 1366462087 -32400
+# Parent dbc31e5c0d6c6ea203464c8603d5e47978f68d2d
+workbench: keep pair of push/pull aliases in url combo
 
 diff --git a/tortoisehg/hgqt/workbench.py b/tortoisehg/hgqt/workbench.py
 --- a/tortoisehg/hgqt/workbench.py
 +++ b/tortoisehg/hgqt/workbench.py
-@@ -384,14 +384,20 @@ class Workbench(QMainWindow):
+@@ -385,14 +385,20 @@ class Workbench(QMainWindow):
          for a in aliases[:]:
              if a + '-push' in aliases:
                  # add foo,foo-push entry to top of menu