Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
TortoiseHg
thg-hgtk
Commits
1e0df2d13801
Commit
b3126d15
authored
Dec 14, 2010
by
Steve Borho
Browse files
sync: emit messages on operation start
parent
b62400170bf9
Changes
1
Hide whitespace changes
Inline
Side-by-side
tortoisehg/hgqt/sync.py
View file @
1e0df2d1
...
...
@@ -544,6 +544,7 @@ class SyncWidget(QWidget):
##
def
inclicked
(
self
):
self
.
showMessage
.
emit
(
_
(
'Incoming...'
))
url
=
self
.
currentUrl
(
True
)
if
self
.
embedded
and
not
url
.
startswith
(
'p4://'
):
def
finished
(
ret
,
output
):
...
...
@@ -597,6 +598,7 @@ class SyncWidget(QWidget):
dlg
.
exec_
()
return
self
.
finishfunc
=
finished
self
.
showMessage
.
emit
(
_
(
'Pulling...'
))
cmdline
=
[
'--repository'
,
self
.
root
,
'pull'
,
'--verbose'
]
uimerge
=
self
.
repo
.
ui
.
configbool
(
'tortoisehg'
,
'autoresolve'
)
\
and
'ui.merge=internal:merge'
or
'ui.merge=internal:fail'
...
...
@@ -609,6 +611,7 @@ class SyncWidget(QWidget):
self
.
run
(
cmdline
,
(
'force'
,
'branch'
,
'rev'
))
def
outclicked
(
self
):
self
.
showMessage
.
emit
(
_
(
'Outgoing...'
))
if
self
.
embedded
:
def
outputnodes
(
ret
,
data
):
if
ret
==
0
:
...
...
@@ -666,9 +669,11 @@ class SyncWidget(QWidget):
dlg
.
makeLogVisible
.
connect
(
self
.
makeLogVisible
)
dlg
.
exec_
()
self
.
finishfunc
=
finished
self
.
showMessage
.
emit
(
_
(
'Perforce pending...'
))
self
.
run
([
'--repository'
,
self
.
root
,
'p4pending'
,
'--verbose'
],
())
def
pushclicked
(
self
):
self
.
showMessage
.
emit
(
_
(
'Pushing...'
))
def
finished
(
ret
,
output
):
if
ret
==
0
:
self
.
showMessage
.
emit
(
_
(
'Push completed successfully'
))
...
...
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