We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 27 files · Browse files at 075b6dd8684e Showing diff from parent 06d05ce40d38 bbc026f6ebb3 Diff from another changeset...
-
contrib/mergetools.rc
-
doc/source/workbench.txt
-
setup.py
-
tortoisehg/hgqt/bugreport.py
-
tortoisehg/hgqt/chunks.py
-
tortoisehg/hgqt/clone.py
-
tortoisehg/hgqt/cmdui.py
-
tortoisehg/hgqt/commit.py
-
tortoisehg/hgqt/compress.py
-
tortoisehg/hgqt/filedialogs.py
-
tortoisehg/hgqt/guess.py
-
tortoisehg/hgqt/hginit.py
-
tortoisehg/hgqt/merge.py
-
tortoisehg/hgqt/quickop.py
-
tortoisehg/hgqt/rebase.py
-
tortoisehg/hgqt/rename.py
-
tortoisehg/hgqt/repowidget.py
-
tortoisehg/hgqt/resolve.py
-
tortoisehg/hgqt/revset.py
-
tortoisehg/hgqt/settings.py
-
tortoisehg/hgqt/sync.py
-
tortoisehg/hgqt/tag.py
-
tortoisehg/hgqt/update.py
-
tortoisehg/hgqt/visdiff.py
-
tortoisehg/hgqt/wctxactions.py
-
tortoisehg/util/hgversion.py
-
win32/setup.cfg
|
@@ -44,6 +44,7 @@ araxis.dir3diff=True
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
+UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
@@ -56,6 +57,7 @@kdiff3.priority=-3
kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
+kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=False
kdiff3.premerge=False
@@ -64,18 +66,8 @@kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
kdiff3.dirdiff=True
-thgKdiff3.regkey=Software\TortoiseHg
-thgKdiff3.regappend=\kdiff3.exe
-thgKdiff3.priority=-4
-thgKdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
-thgKdiff3.fixeol=False
-thgKdiff3.premerge=False
-thgKdiff3.gui=True
-thgKdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
-thgKdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
-thgKdiff3.dirdiff=True
-
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
+diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
diffmerge.regname=Location
diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
@@ -88,6 +80,7 @@p4merge.priority=-8
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
+p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
@@ -98,6 +91,7 @@tortoisemerge.priority=-9
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
tortoisemerge.regkey=Software\TortoiseSVN
+tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
tortoisemerge.checkchanged=True
tortoisemerge.gui=True
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
@@ -106,6 +100,7 @@ecmerge.priority=-10
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3 --title0='$clabel' --title1='$plabel1' --title2='$plabel2'
@@ -113,6 +108,7 @@ecmerge.dir3diff=True
winmergeu.regkey=Software\Thingamahoochie\WinMerge\
+winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
winmergeu.regname=Executable
winmergeu.priority=-10
winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local $output
@@ -182,6 +178,7 @@
; Telelogic Rhapsody DiffMerge Tool
rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\
+rhapsody_diffmerge.regkeyalt=Software\Wow6432Node\Telelogic\Rhapsody\DiffMerge\
rhapsody_diffmerge.regname=Install Path
rhapsody_diffmerge.priority=-110
rhapsody_diffmerge.args=-xmerge $other $local -base $base -out $output
|
||
|
@@ -293,6 +293,18 @@ mode. This button is only visible when previewing a changeset
bundle.
+The Workbench will attempt to lookup the entered search phrase in the
+repository to see if it matches a tag, bookmark, branch name, changeset
+hash, or revision number. If no changeset match is found, the Workbench
+checks if the search phrase has any parentheses. If no parentheses are
+found, the Workbench assumes the search is a keyword and performs a
+:command:`keyword()` revision set search. If parentheses are found, the
+Workbench assumes the search phrase is a revision set specification and
+attempts to resolve the set.
+
+If you need to perform a keyword search that includes parentheses, use
+:command:`keyword("PHRASE(FOO)")`.
+
Revision Graph Details
----------------------
|
||
|
@@ -143,6 +143,9 @@ py_file = splitext(qrc_file)[0] + "_rc.py"
if not(self.force or newer(qrc_file, py_file)):
return
+ import PyQt4
+ path = os.getenv('PATH')
+ os.putenv('PATH', path + ';' + os.path.dirname(PyQt4.__file__) + '\\bin')
if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
self.warn("Unable to generate python module %s for resource file %s"
% (py_file, qrc_file))
@@ -150,6 +153,7 @@ raise SystemExit(1)
else:
log.info('compiled %s into %s' % (qrc_file, py_file))
+ os.putenv('PATH', path)
def _generate_qrc(self, qrc_file, srcfiles, prefix):
basedir = os.path.dirname(qrc_file)
|
||
|
@@ -46,8 +46,8 @@
def gettext(self, opts):
text = '{{{\n#!python\n' # Wrap in Bitbucket wiki preformat markers
- text += _('** Please report this bug to'
- ' http://bitbucket.org/tortoisehg/thg/issues\n')
+ text += _('** Please report this bug to '
+ 'http://bitbucket.org/tortoisehg/thg/issues\n')
text += '** Mercurial version (%s). TortoiseHg version (%s)\n' % (
hglib.hgversion, version.version())
text += '** Command: %s\n' % (hglib.tounicode(opts.get('cmd', 'N/A')))
|
||
|
@@ -230,8 +230,8 @@ patchchunks = ctx._files[wfile]
if isAorR(chunks[0].header) or isAorR(patchchunks[0].header):
qtlib.InfoMsgBox(_('Unable to merge chunks'),
- _('Add or remove patches must be merged'
- ' in the working directory'))
+ _('Add or remove patches must be merged '
+ 'in the working directory'))
return False
# merge new chunks into existing chunks, sorting on start line
newchunks = [chunks[0]]
|
||
|
@@ -323,15 +323,17 @@ def browse_src(self):
FD = QFileDialog
caption = _("Select source repository")
- path = FD.getExistingDirectory(self, caption)
+ path = FD.getExistingDirectory(self, caption, \
+ self.src_combo.currentText(), QFileDialog.ShowDirsOnly)
if path:
self.src_combo.setEditText(QDir.toNativeSeparators(path))
- self.src_combo.setFocus()
+ self.dest_combo.setFocus()
def browse_dest(self):
FD = QFileDialog
caption = _("Select destination repository")
- path = FD.getExistingDirectory(self, caption)
+ path = FD.getExistingDirectory(self, caption, \
+ self.dest_combo.currentText(), QFileDialog.ShowDirsOnly)
if path:
self.dest_combo.setEditText(QDir.toNativeSeparators(path))
self.dest_combo.setFocus()
|
||
|
@@ -763,9 +763,10 @@
def reject(self):
if self.core.running():
- ret = QMessageBox.question(self, _('Confirm Exit'), _('Mercurial'
- ' command is still running.\nAre you sure you want'
- ' to terminate?'), QMessageBox.Yes | QMessageBox.No,
+ ret = QMessageBox.question(self, _('Confirm Exit'),
+ _('Mercurial command is still running.\n'
+ 'Are you sure you want to terminate?'),
+ QMessageBox.Yes | QMessageBox.No,
QMessageBox.No)
if ret == QMessageBox.Yes:
self.core.cancel()
|
||
|
@@ -518,17 +518,19 @@ resp = qtlib.CustomPrompt(_('Confirm Branch Change'),
_('Named branch "%s" already exists, '
'last used in revision %d\n'
- 'Yes\t- Make commit restarting this named branch\n'
- 'No\t- Make commit without changing branch\n'
- 'Cancel\t- Cancel this commit') % (self.branchop, rev),
- self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()
+ ) % (self.branchop, rev),
+ self,
+ (_('Restart &Branch'),
+ _('&Commit to current branch'),
+ _('Cancel')), 2, 2).run()
else:
resp = qtlib.CustomPrompt(_('Confirm New Branch'),
_('Create new named branch "%s" with this commit?\n'
- 'Yes\t- Start new branch with this commit\n'
- 'No\t- Make commit without branch change\n'
- 'Cancel\t- Cancel this commit') % self.branchop,
- self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()
+ ) % self.branchop,
+ self,
+ (_('Create &Branch'),
+ _('&Commit to current branch'),
+ _('Cancel')), 2, 2).run()
if resp == 0:
newbranch = True
commandlines.append(['branch', '--repository', repo.root,
@@ -554,8 +556,8 @@ if checkedUnknowns:
res = qtlib.CustomPrompt(
_('Confirm Add'),
- _('Add checked untracked files?'), self,
- (_('&OK'), _('Cancel')), 0, 1,
+ _('Add selected untracked files?'), self,
+ (_('&Add'), _('Cancel')), 0, 1,
checkedUnknowns).run()
if res == 0:
cmd = ['add', '--repository', repo.root] + \
@@ -567,8 +569,8 @@ if checkedMissing:
res = qtlib.CustomPrompt(
_('Confirm Remove'),
- _('Remove checked deleted files?'), self,
- (_('&OK'), _('Cancel')), 0, 1,
+ _('Remove selected deleted files?'), self,
+ (_('&Remove'), _('Cancel')), 0, 1,
checkedMissing).run()
if res == 0:
cmd = ['remove', '--repository', repo.root] + \
|
||
|
@@ -148,8 +148,8 @@ elif cmd == 'discard':
labels = [(QMessageBox.Yes, _('&Discard')),
(QMessageBox.No, _('Cancel'))]
- if not qtlib.QuestionMsgBox(_('Confirm Discard'), _('Discard'
- ' outstanding changes in working directory?'),
+ if not qtlib.QuestionMsgBox(_('Confirm Discard'),
+ _('Discard outstanding changes to working directory?'),
labels=labels, parent=self):
return
def finished(ret):
|
||
|
@@ -229,7 +229,9 @@ else:
self._show_rev = rev
-
+ def reload(self):
+ self.repoview.saveSettings()
+ super(FileLogDialog, self).reload()
class FileDiffDialog(_AbstractFileDialog):
"""
@@ -556,3 +558,8 @@ bvalue = bhi
vbar.setValue(bvalue)
self._invbarchanged = False
+
+ def reload(self):
+ self.tableView_revisions_left.saveSettings()
+ self.tableView_revisions_right.saveSettings()
+ super(FileDiffDialog, self).reload()
|
||
|
@@ -82,8 +82,8 @@ buthbox = QHBoxLayout()
utvbox.addLayout(buthbox)
copycheck = QCheckBox(_('Only consider deleted files'))
- copycheck.setToolTip(_('Uncheck to consider all revisioned files'
- ' for copy sources'))
+ copycheck.setToolTip(_('Uncheck to consider all revisioned files '
+ 'for copy sources'))
copycheck.setChecked(True)
findrenames = QPushButton(_('Find Rename'))
findrenames.setToolTip(_('Find copy and/or rename sources'))
|
||
|
@@ -145,8 +145,8 @@ break # already root path
if l > 1:
res = qtlib.QuestionMsgBox(_('Init'),
- _('Are you sure about adding the new repository'
- ' %d extra levels deep?') % l,
+ _('Are you sure about adding the new repository '
+ '%d extra levels deep?') % l,
_('Path exists up to:\n%s\nand you asked for:\n%s')
% (p, udest),
defaultbutton=QMessageBox.No)
|
||
|
@@ -58,8 +58,8 @@ page = self.currentPage()
if hasattr(page, 'need_cleanup') and page.need_cleanup():
main = _('Do you want to exit?')
- text = _('To complete merging, you need to commit merged files '
- 'in working directory.')
+ text = _('To finish merging, you need to commit '
+ 'the working directory.')
labels = ((QMessageBox.Yes, _('&Exit')),
(QMessageBox.No, _('Cancel')))
if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text,
@@ -283,9 +283,9 @@ self.groups.add(wd_merged, 'merged')
box.addWidget(wd_merged)
- text = _('Before merging, you must <a href="commit"><b>commit</b></a>,'
- ' <a href="shelve"><b>shelve</b></a> to patch,'
- ' or <a href="discard"><b>discard</b></a> changes.')
+ text = _('Before merging, you must <a href="commit"><b>commit</b></a>, '
+ '<a href="shelve"><b>shelve</b></a> to patch, '
+ 'or <a href="discard"><b>discard</b></a> changes.')
wd_text = QLabel(text)
wd_text.setContentsMargins(*MARGINS)
wd_text.linkActivated.connect(self.link_activated)
@@ -362,8 +362,8 @@ labels = [(QMessageBox.Yes, _('&Discard')),
(QMessageBox.No, _('Cancel'))]
if not qtlib.QuestionMsgBox(_('Confirm Discard Changes'),
- _('The changes from revision %s and all unmerged parents'
- ' will be discarded.\n\n'
+ _('The changes from revision %s and all unmerged parents '
+ 'will be discarded.\n\n'
'Are you sure this is what you want to do?')
% (self.other_info.get_data('revid')),
labels=labels, parent=self):
@@ -391,14 +391,15 @@
def cancel(self):
main = _('Cancel merge and discard changes?')
- text = _('Discard unfinished local changes and restart merge?')
+ # Does this restart "resolved" files too?
+ text = _('Discard local changes and restart merge?')
labels = ((QMessageBox.Yes, _('&Discard')),
(QMessageBox.No, _('Cancel')))
if qtlib.QuestionMsgBox(_('Confirm Clean Up'), main, text,
labels=labels, parent=self):
o = self.cmd.outputLog
o.appendLog(_('Canceling merge...\n'), 'control')
- o.appendLog(_('(Please close any running merge tool)\n'), 'control')
+ o.appendLog(_('(Please close any running merge tools)\n'), 'control')
self.cmd.cancel()
def isComplete(self):
@@ -458,8 +459,8 @@ if cmd != 'discard:noconfirm':
labels = [(QMessageBox.Yes, _('&Discard')),
(QMessageBox.No, _('Cancel'))]
- if not qtlib.QuestionMsgBox(_('Confirm Discard'), _('Discard'
- ' outstanding changes in working directory?'),
+ if not qtlib.QuestionMsgBox(_('Confirm Discard'),
+ _('Discard outstanding changes to working directory?'),
labels=labels, parent=self):
return
def finished(ret):
|
||
|
@@ -88,7 +88,7 @@ cmd.progress.connect(self.statusbar.progress)
BB = QDialogButtonBox
- bb = QDialogButtonBox(BB.Ok|BB.Cancel)
+ bb = QDialogButtonBox(BB.Ok|BB.Close)
bb.accepted.connect(self.accept)
bb.rejected.connect(self.reject)
bb.button(BB.Ok).setDefault(True)
|
||
|
@@ -72,8 +72,8 @@ self.layout().addWidget(self.autoresolvechk)
if 'hgsubversion' in repo.extensions():
- self.svnchk = QCheckBox(_('Rebase unpublished onto Subversion head'
- ' (override source, destination)'))
+ self.svnchk = QCheckBox(_('Rebase unpublished onto Subversion head '
+ '(override source, destination)'))
self.layout().addWidget(self.svnchk)
else:
self.svnchk = None
@@ -212,8 +212,8 @@ elif cmd == 'discard':
labels = [(QMessageBox.Yes, _('&Discard')),
(QMessageBox.No, _('Cancel'))]
- if not qtlib.QuestionMsgBox(_('Confirm Discard'), _('Discard'
- ' outstanding changes in working directory?'),
+ if not qtlib.QuestionMsgBox(_('Confirm Discard'),
+ _('Discard outstanding changes to working directory?'),
labels=labels, parent=self):
return
def finished(ret):
@@ -229,8 +229,8 @@
def reject(self):
if os.path.exists(self.repo.join('rebasestate')):
- main = _('Rebase is incomplete, exiting is not recommended')
- text = _('Abort is recommended before exit.')
+ main = _('Exiting with an unfinished rebase is not recommended.')
+ text = _('Consider aborting the rebase first.')
labels = ((QMessageBox.Yes, _('&Exit')),
(QMessageBox.No, _('Cancel')))
if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text,
|
||
|
@@ -42,8 +42,8 @@ self.repo = thgrepo.repository(ui, path=self.root)
except (error.RepoError):
qtlib.ErrorMsgBox(_('Error'),
- _('Could not find or initialize the repository'
- ' from folder<p>%s</p>' % cwd))
+ _('Could not find or initialize the repository '
+ 'from folder<p>%s</p>' % cwd))
return ('', '')
try:
fname = util.canonpath(self.root, cwd, pats[0])
|
||
|
@@ -646,7 +646,7 @@ if self.bundle:
self.clearBundle()
self.showMessage(_('Repository stripped, incoming preview '
- ' cleared'))
+ 'cleared'))
elif self.revset:
self.revset = []
self.filterbar.revsetle.setText('')
|
||
|
@@ -311,9 +311,9 @@ s = QSettings()
s.setValue('resolve/geom', self.saveGeometry())
if len(self.utree.model()):
- main = _('Quit without finishing resolve?')
+ main = _('Exit without finishing resolve?')
text = _('Unresolved conflicts remain. Are you sure?')
- labels = ((QMessageBox.Yes, _('&Quit')),
+ labels = ((QMessageBox.Yes, _('E&xit')),
(QMessageBox.No, _('Cancel')))
if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text,
labels=labels, parent=self):
|
||
|
@@ -32,8 +32,8 @@ ('grep(regex)',
_('Like "keyword(string)" but accepts a regex.')),
('outgoing([path])',
- _('Changesets not found in the specified destination repository,'
- ' or the default push location.')),
+ _('Changesets not found in the specified destination repository, '
+ 'or the default push location.')),
('bookmark([name])',
_('The named bookmark or all bookmarks.')),
('tag([name])',
|
||
|
|
|
@@ -267,18 +267,18 @@ restartneeded=True, globalonly=True),
_fi(_('Three-way Merge Tool'), 'ui.merge',
(genDeferredCombo, findMergeTools),
- _('Graphical merge program for resolving merge conflicts. If left'
- ' unspecified, Mercurial will use the first applicable tool it finds'
- ' on your system or use its internal merge tool that leaves conflict'
- ' markers in place. Chose internal:merge to force conflict markers,'
- ' internal:prompt to always select local or other, or internal:dump'
- ' to leave files in the working directory for manual merging')),
+ _('Graphical merge program for resolving merge conflicts. If left '
+ 'unspecified, Mercurial will use the first applicable tool it finds '
+ 'on your system or use its internal merge tool that leaves conflict '
+ 'markers in place. Chose internal:merge to force conflict markers ,'
+ 'internal:prompt to always select local or other, or internal:dump '
+ 'to leave files in the working directory for manual merging')),
_fi(_('Visual Diff Tool'), 'tortoisehg.vdiff',
(genDeferredCombo, findDiffTools),
- _('Specify visual diff tool, as described in the [merge-tools]'
- ' section of your Mercurial configuration files. If left'
- ' unspecified, TortoiseHg will use the selected merge tool.'
- ' Failing that it uses the first applicable tool it finds.')),
+ _('Specify visual diff tool, as described in the [merge-tools] '
+ 'section of your Mercurial configuration files. If left '
+ 'unspecified, TortoiseHg will use the selected merge tool. '
+ 'Failing that it uses the first applicable tool it finds.')),
_fi(_('Visual Editor'), 'tortoisehg.editor', genEditCombo,
_('Specify the visual editor used to view files. Format:<br>'
'myeditor -flags [$FILE --num=$LINENUM][--search $SEARCH]<br><br>'
@@ -296,72 +296,72 @@ 'key repository files, looking for changes. Values under '
'100ms are ignored. Default: 500')),
_fi(_('Tab Width'), 'tortoisehg.tabwidth', genIntEditCombo,
- _('Specify the number of spaces that tabs expand to in various'
- ' TortoiseHg windows.'
- ' Default: 0, Not expanded')),
+ _('Specify the number of spaces that tabs expand to in various '
+ 'TortoiseHg windows. '
+ 'Default: 0, Not expanded')),
_fi(_('Max Diff Size'), 'tortoisehg.maxdiff', genIntEditCombo,
_('The maximum size file (in KB) that TortoiseHg will '
- 'show changes for in the changelog, status, and commit windows.'
- ' A value of zero implies no limit. Default: 1024 (1MB)')),
+ 'show changes for in the changelog, status, and commit windows. '
+ 'A value of zero implies no limit. Default: 1024 (1MB)')),
_fi(_('Capture stderr'), 'tortoisehg.stderrcapt', genBoolCombo,
- _('Redirect stderr to a buffer which is parsed at the end of'
- ' the process for runtime errors. Default: True')),
+ _('Redirect stderr to a buffer which is parsed at the end of '
+ 'the process for runtime errors. Default: True')),
_fi(_('Fork GUI'), 'tortoisehg.guifork', genBoolCombo,
- _('When running from the command line, fork a background'
- ' process to run graphical dialogs. Default: True')),
+ _('When running from the command line, fork a background '
+ 'process to run graphical dialogs. Default: True')),
_fi(_('Full Path Title'), 'tortoisehg.fullpath', genBoolCombo,
- _('Show a full directory path of the repository in the dialog title'
- ' instead of just the root directory name. Default: False')),
+ _('Show a full directory path of the repository in the dialog title '
+ 'instead of just the root directory name. Default: False')),
_fi(_('Auto-resolve merges'), 'tortoisehg.autoresolve', genBoolCombo,
- _('Indicates whether TortoiseHg should attempt to automatically resolve'
- ' changes from both sides to the same file, and only report merge'
- ' conflicts when this is not possible. When False, all files with'
- ' changes on both sides of the merge will report as conflicting, even'
- ' if the edits are to different parts of the file. In either case,'
- ' when conflicts occur, the user will be invited to review and'
- ' resolve changes manually. Default: False.')),
+ _('Indicates whether TortoiseHg should attempt to automatically '
+ 'resolve changes from both sides to the same file, and only report '
+ 'merge conflicts when this is not possible. When False, all files '
+ 'with changes on both sides of the merge will report as conflicting, '
+ 'even if the edits are to different parts of the file. In either '
+ 'case, when conflicts occur, the user will be invited to review and '
+ 'resolve changes manually. Default: False.')),
)),
({'name': 'log', 'label': _('Workbench'), 'icon': 'menulog'}, (
_fi(_('Author Coloring'), 'tortoisehg.authorcolor', genBoolCombo,
- _('Color changesets by author name. If not enabled,'
- ' the changes are colored green for merge, red for'
- ' non-trivial parents, black for normal.'
- ' Default: False')),
+ _('Color changesets by author name. If not enabled, '
+ 'the changes are colored green for merge, red for '
+ 'non-trivial parents, black for normal. '
+ 'Default: False')),
_fi(_('Task Tabs'), 'tortoisehg.tasktabs', (genDefaultCombo,
['east', 'west', 'off']),
- _('Show tabs along the side of the bottom half of each repo'
- ' widget allowing one to switch task tabs without using the toolbar.'
- ' Default: off')),
+ _('Show tabs along the side of the bottom half of each repo '
+ 'widget allowing one to switch task tabs without using the toolbar. '
+ 'Default: off')),
_fi(_('Long Summary'), 'tortoisehg.longsummary', genBoolCombo,
- _('If true, concatenate multiple lines of changeset summary'
- ' until they reach 80 characters.'
- ' Default: False')),
+ _('If true, concatenate multiple lines of changeset summary '
+ 'until they reach 80 characters. '
+ 'Default: False')),
_fi(_('Log Batch Size'), 'tortoisehg.graphlimit', genIntEditCombo,
- _('The number of revisions to read and display in the'
- ' changelog viewer in a single batch.'
- ' Default: 500')),
+ _('The number of revisions to read and display in the '
+ 'changelog viewer in a single batch. '
+ 'Default: 500')),
_fi(_('Dead Branches'), 'tortoisehg.deadbranch', genEditCombo,
- _('Comma separated list of branch names that should be ignored'
- ' when building a list of branch names for a repository.'
- ' Default: None (leave blank)')),
+ _('Comma separated list of branch names that should be ignored '
+ 'when building a list of branch names for a repository. '
+ 'Default: None (leave blank)')),
_fi(_('Branch Colors'), 'tortoisehg.branchcolors', genEditCombo,
- _('Space separated list of branch names and colors of the form'
- ' branch:#XXXXXX. Spaces and colons in the branch name must be'
- ' escaped using a backslash (\\). Likewise some other characters'
- ' can be escaped in this way, e.g. \\u0040 will be decoded to the'
- ' @ character, and \\n to a linefeed.'
- ' Default: None (leave blank)')),
+ _('Space separated list of branch names and colors of the form '
+ 'branch:#XXXXXX. Spaces and colons in the branch name must be '
+ 'escaped using a backslash (\\). Likewise some other characters '
+ 'can be escaped in this way, e.g. \\u0040 will be decoded to the '
+ '@ character, and \\n to a linefeed. '
+ 'Default: None (leave blank)')),
_fi(_('Hide Tags'), 'tortoisehg.hidetags', genEditCombo,
_('Space separated list of tags that will not be shown.'
- ' Useful example: Specify "qbase qparent qtip" to hide the'
- ' standard tags inserted by the Mercurial Queues Extension.'
- ' Default: None (leave blank)')),
+ 'Useful example: Specify "qbase qparent qtip" to hide the '
+ 'standard tags inserted by the Mercurial Queues Extension. '
+ 'Default: None (leave blank)')),
_fi(_('After Pull Operation'), 'tortoisehg.postpull', (genDefaultCombo,
['none', 'update', 'fetch', 'rebase']),
- _('Operation which is performed directly after a successful pull.'
- ' update equates to pull --update, fetch equates to the fetch'
- ' extension, rebase equates to pull --rebase. Default: none')),
+ _('Operation which is performed directly after a successful pull. '
+ 'update equates to pull --update, fetch equates to the fetch '
+ 'extension, rebase equates to pull --rebase. Default: none')),
)),
({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit'}, (
@@ -369,85 +369,85 @@ _('Name associated with commits. The common format is<br>'
'"Full Name <email@example.com>"')),
_fi(_('Summary Line Length'), 'tortoisehg.summarylen', genIntEditCombo,
- _('Suggested length of commit message lines. A red vertical'
- ' line will mark this length. CTRL-E will reflow the current'
- ' paragraph to the specified line length. Default: 80')),
+ _('Suggested length of commit message lines. A red vertical '
+ 'line will mark this length. CTRL-E will reflow the current '
+ 'paragraph to the specified line length. Default: 80')),
_fi(_('Close After Commit'), 'tortoisehg.closeci', genBoolCombo,
- _('Close the commit tool after every successful'
- ' commit. Default: False')),
+ _('Close the commit tool after every successful '
+ 'commit. Default: False')),
_fi(_('Push After Commit'), 'tortoisehg.cipushafter', genEditCombo,
- _('Attempt to push to specified URL or alias after each successful'
- ' commit. Default: No push')),
+ _('Attempt to push to specified URL or alias after each successful '
+ 'commit. Default: No push')),
_fi(_('Auto Commit List'), 'tortoisehg.autoinc', genEditCombo,
- _('Comma separated list of files that are automatically included'
- ' in every commit. Intended for use only as a repository setting.'
- ' Default: None (leave blank)')),
+ _('Comma separated list of files that are automatically included '
+ 'in every commit. Intended for use only as a repository setting. '
+ 'Default: None (leave blank)')),
_fi(_('Auto Exclude List'), 'tortoisehg.ciexclude', genEditCombo,
- _('Comma separated list of files that are automatically unchecked'
- ' when the status, and commit dialogs are opened.'
- ' Default: None (leave blank)')),
+ _('Comma separated list of files that are automatically unchecked '
+ 'when the status, and commit dialogs are opened. '
+ 'Default: None (leave blank)')),
_fi(_('English Messages'), 'tortoisehg.engmsg', genBoolCombo,
- _('Generate English commit messages even if LANGUAGE or LANG'
- ' environment variables are set to a non-English language.'
- ' This setting is used by the Merge, Tag and Backout dialogs.'
- ' Default: False')),
+ _('Generate English commit messages even if LANGUAGE or LANG '
+ 'environment variables are set to a non-English language. '
+ 'This setting is used by the Merge, Tag and Backout dialogs. '
+ 'Default: False')),
)),
({'name': 'web', 'label': _('Web Server'), 'icon': 'proxy'}, (
_fi(_('Name'), 'web.name', genEditCombo,
_('Repository name to use in the web interface, and by TortoiseHg '
- ' as a shorthand name. Default is the working directory.')),
+ 'as a shorthand name. Default is the working directory.')),
_fi(_('Description'), 'web.description', genEditCombo,
- _("Textual description of the repository's purpose or"
- ' contents.')),
+ _("Textual description of the repository's purpose or "
+ 'contents.')),
_fi(_('Contact'), 'web.contact', genEditCombo,
- _('Name or email address of the person in charge of the'
- ' repository.')),
+ _('Name or email address of the person in charge of the '
+ 'repository.')),
_fi(_('Style'), 'web.style', (genDefaultCombo,
['paper', 'monoblue', 'coal', 'spartan', 'gitweb', 'old']),
_('Which template map style to use')),
_fi(_('Archive Formats'), 'web.allow_archive',
(genEditCombo, ['bz2', 'gz', 'zip']),
- _('Comma separated list of archive formats allowed for'
- ' downloading')),
+ _('Comma separated list of archive formats allowed for '
+ 'downloading')),
_fi(_('Port'), 'web.port', genIntEditCombo, _('Port to listen on')),
_fi(_('Push Requires SSL'), 'web.push_ssl', genBoolCombo,
- _('Whether to require that inbound pushes be transported'
- ' over SSL to prevent password sniffing.')),
+ _('Whether to require that inbound pushes be transported '
+ 'over SSL to prevent password sniffing.')),
_fi(_('Stripes'), 'web.stripes', genIntEditCombo,
- _('How many lines a "zebra stripe" should span in multiline output.'
- ' Default is 1; set to 0 to disable.')),
+ _('How many lines a "zebra stripe" should span in multiline output. '
+ 'Default is 1; set to 0 to disable.')),
_fi(_('Max Files'), 'web.maxfiles', genIntEditCombo,
_('Maximum number of files to list per changeset. Default: 10')),
_fi(_('Max Changes'), 'web.maxchanges', genIntEditCombo,
_('Maximum number of changes to list on the changelog. '
'Default: 10')),
_fi(_('Allow Push'), 'web.allow_push', (genEditCombo, ['*']),
- _('Whether to allow pushing to the repository. If empty or not'
- ' set, push is not allowed. If the special value "*", any remote'
- ' user can push, including unauthenticated users. Otherwise, the'
- ' remote user must have been authenticated, and the authenticated'
- ' user name must be present in this list (separated by whitespace'
- ' or ","). The contents of the allow_push list are examined after'
- ' the deny_push list.')),
+ _('Whether to allow pushing to the repository. If empty or not '
+ 'set, push is not allowed. If the special value "*", any remote '
+ 'user can push, including unauthenticated users. Otherwise, the '
+ 'remote user must have been authenticated, and the authenticated '
+ 'user name must be present in this list (separated by whitespace '
+ 'or ","). The contents of the allow_push list are examined after '
+ 'the deny_push list.')),
_fi(_('Deny Push'), 'web.deny_push', (genEditCombo, ['*']),
- _('Whether to deny pushing to the repository. If empty or not set,'
- ' push is not denied. If the special value "*", all remote users'
- ' are denied push. Otherwise, unauthenticated users are all'
- ' denied, and any authenticated user name present in this list'
- ' (separated by whitespace or ",") is also denied. The contents'
- ' of the deny_push list are examined before the allow_push list.')),
+ _('Whether to deny pushing to the repository. If empty or not set, '
+ 'push is not denied. If the special value "*", all remote users '
+ 'are denied push. Otherwise, unauthenticated users are all '
+ 'denied, and any authenticated user name present in this list '
+ '(separated by whitespace or ",") is also denied. The contents '
+ 'of the deny_push list are examined before the allow_push list.')),
_fi(_('Encoding'), 'web.encoding', (genEditCombo, ['UTF-8']),
_('Character encoding name')),
)),
({'name': 'proxy', 'label': _('Proxy'), 'icon': QStyle.SP_DriveNetIcon}, (
_fi(_('Host'), 'http_proxy.host', genEditCombo,
- _('Host name and (optional) port of proxy server, for'
- ' example "myproxy:8000"')),
+ _('Host name and (optional) port of proxy server, for '
+ 'example "myproxy:8000"')),
_fi(_('Bypass List'), 'http_proxy.no', genEditCombo,
- _('Optional. Comma-separated list of host names that'
- ' should bypass the proxy')),
+ _('Optional. Comma-separated list of host names that '
+ 'should bypass the proxy')),
_fi(_('User'), 'http_proxy.user', genEditCombo,
_('Optional. User name to authenticate with at the proxy server')),
_fi(_('Password'), 'http_proxy.passwd', genPasswordEntry,
@@ -456,50 +456,50 @@
({'name': 'email', 'label': _('Email'), 'icon': 'mail-forward'}, (
_fi(_('From'), 'email.from', genEditCombo,
- _('Email address to use in the "From" header and for'
- ' the SMTP envelope')),
+ _('Email address to use in the "From" header and for '
+ 'the SMTP envelope')),
_fi(_('To'), 'email.to', genEditCombo,
_('Comma-separated list of recipient email addresses')),
_fi(_('Cc'), 'email.cc', genEditCombo,
_('Comma-separated list of carbon copy recipient email addresses')),
_fi(_('Bcc'), 'email.bcc', genEditCombo,
- _('Comma-separated list of blind carbon copy recipient'
- ' email addresses')),
+ _('Comma-separated list of blind carbon copy recipient '
+ 'email addresses')),
_fi(_('method'), 'email.method', (genEditCombo, ['smtp']),
- _('Optional. Method to use to send email messages. If value is'
- ' "smtp" (default), use SMTP (configured below). Otherwise, use as'
- ' name of program to run that acts like sendmail (takes "-f" option'
- ' for sender, list of recipients on command line, message on stdin).'
- ' Normally, setting this to "sendmail" or "/usr/sbin/sendmail"'
- ' is enough to use sendmail to send messages.')),
+ _('Optional. Method to use to send email messages. If value is '
+ '"smtp" (default), use SMTP (configured below). Otherwise, use as '
+ 'name of program to run that acts like sendmail (takes "-f" option '
+ 'for sender, list of recipients on command line, message on stdin). '
+ 'Normally, setting this to "sendmail" or "/usr/sbin/sendmail" '
+ 'is enough to use sendmail to send messages.')),
_fi(_('SMTP Host'), 'smtp.host', genEditCombo,
_('Host name of mail server')),
_fi(_('SMTP Port'), 'smtp.port', genIntEditCombo,
- _('Port to connect to on mail server.'
- ' Default: 25')),
+ _('Port to connect to on mail server. '
+ 'Default: 25')),
_fi(_('SMTP TLS'), 'smtp.tls', genBoolCombo,
- _('Connect to mail server using TLS.'
- ' Default: False')),
+ _('Connect to mail server using TLS. '
+ 'Default: False')),
_fi(_('SMTP Username'), 'smtp.username', genEditCombo,
_('Username to authenticate to mail server with')),
_fi(_('SMTP Password'), 'smtp.password', genPasswordEntry,
_('Password to authenticate to mail server with')),
_fi(_('Local Hostname'), 'smtp.local_hostname', genEditCombo,
- _('Hostname the sender can use to identify itself to the'
- ' mail server.')),
+ _('Hostname the sender can use to identify itself to the '
+ 'mail server.')),
)),
({'name': 'diff', 'label': _('Diff'),
'icon': QStyle.SP_FileDialogContentsView}, (
_fi(_('Patch EOL'), 'patch.eol', (genDefaultCombo,
['auto', 'strict', 'crlf', 'lf']),
- _('Normalize file line endings during and after patch to lf or'
- ' crlf. Strict does no normalization. Auto does per-file'
- ' detection, and is the recommended setting.'
- ' Default: strict')),
+ _('Normalize file line endings during and after patch to lf or '
+ 'crlf. Strict does no normalization. Auto does per-file '
+ 'detection, and is the recommended setting. '
+ 'Default: strict')),
_fi(_('Git Format'), 'diff.git', genBoolCombo,
- _('Use git extended diff header format.'
- ' Default: False')),
+ _('Use git extended diff header format. '
+ 'Default: False')),
_fi(_('MQ Git Format'), 'mq.git', (genDefaultCombo,
['auto', 'keep', 'yes', 'no']),
_("If set to 'keep', mq will obey the [diff] section configuration while"
@@ -507,20 +507,20 @@ " 'no', mq will override the [diff] section and always generate git or"
" regular patches, possibly losing data in the second case.")),
_fi(_('No Dates'), 'diff.nodates', genBoolCombo,
- _('Do not include modification dates in diff headers.'
- ' Default: False')),
+ _('Do not include modification dates in diff headers. '
+ 'Default: False')),
_fi(_('Show Function'), 'diff.showfunc', genBoolCombo,
- _('Show which function each change is in.'
- ' Default: False')),
+ _('Show which function each change is in. '
+ 'Default: False')),
_fi(_('Ignore White Space'), 'diff.ignorews', genBoolCombo,
- _('Ignore white space when comparing lines.'
- ' Default: False')),
+ _('Ignore white space when comparing lines. '
+ 'Default: False')),
_fi(_('Ignore WS Amount'), 'diff.ignorewsamount', genBoolCombo,
- _('Ignore changes in the amount of white space.'
- ' Default: False')),
+ _('Ignore changes in the amount of white space. '
+ 'Default: False')),
_fi(_('Ignore Blank Lines'), 'diff.ignoreblanklines', genBoolCombo,
- _('Ignore changes whose lines are all blank.'
- ' Default: False')),
+ _('Ignore changes whose lines are all blank. '
+ 'Default: False')),
)),
({'name': 'fonts', 'label': _('Fonts'), 'icon': 'preferences-desktop-font'}, (
@@ -559,8 +559,8 @@
({'name': 'reviewboard', 'label': _('Review Board'), 'icon': 'reviewboard'}, (
_fi(_('Server'), 'reviewboard.server', genEditCombo,
- _('Path to review board'
- ' example "http://demo.reviewboard.org"')),
+ _('Path to review board '
+ 'example "http://demo.reviewboard.org"')),
_fi(_('User'), 'reviewboard.user', genEditCombo,
_('User name to authenticate with review board')),
_fi(_('Password'), 'reviewboard.password', genPasswordEntry,
@@ -659,8 +659,8 @@ self.conftabs.widget(i).applyChanges()
if self._restartreqs:
qtlib.InfoMsgBox(_('Settings'),
- _('Restart all TortoiseHg applications'
- ' for the following changes to take effect:'),
+ _('Restart all TortoiseHg applications '
+ 'for the following changes to take effect:'),
', '.join(sorted(self._restartreqs)))
self._restartreqs.clear()
@@ -766,7 +766,7 @@ 'Open internal editor in stacked widget'
if self.isDirty():
ret = qtlib.CustomPrompt(_('Confirm Save'),
- _('Save changes before edit?'), self,
+ _('Save changes before editing?'), self,
(_('&Save'), _('&Discard'), _('Cancel')),
default=2, esc=2).run()
if ret == 0:
@@ -917,15 +917,15 @@ # Try to create a file from rcpath
try:
f = open(fn, 'w')
- f.write('# Generated by TortoiseHg setting dialog\n')
+ f.write('# Generated by TortoiseHg settings dialog\n')
f.close()
break
except (IOError, OSError):
pass
else:
qtlib.WarningMsgBox(_('Unable to create a Mercurial.ini file'),
- _('Insufficient access rights, reverting to read-only'
- ' mode.'), parent=self)
+ _('Insufficient access rights, reverting to read-only '
+ 'mode.'), parent=self)
from mercurial import config
self.fn = rcpath[0]
return config.config()
|
|
@@ -568,6 +568,8 @@ cmdline = self.applyTargetOption(cmdline)
if self.opts.get('noproxy'):
cmdline += ['--config', 'http_proxy.host=']
+ if self.opts.get('debug'):
+ cmdline.append('--debug')
cururl = self.currentUrl(False)
if not cururl:
@@ -1340,6 +1342,7 @@ _('Allow push of a new branch (--new-branch)'))
self.newbranchcb.setChecked(opts.get('new-branch', False))
layout.addRow(self.newbranchcb, None)
+
self.forcecb = QCheckBox(
_('Force push or pull (override safety checks, --force)'))
self.forcecb.setChecked(opts.get('force', False))
@@ -1357,6 +1360,11 @@ proxy = self.repo.ui.config('http_proxy', 'host')
self.noproxycb.setEnabled(bool(proxy))
+ self.debugcb = QCheckBox(
+ _('Emit debugging output (--debug)'))
+ self.debugcb.setChecked(opts.get('debug', False))
+ layout.addRow(self.debugcb, None)
+
lbl = QLabel(_('Remote command:'))
self.remotele = QLineEdit()
if opts.get('remotecmd'):
@@ -1379,6 +1387,7 @@ outopts['force'] = self.forcecb.isChecked()
outopts['new-branch'] = self.newbranchcb.isChecked()
outopts['noproxy'] = self.noproxycb.isChecked()
+ outopts['debug'] = self.debugcb.isChecked()
self.outopts = outopts
QDialog.accept(self)
|
||
|
@@ -319,7 +319,7 @@ def reject(self):
# prevent signals from reaching deleted objects
self.repo.repositoryChanged.disconnect(self.refresh)
- super(BookmarkDialog, self).reject()
+ super(TagDialog, self).reject()
def run(ui, *pats, **opts):
kargs = {}
|
||
|
@@ -91,8 +91,8 @@ grid.addWidget(expander, row, 0, Qt.AlignLeft | Qt.AlignTop)
grid.addLayout(optbox, row, 1)
- self.discard_chk = QCheckBox(_('Discard local changes, no backup'
- ' (-C/--clean)'))
+ self.discard_chk = QCheckBox(_('Discard local changes, no backup '
+ '(-C/--clean)'))
self.merge_chk = QCheckBox(_('Always merge (when possible)'))
self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts '
'where possible'))
|
||
|
@@ -385,8 +385,8 @@ layout = QVBoxLayout()
self.setLayout(layout)
- lbl = QLabel(_('Temporary files are removed when this dialog'
- ' is closed'))
+ lbl = QLabel(_('Temporary files are removed when this dialog '
+ 'is closed'))
layout.addWidget(lbl)
list = QListWidget()
@@ -479,7 +479,7 @@
repo = self.repo
patterns = repo.ui.configitems('diff-patterns')
- patterns = [(p, t) for p,t in patterns if t in tools]
+ patterns = [(p, t) for p,t in patterns if t in self.tools]
fname = self.list.item(row).text()[2:]
fname = hglib.fromunicode(fname)
|
||
|
@@ -240,8 +240,8 @@ else:
res = qtlib.CustomPrompt(
_('Confirm Revert'),
- _('Revert changes to files?'), parent,
- (_('&Yes (backup changes)'), _('Yes (&discard changes)'),
+ _('Revert local file changes?'), parent,
+ (_('&Revert with backup'), _('&Discard changes'),
_('Cancel')), 2, 2, files).run()
if res == 2:
return False
@@ -295,8 +295,8 @@
def delete(parent, ui, repo, files):
res = qtlib.CustomPrompt(
- _('Confirm Delete Unrevisioned'),
- _('Delete the following unrevisioned files?'),
+ _('Confirm Delete Unversioned'),
+ _('Delete the following unversioned files?'),
parent, (_('&Delete'), _('Cancel')), 1, 1, files).run()
if res == 1:
return
|
||
|
@@ -31,5 +31,5 @@ if vers == nextver:
return
return (('This version of TortoiseHg requires Mercurial '
- 'version %s.n to %s.n, but finds %s') %
+ 'version %s.n to %s.n, but found %s') %
('.'.join(reqver), '.'.join(nextver), v))
|
||
|
@@ -2,4 +2,4 @@ excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt4.uic.port_v3, tcl, tk, distutils, py2exe
includes=sip
packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.util, tortoisehg.hgqt, iniparse, pygments, nntplib, dulwich
-dll_excludes=mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp60.dll, secur32.dll, tk85.dll, tcl85.dll
+dll_excludes=mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp90.dll, secur32.dll, tk85.dll, tcl85.dll
|
||
Add a tag
Loading...