We are currently indexing your data, so search results may be incomplete until we finish.
removed extra white space
Changeset a6546b94f9b1…
Parent 15ec02e7de25…
by
Changes to 2 files · Browse files at a6546b94f9b1 Showing diff from parent 15ec02e7de25 Diff from another changeset...
|
@@ -235,7 +235,7 @@
INFO = (
({'name': 'general', 'label': 'TortoiseHg', 'icon': 'thg_logo'}, (
- (_('Three-way Merge Tool'), 'ui.merge',
+ (_('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'
@@ -243,7 +243,7 @@ ' 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')),
- (_('Visual Diff Tool'), 'tortoisehg.vdiff',
+ (_('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'
@@ -315,7 +315,7 @@ (_('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.'
+ ' standard tags inserted by the Mercurial Queues Extension.'
' Default: None')),
(_('After Pull Operation'), 'tortoisehg.postpull', (genDefaultCombo,
['none', 'update', 'fetch', 'rebase']),
@@ -366,7 +366,7 @@ (_('Style'), 'web.style', (genDefaultCombo,
['paper', 'monoblue', 'coal', 'spartan', 'gitweb', 'old']),
_('Which template map style to use')),
- (_('Archive Formats'), 'web.allow_archive',
+ (_('Archive Formats'), 'web.allow_archive',
(genEditCombo, ['bz2', 'gz', 'zip']),
_('Comma separated list of archive formats allowed for'
' downloading')),
|
||
|
|
|
@@ -186,15 +186,15 @@ filtered.append(tag)
return filtered
-def getrawctxtags(changectx):
- '''Returns the tags for changectx, converted to UTF-8 but
+def getrawctxtags(changectx):
+ '''Returns the tags for changectx, converted to UTF-8 but
unfiltered for hidden tags'''
value = [toutf(tag) for tag in changectx.tags()]
if len(value) == 0:
return None
return value
-def getctxtags(changectx):
+def getctxtags(changectx):
'''Returns all unhidden tags for changectx, converted to UTF-8'''
value = getrawctxtags(changectx)
if value:
@@ -540,11 +540,11 @@ """
Will return the bookmarks for the given repo if the
bookmarks extension is loaded.
-
+
By default, returns a list of bookmark names; if
- values is True, returns a dict mapping names to
+ values is True, returns a dict mapping names to
nodes.
-
+
If the extension is not loaded, returns an empty
list/dict.
"""
@@ -562,18 +562,18 @@ marks = {}
else:
marks = {}
-
+
if values:
return marks
else:
return marks.keys()
-
+
def get_repo_bookmarkcurrent(repo):
"""
Will return the current bookmark for the given repo
if the bookmarks extension is loaded, and the
track.current option is on.
-
+
If the extension is not loaded, or track.current
is not set, returns None
"""
@@ -593,17 +593,17 @@ '''
Returns True if the revision indicated by 'rev' is the current
working directory parent.
-
+
If rev is '' or None, it is assumed to mean 'tip'.
'''
if rev in ('', None):
rev = 'tip'
rev = repo.lookup(rev)
parents = repo.parents()
-
+
if len(parents) > 1:
return False
-
+
return rev == parents[0].node()
def is_descriptor(obj, attr):
@@ -619,15 +619,15 @@ if attr in cls.__dict__:
return hasattr(cls.__dict__[attr], '__get__')
return None
-
+
def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
opts=None):
'''
export changesets as hg patches.
-
+
Mercurial moved patch.export to cmdutil.export after version 1.5
(change e764f24a45ee in mercurial).
- '''
+ '''
try:
return cmdutil.export(repo, revs, template, fp, switch_parent, opts)
|
Add a tag
Loading...