Commits

Show all
Author Commit Message Labels Comments Date
Steve Borho
docdiff: add RTF as a supported format of MS Word diff and merge
Tags
2.6
Branches
stable
Angel Ezquerra
filedata: perform binary, file size and line length checks when displaying patches e8ada1a4d891 introduced a check for max line length to avoid hunging the workbench when displaying binary files, which tend to have big "lines". This test (and all other related tests, such as max file size and the binarity check) were skipped when displaying pure patches. This happens when showing unapplied patches and shelves. This result in hunging the workbench or the shelve tool when display…
Branches
stable
Yuya Nishihara
grep: fix unicode handling of several context menu actions (fixes #2274) 1cdbd7bbd063 fixed rendering of non-ascii filenames, but it broke context menu actions.
Branches
stable
Wagner Bruna
i18n: pull latest fr and nl translations from Launchpad
Branches
stable
Yuya Nishihara
filectxactions: set up initial state of actions correctly (fixes #2255) If initial rev is workingdir or patch, it needs to disable some actions.
Branches
stable
Wagner Bruna
i18n: pull latest fr translations from Launchpad
Branches
stable
rbog...@tenovacore.com
docs: Add thg bullet to Archive, and wordsmith language.
Branches
stable
André Sintzoff
filectxactions: fix parent of vdiff warning dialog (fixes #2252) b6d91077d807 missed this part.
Branches
stable
Yuya Nishihara
revset: disallow to run multiple queries at once It happens if you select known query, e.g. "tagged()", and press enter key. Initial runQuery() is invoked by activated signal, then returnPressed follows. It also happens if you press enter key repeatedly.
Branches
stable
Yuya Nishihara
workbench: use windows-safe getuser() to build IPC socket name (fixes #2238) On Windows, if USERNAME-like environment is not set, getpass.getuser() fails. Instead, this changes to use GetUserNameA() on Windows.
Branches
stable
Yuya Nishihara
thg: make sure to load threading module by main thread (fixes #1894) threading must be loaded by main thread, but in some cases, it is loaded inside CmdThread, which leads KeyError at exit. Instead of excluding every module which depends on threading from demandimport, I chose to load threading before demandimport.
Branches
stable
Wagner Bruna
i18n: pull latest translations from Launchpad Including messages up to 8bc8e6d4928f .
Branches
stable
Steve Borho
wix: template-vars.txt has been removed in Mercurial 2.4
Branches
stable
Steve Borho
Merge with default (2.6 Code Freeze)
Branches
stable
Yuya Nishihara
repomodel: use old-style signal for QTimer.singleShot connection (fixes #2239) PyQt 4.7.4 does not support new-style signal-signal connection for this case. > v4.7.5 31st August 2010 > - A signal defined with pyqtSignal() can now be used with methods that make > an internal call to QObject::connect(), e.g. QTimer.singleShot(). Also note that: - QTimer.singleShot(0, lambda: self.filled.emit()) confuses lifetime of QObject (refs #1267) - QTimer.singleShot(0, self.fi…
Branches
stable
Yuya Nishihara
resolve: correct vertical origin of context menu As QTreeView is sub-class of QAbstractScrollArea, its context menu event is mapped to the coordinates of the viewport.
Yuya Nishihara
repofilter: restore index of revset combobox to avoid extra activated signal If edit text matches combobox item but current index is different, it seems activated signal emitted on each focus-in/out event. It leads unintended revset query and causes problem when closing RepoWidget (refs #1267).
Branches
stable
Yuya Nishihara
repomodel: avoid filled.emit() of destroyed HgRepoListModel (fixes #1267) If QTimer is connected to lambda, it will be alive even after QObject-part of HgRepoListModel destroyed. As a result, it tries to emit unbound filled signal causing TypeError, or "underlying C/C++ object has been deleted" error.
Branches
stable
Steve Borho
commit: ignore IOError when saving state (fixes #2202)
Steve Borho
menu: add shelve to menuthg so it shows up in shellconf (fixes #2209)
Steve Borho
Merge with stable
Wagner Bruna
commit: translate default username message as a whole
Angel Ezquerra
reporegistry: activate the current repository entry after a model reload Without this change the repository registry entry corresponding to the active tab was deactivated after a repository registry reload. This would happen when changing the repository registry settings or when the registry was manually or automatically reload.
Branches
stable
Yuya Nishihara
repotreeitem: fix handling of non-ascii short name at setData
Branches
stable
Yuya Nishihara
repotreeitem: cast possible QString to unicode at setShortName (fixes #2227) RepoRegistryView.shortNameChanged slot will pass QString to setShortName, for example.
Branches
stable
ike....@gmail.com
resolve: add context-menu in resolve window (fixes #2200)
Steve Borho
Merge with stable
Andrew Shadura
repomodel: add Latest tags column. Based on mercurial.templatekw.getlatestags
Wagner Bruna
settings: enhance description of 'phase.publish' setting The new description is transcribed directly from mercurial/help/config.txt .
Branches
stable
rbog...@tenovacore.com
docs: Create CSS styling to center images in html.
Branches
stable
  1. Prev
  2. Next