- 02 Feb, 2011 10 commits
-
-
Steve Borho authored
Certain branch merges will not result in two parents, so only look at the merge command return code to determine if it was successful.
-
Steve Borho authored
This was broken when I no longer called dirstate.setbranch() to set the branch before the check was made.
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
--HG-- branch : stable
-
Steve Borho authored
--HG-- branch : stable
-
Steve Borho authored
Fix translation errors in it.po and uk.po. uk.po was translating key lookup strings like %(count)s while it.po was leaving off some trailing delimiters --HG-- branch : stable
-
- 01 Feb, 2011 30 commits
-
-
Steve Borho authored
This dialog configures both https connection properties and user authentication. It no longer offers the full feature set of the [auth] section as the complexity is much too great for what is a rare requirement. Also the previous logic was defaulting to allowing authentication over http, which was transmitting your password in plaintext if you happened to accidentally push over http. It also disables the password entry if mercurial_keyring is enabled, since it completely destroys the usefulness of mercurial_keyring if you go and save your password in plaintext for zero benefit. More work remains to be done, we need to add --insecure to the command line if the hostname is found in [insecurehosts] and we are using https.
-
Yuya Nishihara authored
Without this, the following code path doesn't work: 1. annview.setSource('foo', 1) 2. annview.clear() 3. annview.setSource('foo', 1) # no change It happens when user clicks "annotate originating revision" from context menu.
-
Steve Borho authored
(on to the next traceback caused by qpop/qref)
-
Adrian Buehlmann authored
opens all repos in the group (if they aren't already open in a tab)
-
Adrian Buehlmann authored
As queried from the Windows installer service using the Windows Installer MsiGetProductInfo API. http://msdn.microsoft.com/en-us/library/aa370130(v=VS.85).aspx
-
Yuya Nishihara authored
-
Steve Borho authored
Use a single QSci instance for all three modes. This fixes the margin text and color issues in the manifest widget as well. For whatever reason, you have to rebuild the style each time the margin is refreshed, and it is also necessary to set the font before setting the margin width else the margin size will be too wide.
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
Do no emit this signal when diffs to a specific revision are requested. This fixes the 'show all' toggle when viewing merge changesets.
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
This was why the revset and goto toolbars always caused warnings about QObject::startTimer: QTimer can only be used with threads started with QThread After this changeset and the previous, no such warnings occur any more
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
QsciScintilla has a wonderful search highlighting feature of which we are only scratching the surface.
-
Adrian Buehlmann authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-
Steve Borho authored
-