Steve Borho avatar Steve Borho committed 7098288 Merge

Merge with stable

Comments (0)

Files changed (9)

doc/source-cs/workbench.txt

 	issue.link = http://bitbucket.org/<your project and repo>/issue/{1}/
 
 	Mercurial:
-	issue.regex = \bissue\d+\b
-	issue.link = http://mercurial.selenic.com/bts/
+	issue.regex = \bissue(\d+)\b
+	issue.link = http://bz.selenic.com/show_bug.cgi?id={1}
 
 Konzola Output Log
 ------------------

doc/source-ja/changelog.txt

 	issue.link = http://bitbucket.org/<your project and repo>/issue/{1}/
 
 	Mercurial:
-	issue.regex = \bissue\d+\b
-	issue.link = http://mercurial.selenic.com/bts/
+	issue.regex = \bissue(\d+)\b
+	issue.link = http://bz.selenic.com/show_bug.cgi?id={1}
 
 
 Bisect

doc/source/conf.py

 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0'
+release = '2.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/intro.txt

 
 For Mac OS X, no packages are available but you can run thg and all the
 dialogs via the source install method. For details, see
-`Mac OS X <http://bitbucket.org/tortoisehg/thg/wiki/developers/MacOSX>`_.
+`Mac OS X <https://bitbucket.org/tortoisehg/thg/wiki/developers/MacOSX>`_.
 
 .. note::
 	If you install TortoiseHg from source, you need to add our

doc/source/workbench.txt

 	issue.link = https://bitbucket.org/<your project and repo>/issue/{1}/
 
 	Mercurial:
-	issue.regex = \bissue\d+\b
-	issue.link = http://mercurial.selenic.com/bts/
+	issue.regex = \bissue(\d+)\b
+	issue.link = http://bz.selenic.com/show_bug.cgi?id={1}
 
 Output Log Console
 ------------------

tortoisehg/hgqt/filectxactions.py

         if not filenames:
             return
         if rev in repo.thgmqunappliedpatches:
-            QMessageBox.warning(self,
+            QMessageBox.warning(self.parent(),
                 _("Cannot display visual diff"),
                 _("Visual diffs are not supported for unapplied patches"))
             return

tortoisehg/hgqt/repowidget.py

     def setOutgoingNodes(self, nodes):
         self.filterbar.revsetle.setText('outgoing()')
         self.setRevisionSet([self.repo[n].rev() for n in nodes])
+        self.outgoingMode = True
 
         w = self.setInfoBar(qtlib.ConfirmInfoBar,
                             _('%d outgoing changesets') % len(nodes))
         self.syncDemand.get().pull()
     def outgoing(self):
         self.syncDemand.get().outgoing()
-        self.outgoingMode = True
     def push(self, confirm=True, **kwargs):
         """Call sync push.
 

tortoisehg/hgqt/workbench.py

         socket = self.server.nextPendingConnection()
         if socket:
             socket.waitForReadyRead(10000)
-            root = socket.readAll()
+            root = str(socket.readAll())
             if root and root != '[echo]':
-                self.openRepo(root, reuse=True)
+                self._openRepo(root, reuse=True)
 
                 # Bring the workbench window to the front
                 # This assumes that the client process has

tortoisehg/util/hglib.py

     Also return the corresponding subrepo context and the filename relative to
     its containing subrepo
     """
-    if wfile in ctx.manifest():
+    if wfile in ctx:
         return '', wfile, ctx
     for wsub in ctx.substate:
         if wfile.startswith(wsub):
                 # The selected revision does not exist in the working copy
                 continue
             wfileinsub =  wfile[len(wsub)+1:]
-            if wfileinsub in sctx.substate or wfileinsub in sctx.manifest():
+            if wfileinsub in sctx.substate or wfileinsub in sctx:
                 return wsub, wfileinsub, sctx
             else:
                 wsubsub, wfileinsub, sctx = \
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.