Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
42b39023
Commit
42b39023
authored
Aug 13, 2010
by
Friedemann Kleint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VCS polishing: Change context menu entry for 'Blame parent'.
... for git, hg as it is not obvious from the SHA1 displayed.
parent
4c29c61a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
7 deletions
+28
-7
src/plugins/git/clonewizardpage.cpp
src/plugins/git/clonewizardpage.cpp
+2
-2
src/plugins/git/giteditor.cpp
src/plugins/git/giteditor.cpp
+1
-0
src/plugins/mercurial/mercurialeditor.cpp
src/plugins/mercurial/mercurialeditor.cpp
+1
-0
src/plugins/vcsbase/vcsbaseeditor.cpp
src/plugins/vcsbase/vcsbaseeditor.cpp
+18
-4
src/plugins/vcsbase/vcsbaseeditor.h
src/plugins/vcsbase/vcsbaseeditor.h
+6
-1
No files found.
src/plugins/git/clonewizardpage.cpp
View file @
42b39023
...
...
@@ -164,9 +164,9 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
QStringList
CloneWizardPage
::
branches
(
const
QString
&
repository
,
int
*
current
)
{
// Run git on remote repository if
URL is complete
// Run git on remote repository if
an URL was specified.
*
current
=
0
;
if
(
!
repository
.
endsWith
(
d
->
gitPostFix
))
if
(
repository
.
isEmpty
(
))
return
QStringList
();
const
QStringList
branches
=
Internal
::
GitPlugin
::
instance
()
->
gitClient
()
->
synchronousRepositoryBranches
(
repository
);
*
current
=
branches
.
indexOf
(
QLatin1String
(
"master"
));
...
...
src/plugins/git/giteditor.cpp
View file @
42b39023
...
...
@@ -66,6 +66,7 @@ GitEditor::GitEditor(const VCSBase::VCSBaseEditorParameters *type,
QTC_ASSERT
(
m_changeNumberPattern8
.
isValid
(),
return
);
QTC_ASSERT
(
m_changeNumberPattern40
.
isValid
(),
return
);
setAnnotateRevisionTextFormat
(
tr
(
"Blame %1"
));
setAnnotatePreviousRevisionTextFormat
(
tr
(
"Blame parent revision %1"
));
if
(
Git
::
Constants
::
debug
)
qDebug
()
<<
"GitEditor::GitEditor"
<<
type
->
type
<<
type
->
id
;
}
...
...
src/plugins/mercurial/mercurialeditor.cpp
View file @
42b39023
...
...
@@ -55,6 +55,7 @@ MercurialEditor::MercurialEditor(const VCSBase::VCSBaseEditorParameters *type, Q
diffIdentifier
(
QLatin1String
(
Constants
::
DIFFIDENTIFIER
))
{
setAnnotateRevisionTextFormat
(
tr
(
"Annotate %1"
));
setAnnotatePreviousRevisionTextFormat
(
tr
(
"Annotate parent revision %1"
));
}
QSet
<
QString
>
MercurialEditor
::
annotationChanges
()
const
...
...
src/plugins/vcsbase/vcsbaseeditor.cpp
View file @
42b39023
...
...
@@ -158,6 +158,7 @@ struct VCSBaseEditorPrivate
QList
<
int
>
m_diffSections
;
// line number where this section starts
int
m_cursorLine
;
QString
m_annotateRevisionTextFormat
;
QString
m_annotatePreviousRevisionTextFormat
;
QString
m_copyRevisionTextFormat
;
bool
m_fileLogAnnotateEnabled
;
};
...
...
@@ -246,6 +247,16 @@ void VCSBaseEditor::setAnnotateRevisionTextFormat(const QString &f)
d
->
m_annotateRevisionTextFormat
=
f
;
}
QString
VCSBaseEditor
::
annotatePreviousRevisionTextFormat
()
const
{
return
d
->
m_annotatePreviousRevisionTextFormat
;
}
void
VCSBaseEditor
::
setAnnotatePreviousRevisionTextFormat
(
const
QString
&
f
)
{
d
->
m_annotatePreviousRevisionTextFormat
=
f
;
}
QString
VCSBaseEditor
::
copyRevisionTextFormat
()
const
{
return
d
->
m_copyRevisionTextFormat
;
...
...
@@ -405,9 +416,12 @@ QAction *VCSBaseEditor::createDescribeAction(const QString &change)
return
a
;
}
QAction
*
VCSBaseEditor
::
createAnnotateAction
(
const
QString
&
change
)
QAction
*
VCSBaseEditor
::
createAnnotateAction
(
const
QString
&
change
,
bool
previous
)
{
QAction
*
a
=
new
QAction
(
d
->
m_annotateRevisionTextFormat
.
arg
(
change
),
0
);
// Use 'previous' format if desired and available, else default to standard.
const
QString
&
format
=
previous
&&
!
d
->
m_annotatePreviousRevisionTextFormat
.
isEmpty
()
?
d
->
m_annotatePreviousRevisionTextFormat
:
d
->
m_annotateRevisionTextFormat
;
QAction
*
a
=
new
QAction
(
format
.
arg
(
change
),
0
);
a
->
setData
(
change
);
connect
(
a
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
slotAnnotateRevision
()));
return
a
;
...
...
@@ -434,7 +448,7 @@ void VCSBaseEditor::contextMenuEvent(QContextMenuEvent *e)
menu
->
addAction
(
createCopyRevisionAction
(
d
->
m_currentChange
));
menu
->
addAction
(
createDescribeAction
(
d
->
m_currentChange
));
if
(
d
->
m_fileLogAnnotateEnabled
)
menu
->
addAction
(
createAnnotateAction
(
d
->
m_currentChange
));
menu
->
addAction
(
createAnnotateAction
(
d
->
m_currentChange
,
false
));
break
;
case
AnnotateOutput
:
{
// Describe current / annotate previous
menu
->
addSeparator
();
...
...
@@ -444,7 +458,7 @@ void VCSBaseEditor::contextMenuEvent(QContextMenuEvent *e)
if
(
!
previousVersions
.
isEmpty
())
{
menu
->
addSeparator
();
foreach
(
const
QString
&
pv
,
previousVersions
)
menu
->
addAction
(
createAnnotateAction
(
pv
));
menu
->
addAction
(
createAnnotateAction
(
pv
,
true
));
}
// has previous versions
}
break
;
...
...
src/plugins/vcsbase/vcsbaseeditor.h
View file @
42b39023
...
...
@@ -119,6 +119,11 @@ public:
QString
annotateRevisionTextFormat
()
const
;
void
setAnnotateRevisionTextFormat
(
const
QString
&
);
// Format for "Annotate Previous" revision menu entries. Should contain '%1" placeholder.
// Defaults to "annotateRevisionTextFormat" if unset.
QString
annotatePreviousRevisionTextFormat
()
const
;
void
setAnnotatePreviousRevisionTextFormat
(
const
QString
&
);
// Format for "Copy" revision menu entries. Should contain '%1" placeholder
QString
copyRevisionTextFormat
()
const
;
void
setCopyRevisionTextFormat
(
const
QString
&
);
...
...
@@ -230,7 +235,7 @@ private:
void
jumpToChangeFromDiff
(
QTextCursor
cursor
);
QAction
*
createDescribeAction
(
const
QString
&
change
);
QAction
*
createAnnotateAction
(
const
QString
&
change
);
QAction
*
createAnnotateAction
(
const
QString
&
change
,
bool
previous
=
false
);
QAction
*
createCopyRevisionAction
(
const
QString
&
change
);
VCSBaseEditorPrivate
*
d
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment