Fri, 01 Nov 2013 15:48:48 +0100
Merge with default branch after fixed indentation issues.
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
2302
f29e9405c851
Updated copyright for 2013.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
3 | # Copyright (c) 2011 - 2013 Detlev Offenbach <detlev@die-offenbachs.de> |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the queues extension interface. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
1066
a3dd41fd9ea8
Added support for the Mercurial fetch extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
9 | |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
10 | from __future__ import unicode_literals # __IGNORE_WARNING__ |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
11 | try: |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
12 | str = unicode |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
13 | except (NameError): |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
14 | pass |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
15 | |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import os |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1068
diff
changeset
|
18 | from PyQt4.QtCore import QProcess |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | from PyQt4.QtGui import QDialog, QApplication, QInputDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | from E5Gui import E5MessageBox |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1068
diff
changeset
|
23 | from ..HgExtension import HgExtension |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | from ..HgDialog import HgDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | import Preferences |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | |
1087
fb8cd56819a9
Changed the Mercurial extension interface code to use custom base classes instead of inheriting QObject directly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1068
diff
changeset
|
29 | class Queues(HgExtension): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | Class implementing the queues extension interface. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | APPLIED_LIST = 0 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | UNAPPLIED_LIST = 1 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | SERIES_LIST = 2 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
37 | POP = 0 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
38 | PUSH = 1 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
39 | GOTO = 2 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
40 | |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
41 | QUEUE_DELETE = 0 |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
42 | QUEUE_PURGE = 1 |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
43 | QUEUE_ACTIVATE = 2 |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
44 | |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | def __init__(self, vcs): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | Constructor |
1066
a3dd41fd9ea8
Added support for the Mercurial fetch extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
48 | |
a3dd41fd9ea8
Added support for the Mercurial fetch extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
49 | @param vcs reference to the Mercurial vcs object |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2405
diff
changeset
|
51 | super(Queues, self).__init__(vcs) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | self.qdiffDialog = None |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
54 | self.qheaderDialog = None |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
55 | self.queuesListDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
56 | self.queuesListGuardsDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
57 | self.queuesListAllGuardsDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
58 | self.queuesDefineGuardsDialog = None |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
59 | self.queuesListQueuesDialog = None |
2815
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
60 | self.queueStatusDialog = None |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | def shutdown(self): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | Public method used to shutdown the queues interface. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | if self.qdiffDialog is not None: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | self.qdiffDialog.close() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
68 | if self.qheaderDialog is not None: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
69 | self.qheaderDialog.close() |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
70 | if self.queuesListDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
71 | self.queuesListDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
72 | if self.queuesListGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
73 | self.queuesListGuardsDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
74 | if self.queuesListAllGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
75 | self.queuesListAllGuardsDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
76 | if self.queuesDefineGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
77 | self.queuesDefineGuardsDialog.close() |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
78 | if self.queuesListQueuesDialog is not None: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
79 | self.queuesListQueuesDialog.close() |
2815
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
80 | if self.queueStatusDialog is not None: |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
81 | self.queueStatusDialog.close() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
82 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
83 | def __getPatchesList(self, repodir, listType, withSummary=False): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
84 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
85 | Public method to get a list of patches of a given type. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
86 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
87 | @param repodir directory name of the repository (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
88 | @param listType type of patches list to get |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
89 | (Queues.APPLIED_LIST, Queues.UNAPPLIED_LIST, Queues.SERIES_LIST) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
90 | @param withSummary flag indicating to get a summary as well (boolean) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
91 | @return list of patches (list of string) |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2815
diff
changeset
|
92 | @exception ValueError raised to indicate an invalid patch list type |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
93 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
94 | patchesList = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
95 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
96 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
97 | if listType == Queues.APPLIED_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
98 | args.append("qapplied") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
99 | elif listType == Queues.UNAPPLIED_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
100 | args.append("qunapplied") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
101 | elif listType == Queues.SERIES_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
102 | args.append("qseries") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
103 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
104 | raise ValueError("illegal value for listType") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
105 | if withSummary: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
106 | args.append("--summary") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
107 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
108 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
109 | output = "" |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
110 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
111 | output = client.runcommand(args)[0] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
112 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
113 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
114 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
115 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
116 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
117 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
118 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
119 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
120 | if finished and process.exitCode() == 0: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
121 | output = str( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
122 | process.readAllStandardOutput(), ioEncoding, 'replace') |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
123 | |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
124 | for line in output.splitlines(): |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
125 | if withSummary: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
126 | l = line.strip().split(": ") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
127 | if len(l) == 1: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
128 | patch, summary = l[0][:-1], "" |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
129 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
130 | patch, summary = l[0], l[1] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
131 | patchesList.append("{0}@@{1}".format(patch, summary)) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
132 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
133 | patchesList.append(line.strip()) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
134 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
135 | return patchesList |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
136 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
137 | def __getCurrentPatch(self, repodir): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
138 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
139 | Public method to get the name of the current patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
140 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
141 | @param repodir directory name of the repository (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
142 | @return name of the current patch (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
143 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
144 | currentPatch = "" |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
145 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
146 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
147 | args.append("qtop") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
148 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
149 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
150 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
151 | currentPatch = client.runcommand(args)[0].strip() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
152 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
153 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
154 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
155 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
156 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
157 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
158 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
159 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
160 | if finished and process.exitCode() == 0: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
161 | currentPatch = str( |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
162 | process.readAllStandardOutput(), |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
163 | ioEncoding, 'replace').strip() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
164 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
165 | return currentPatch |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
166 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
167 | def __getCommitMessage(self, repodir): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
168 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
169 | Public method to get the commit message of the current patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
170 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
171 | @param repodir directory name of the repository (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
172 | @return name of the current patch (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
173 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
174 | message = "" |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
175 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
176 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
177 | args.append("qheader") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
178 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
179 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
180 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
181 | message = client.runcommand(args)[0] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
182 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
183 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
184 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
185 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
186 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
187 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
188 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
189 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
190 | if finished and process.exitCode() == 0: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
191 | message = str( |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
192 | process.readAllStandardOutput(), |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
193 | ioEncoding, 'replace') |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
194 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
195 | return message |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
197 | def getGuardsList(self, repodir, all=True): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
198 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
199 | Public method to get a list of all guards defined. |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
200 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
201 | @param repodir directory name of the repository (string) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
202 | @param all flag indicating to get all guards (boolean) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
203 | @return sorted list of guards (list of strings) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
204 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
205 | guardsList = [] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
206 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
207 | args = [] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
208 | args.append("qselect") |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
209 | if all: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
210 | args.append("--series") |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
211 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
212 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
213 | output = "" |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
214 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
215 | output = client.runcommand(args)[0] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
216 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
217 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
218 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
219 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
220 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
221 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
222 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
223 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
224 | if finished and process.exitCode() == 0: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
225 | output = str( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
226 | process.readAllStandardOutput(), ioEncoding, 'replace') |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
227 | |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
228 | for guard in output.splitlines(): |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
229 | guard = guard.strip() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
230 | if all: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
231 | guard = guard[1:] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
232 | if guard not in guardsList: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
233 | guardsList.append(guard) |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
234 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
235 | return sorted(guardsList) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
236 | |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | def hgQueueNewPatch(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | Public method to create a new named patch. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
247 | if os.path.splitdrive(repodir)[1] == os.sep: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
250 | from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
251 | dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | if dlg.exec_() == QDialog.Accepted: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
253 | name, message, (userData, currentUser, userName), \ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | (dateData, currentDate, dateStr) = dlg.getData() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | args.append("qnew") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | if message != "": |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | args.append("--message") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | args.append(message) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | if userData: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | if currentUser: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | args.append("--currentuser") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | args.append("--user") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | args.append(userName) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | if dateData: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | if currentDate: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | args.append("--currentdate") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | args.append("--date") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | args.append(dateStr) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | args.append(name) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
275 | dia = HgDialog(self.trUtf8('New Patch'), self.vcs) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
279 | self.vcs.checkVCSStatus() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
281 | def hgQueueRefreshPatch(self, name, editMessage=False): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
282 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
283 | Public method to refresh the current patch. |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | @param name file/directory name (string) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
286 | @param editMessage flag indicating to edit the current |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
287 | commit message (boolean) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
293 | if os.path.splitdrive(repodir)[1] == os.sep: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | args.append("qrefresh") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
299 | if editMessage: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
300 | currentMessage = self.__getCommitMessage(repodir) |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
301 | from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
302 | dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
303 | currentMessage) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
304 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
305 | name, message, (userData, currentUser, userName), \ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
306 | (dateData, currentDate, dateStr) = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
307 | if message != "" and message != currentMessage: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
308 | args.append("--message") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
309 | args.append(message) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
310 | if userData: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
311 | if currentUser: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
312 | args.append("--currentuser") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
313 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
314 | args.append("--user") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
315 | args.append(userName) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
316 | if dateData: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
317 | if currentDate: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
318 | args.append("--currentdate") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
319 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
320 | args.append("--date") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
321 | args.append(dateStr) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
322 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
323 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
324 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
325 | dia = HgDialog(self.trUtf8('Update Current Patch'), self.vcs) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
327 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
329 | self.vcs.checkVCSStatus() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
331 | def hgQueueShowPatch(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
332 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
333 | Public method to show the contents of the current patch. |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
335 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
336 | """ |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
337 | from ..HgDiffDialog import HgDiffDialog |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | self.qdiffDialog = HgDiffDialog(self.vcs) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
339 | self.qdiffDialog.show() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | QApplication.processEvents() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | self.qdiffDialog.start(name, qdiff=True) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
343 | def hgQueueShowHeader(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
344 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
345 | Public method to show the commit message of the current patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
346 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
347 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
348 | """ |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
349 | from .HgQueuesHeaderDialog import HgQueuesHeaderDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
350 | self.qheaderDialog = HgQueuesHeaderDialog(self.vcs) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
351 | self.qheaderDialog.show() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
352 | QApplication.processEvents() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
353 | self.qheaderDialog.start(name) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
354 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
355 | def hgQueuePushPopPatches(self, name, operation, all=False, named=False, |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
356 | force=False): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
358 | Public method to push patches onto the stack or pop patches off the |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
359 | stack. |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
361 | @param name file/directory name (string) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
362 | @param operation operation type to be performed (Queues.POP, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
363 | Queues.PUSH, Queues.GOTO) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
364 | @keyparam all flag indicating to push/pop all (boolean) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
365 | @keyparam named flag indicating to push/pop until a named patch |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | is at the top of the stack (boolean) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | @keyparam force flag indicating a forceful pop (boolean) |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
368 | @return flag indicating that the project should be reread (boolean) |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2815
diff
changeset
|
369 | @exception ValueError raised to indicate an invalid operation |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
370 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
371 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
372 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
374 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
375 | if os.path.splitdrive(repodir)[1] == os.sep: |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
376 | return False |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
377 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
378 | args = [] |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
379 | if operation == Queues.POP: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
380 | args.append("qpop") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | title = self.trUtf8("Pop Patches") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
382 | listType = Queues.APPLIED_LIST |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
383 | elif operation == Queues.PUSH: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
384 | args.append("qpush") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
385 | title = self.trUtf8("Push Patches") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
386 | listType = Queues.UNAPPLIED_LIST |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
387 | elif operation == Queues.GOTO: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
388 | args.append("qgoto") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
389 | title = self.trUtf8("Go to Patch") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
390 | listType = Queues.SERIES_LIST |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
391 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
392 | raise ValueError("illegal value for operation") |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
393 | args.append("-v") |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
394 | if force: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
395 | args.append("--force") |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
396 | if all and operation in (Queues.POP, Queues.PUSH): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
397 | args.append("--all") |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
398 | elif named or operation == Queues.GOTO: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
399 | patchnames = self.__getPatchesList(repodir, listType) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
400 | if patchnames: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
401 | patch, ok = QInputDialog.getItem( |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
402 | None, |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
403 | self.trUtf8("Select Patch"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | self.trUtf8("Select the target patch name:"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
405 | patchnames, |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
406 | 0, False) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
407 | if ok and patch: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
408 | args.append(patch) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
409 | else: |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
410 | return False |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
411 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
412 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
413 | None, |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
414 | self.trUtf8("Select Patch"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
415 | self.trUtf8("""No patches to select from.""")) |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
416 | return False |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
417 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
418 | dia = HgDialog(title, self.vcs) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
419 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
420 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
421 | dia.exec_() |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
422 | res = dia.hasAddOrDelete() |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
423 | self.vcs.checkVCSStatus() |
1068
090e5be55051
Change qpush/qpop/qgoto code to be able to detect changes of the project file (in case MQ will report the changed files one day).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1066
diff
changeset
|
424 | return res |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
425 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
426 | def hgQueueListPatches(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
427 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
428 | Public method to show a list of all patches. |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
429 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
430 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
431 | """ |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
432 | from .HgQueuesListDialog import HgQueuesListDialog |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
433 | self.queuesListDialog = HgQueuesListDialog(self.vcs) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
434 | self.queuesListDialog.show() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
435 | self.queuesListDialog.start(name) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
436 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
437 | def hgQueueFinishAppliedPatches(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
438 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
439 | Public method to finish all applied patches. |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
440 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
441 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
442 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
443 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
444 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
446 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
447 | if os.path.splitdrive(repodir)[1] == os.sep: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
448 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
449 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
450 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
451 | args.append("qfinish") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
452 | args.append("--applied") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
453 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
454 | dia = HgDialog(self.trUtf8('Finish Applied Patches'), self.vcs) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
455 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
456 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
458 | self.vcs.checkVCSStatus() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
459 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
460 | def hgQueueRenamePatch(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
461 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
462 | Public method to rename the current or a selected patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
463 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
464 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
465 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
466 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
467 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
468 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
469 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
470 | if os.path.splitdrive(repodir)[1] == os.sep: |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
471 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
472 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
473 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
474 | args.append("qrename") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
475 | patchnames = sorted(self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
476 | if patchnames: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
477 | currentPatch = self.__getCurrentPatch(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
478 | if currentPatch: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
479 | from .HgQueuesRenamePatchDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
480 | HgQueuesRenamePatchDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
481 | dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
482 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
483 | newName, selectedPatch = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
484 | if selectedPatch: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
485 | args.append(selectedPatch) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
486 | args.append(newName) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
487 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
488 | dia = HgDialog(self.trUtf8("Rename Patch"), self.vcs) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
489 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
490 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
491 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
492 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
493 | def hgQueueDeletePatch(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
494 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
495 | Public method to delete a selected unapplied patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
496 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
497 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
498 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
499 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
500 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
501 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
502 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
503 | if os.path.splitdrive(repodir)[1] == os.sep: |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
504 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
505 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
506 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
507 | args.append("qdelete") |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
508 | patchnames = sorted(self.__getPatchesList(repodir, |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
509 | Queues.UNAPPLIED_LIST)) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
510 | if patchnames: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
511 | patch, ok = QInputDialog.getItem( |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
512 | None, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
513 | self.trUtf8("Select Patch"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
514 | self.trUtf8("Select the patch to be deleted:"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
515 | patchnames, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
516 | 0, False) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
517 | if ok and patch: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
518 | args.append(patch) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
519 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
520 | dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
521 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
522 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
523 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
524 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
525 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
526 | None, |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
527 | self.trUtf8("Select Patch"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
528 | self.trUtf8("""No patches to select from.""")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
529 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
530 | def hgQueueFoldUnappliedPatches(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
531 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
532 | Public method to fold patches into the current patch. |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
533 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
534 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
535 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
536 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
537 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
538 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
539 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
540 | if os.path.splitdrive(repodir)[1] == os.sep: |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
541 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
542 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
543 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
544 | args.append("qfold") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
545 | patchnames = sorted( |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
546 | self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST, |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
547 | withSummary=True)) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
548 | if patchnames: |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
549 | from .HgQueuesFoldDialog import HgQueuesFoldDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
550 | dlg = HgQueuesFoldDialog(patchnames) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
551 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
552 | message, patchesList = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
553 | if message: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
554 | args.append("--message") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
555 | args.append(message) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
556 | if patchesList: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
557 | args.extend(patchesList) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
558 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
559 | dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs) |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
560 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
561 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
562 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
563 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
564 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
565 | None, |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
566 | self.trUtf8("Fold Patches"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
567 | self.trUtf8("""No patches selected.""")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
568 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
569 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
570 | None, |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
571 | self.trUtf8("Fold Patches"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
572 | self.trUtf8("""No patches available to be folded.""")) |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
573 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
574 | def hgQueueGuardsList(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
575 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
576 | Public method to list the guards for the current or a named patch. |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
577 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
578 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
579 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
580 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
581 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
582 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
583 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
584 | if os.path.splitdrive(repodir)[1] == os.sep: |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
585 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
586 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
587 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
588 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
589 | if patchnames: |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
590 | from .HgQueuesListGuardsDialog import HgQueuesListGuardsDialog |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
591 | self.queuesListGuardsDialog = \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
592 | HgQueuesListGuardsDialog(self.vcs, patchnames) |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
593 | self.queuesListGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
594 | self.queuesListGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
595 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
596 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
597 | None, |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
598 | self.trUtf8("List Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
599 | self.trUtf8("""No patches available to list guards for.""")) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
600 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
601 | def hgQueueGuardsListAll(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
602 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
603 | Public method to list all guards of all patches. |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
604 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
605 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
606 | """ |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
607 | from .HgQueuesListAllGuardsDialog import HgQueuesListAllGuardsDialog |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
608 | self.queuesListAllGuardsDialog = HgQueuesListAllGuardsDialog(self.vcs) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
609 | self.queuesListAllGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
610 | self.queuesListAllGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
611 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
612 | def hgQueueGuardsDefine(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
613 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
614 | Public method to define guards for the current or a named patch. |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
615 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
616 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
617 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
618 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
619 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
620 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
621 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
622 | if os.path.splitdrive(repodir)[1] == os.sep: |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
623 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
624 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
625 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
626 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
627 | if patchnames: |
2405
d4b5f3bd4720
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
628 | from .HgQueuesDefineGuardsDialog import HgQueuesDefineGuardsDialog |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
629 | self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
630 | self.vcs, self, patchnames) |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
631 | self.queuesDefineGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
632 | self.queuesDefineGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
633 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
634 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
635 | None, |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
636 | self.trUtf8("Define Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
637 | self.trUtf8("""No patches available to define guards for.""")) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
638 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
639 | def hgQueueGuardsDropAll(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
640 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
641 | Public method to drop all guards of the current or a named patch. |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
642 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
643 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
644 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
645 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
646 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
647 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
648 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
649 | if os.path.splitdrive(repodir)[1] == os.sep: |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
650 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
651 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
652 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
653 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
654 | if patchnames: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
655 | patch, ok = QInputDialog.getItem( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
656 | None, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
657 | self.trUtf8("Drop All Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
658 | self.trUtf8("Select the patch to drop guards for" |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
659 | " (leave empty for the current patch):"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
660 | [""] + patchnames, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
661 | 0, False) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
662 | if ok: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
663 | args = [] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
664 | args.append("qguard") |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
665 | if patch: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
666 | args.append(patch) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
667 | args.append("--none") |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
668 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
669 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
670 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
671 | client.runcommand(args) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
672 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
673 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
674 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
675 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
676 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
677 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
678 | process.waitForFinished(30000) |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
679 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
680 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
681 | None, |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
682 | self.trUtf8("Drop All Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
683 | self.trUtf8("""No patches available to define guards for.""")) |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
684 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
685 | def hgQueueGuardsSetActive(self, name): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
686 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
687 | Public method to set the active guards. |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
688 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
689 | @param name file/directory name (string) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
690 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
691 | # find the root of the repo |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
692 | repodir = self.vcs.splitPath(name)[0] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
693 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
694 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
695 | if os.path.splitdrive(repodir)[1] == os.sep: |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
696 | return |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
697 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
698 | guardsList = self.getGuardsList(repodir) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
699 | if guardsList: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
700 | activeGuardsList = self.getGuardsList(repodir, all=False) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
701 | from .HgQueuesGuardsSelectionDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
702 | HgQueuesGuardsSelectionDialog |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
703 | dlg = HgQueuesGuardsSelectionDialog( |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
704 | guardsList, activeGuards=activeGuardsList, listOnly=False) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
705 | if dlg.exec_() == QDialog.Accepted: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
706 | guards = dlg.getData() |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
707 | if guards: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
708 | args = [] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
709 | args.append("qselect") |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
710 | args.extend(guards) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
711 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
712 | dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs) |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
713 | res = dia.startProcess(args, repodir) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
714 | if res: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
715 | dia.exec_() |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
716 | else: |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
717 | E5MessageBox.information( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
718 | None, |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
719 | self.trUtf8("Set Active Guards"), |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
720 | self.trUtf8("""No guards available to select from.""")) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
721 | return |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
722 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
723 | def hgQueueGuardsDeactivate(self, name): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
724 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
725 | Public method to deactivate all active guards. |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
726 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
727 | @param name file/directory name (string) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
728 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
729 | # find the root of the repo |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
730 | repodir = self.vcs.splitPath(name)[0] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
731 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
732 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
733 | if os.path.splitdrive(repodir)[1] == os.sep: |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
734 | return |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
735 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
736 | args = [] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
737 | args.append("qselect") |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
738 | args.append("--none") |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
739 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
740 | dia = HgDialog(self.trUtf8('Deactivate Guards'), self.vcs) |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
741 | res = dia.startProcess(args, repodir) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
742 | if res: |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
743 | dia.exec_() |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
744 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
745 | def hgQueueGuardsIdentifyActive(self, name): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
746 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
747 | Public method to list all active guards. |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
748 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
749 | @param name file/directory name (string) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
750 | """ |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
751 | # find the root of the repo |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
752 | repodir = self.vcs.splitPath(name)[0] |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
753 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
754 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
755 | if os.path.splitdrive(repodir)[1] == os.sep: |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
756 | return |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
757 | |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
758 | guardsList = self.getGuardsList(repodir, all=False) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
759 | if guardsList: |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
760 | from .HgQueuesGuardsSelectionDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
761 | HgQueuesGuardsSelectionDialog |
1047
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
762 | dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True) |
b41a36b201e4
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1046
diff
changeset
|
763 | dlg.exec_() |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
764 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
765 | def hgQueueCreateRenameQueue(self, name, isCreate): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
766 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
767 | Public method to create a new queue or rename the active queue. |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
768 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
769 | @param name file/directory name (string) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
770 | @param isCreate flag indicating to create a new queue (boolean) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
771 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
772 | # find the root of the repo |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
773 | repodir = self.vcs.splitPath(name)[0] |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
774 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
775 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
776 | if os.path.splitdrive(repodir)[1] == os.sep: |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
777 | return |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
778 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
779 | if isCreate: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
780 | title = self.trUtf8("Create New Queue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
781 | else: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
782 | title = self.trUtf8("Rename Active Queue") |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
783 | from .HgQueuesQueueManagementDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
784 | HgQueuesQueueManagementDialog |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
785 | dlg = HgQueuesQueueManagementDialog( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
786 | HgQueuesQueueManagementDialog.NAME_INPUT, |
1255
e1d8a8a4d40c
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1254
diff
changeset
|
787 | title, False, repodir, self.vcs) |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
788 | if dlg.exec_() == QDialog.Accepted: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
789 | queueName = dlg.getData() |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
790 | if queueName: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
791 | args = [] |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
792 | args.append("qqueue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
793 | if isCreate: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
794 | args.append("--create") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
795 | else: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
796 | args.append("--rename") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
797 | args.append(queueName) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
798 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
799 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
800 | error = "" |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
801 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
802 | error = client.runcommand(args)[1] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
803 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
804 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
805 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
806 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
807 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
808 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
809 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
810 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
811 | if finished: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
812 | if process.exitCode() != 0: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
813 | error = \ |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
814 | str(process.readAllStandardError(), |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
815 | ioEncoding, 'replace') |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
816 | |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
817 | if error: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
818 | if isCreate: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
819 | errMsg = self.trUtf8( |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
820 | "Error while creating a new queue.") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
821 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
822 | errMsg = self.trUtf8( |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
823 | "Error while renaming the active queue.") |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
824 | E5MessageBox.warning( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
825 | None, |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
826 | title, |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
827 | """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
828 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
829 | if self.queuesListQueuesDialog is not None and \ |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
830 | self.queuesListQueuesDialog.isVisible(): |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
831 | self.queuesListQueuesDialog.refresh() |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
832 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
833 | def hgQueueDeletePurgeActivateQueue(self, name, operation): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
834 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
835 | Public method to delete the reference to a queue and optionally |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
836 | remove the patch directory or set the active queue. |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
837 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
838 | @param name file/directory name (string) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
839 | @param operation operation to be performed (Queues.QUEUE_DELETE, |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
840 | Queues.QUEUE_PURGE, Queues.QUEUE_ACTIVATE) |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2815
diff
changeset
|
841 | @exception ValueError raised to indicate an invalid operation |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
842 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
843 | # find the root of the repo |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
844 | repodir = self.vcs.splitPath(name)[0] |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
845 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
846 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
847 | if os.path.splitdrive(repodir)[1] == os.sep: |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
848 | return |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
849 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
850 | if operation == Queues.QUEUE_PURGE: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
851 | title = self.trUtf8("Purge Queue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
852 | elif operation == Queues.QUEUE_DELETE: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
853 | title = self.trUtf8("Delete Queue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
854 | elif operation == Queues.QUEUE_ACTIVATE: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
855 | title = self.trUtf8("Activate Queue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
856 | else: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
857 | raise ValueError("illegal value for operation") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
858 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
859 | from .HgQueuesQueueManagementDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
860 | HgQueuesQueueManagementDialog |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
861 | dlg = HgQueuesQueueManagementDialog( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
862 | HgQueuesQueueManagementDialog.QUEUE_INPUT, |
1255
e1d8a8a4d40c
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1254
diff
changeset
|
863 | title, True, repodir, self.vcs) |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
864 | if dlg.exec_() == QDialog.Accepted: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
865 | queueName = dlg.getData() |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
866 | if queueName: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
867 | args = [] |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
868 | args.append("qqueue") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
869 | if operation == Queues.QUEUE_PURGE: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
870 | args.append("--purge") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
871 | elif operation == Queues.QUEUE_DELETE: |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
872 | args.append("--delete") |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
873 | args.append(queueName) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
874 | |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
875 | client = self.vcs.getClient() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
876 | error = "" |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
877 | if client: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
878 | error = client.runcommand(args)[1] |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
879 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
880 | ioEncoding = Preferences.getSystem("IOEncoding") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
881 | process = QProcess() |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
882 | process.setWorkingDirectory(repodir) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
883 | process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2405
diff
changeset
|
884 | procStarted = process.waitForStarted(5000) |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
885 | if procStarted: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
886 | finished = process.waitForFinished(30000) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
887 | if finished: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
888 | if process.exitCode() != 0: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
889 | error = \ |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
890 | str(process.readAllStandardError(), |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
891 | ioEncoding, 'replace') |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
892 | |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
893 | if error: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
894 | if operation == Queues.QUEUE_PURGE: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
895 | errMsg = self.trUtf8("Error while purging the queue.") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
896 | elif operation == Queues.QUEUE_DELETE: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
897 | errMsg = self.trUtf8("Error while deleting the queue.") |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
898 | elif operation == Queues.QUEUE_ACTIVATE: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
899 | errMsg = self.trUtf8( |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
900 | "Error while setting the active queue.") |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
901 | E5MessageBox.warning( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
902 | None, |
1254
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
903 | title, |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
904 | """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
905 | else: |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
906 | if self.queuesListQueuesDialog is not None and \ |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
907 | self.queuesListQueuesDialog.isVisible(): |
c077fa008aae
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1087
diff
changeset
|
908 | self.queuesListQueuesDialog.refresh() |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
909 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
910 | def hgQueueListQueues(self, name): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
911 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
912 | Public method to list available queues. |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
913 | |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
914 | @param name file/directory name (string) |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
915 | """ |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
916 | # find the root of the repo |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
917 | repodir = self.vcs.splitPath(name)[0] |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
918 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
919 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1255
diff
changeset
|
920 | if os.path.splitdrive(repodir)[1] == os.sep: |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
921 | return |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
922 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
923 | from .HgQueuesQueueManagementDialog import \ |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
924 | HgQueuesQueueManagementDialog |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
925 | self.queuesListQueuesDialog = HgQueuesQueueManagementDialog( |
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
926 | HgQueuesQueueManagementDialog.NO_INPUT, |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1053
diff
changeset
|
927 | self.trUtf8("Available Queues"), |
1255
e1d8a8a4d40c
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1254
diff
changeset
|
928 | False, repodir, self.vcs) |
1053
c54aa980ea8e
Added an interface to the Mercurial patch queue management.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1047
diff
changeset
|
929 | self.queuesListQueuesDialog.show() |
2815
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
930 | |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
931 | def hgQueueInit(self, name): |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
932 | """ |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
933 | Public method to initialize a new queue repository. |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
934 | |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
935 | @param name directory name (string) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
936 | """ |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
937 | # find the root of the repo |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
938 | repodir = self.vcs.splitPath(name)[0] |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
939 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
940 | repodir = os.path.dirname(repodir) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
941 | if os.path.splitdrive(repodir)[1] == os.sep: |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
942 | return |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
943 | |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
944 | args = [] |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
945 | args.append('init') |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
946 | args.append('--mq') |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
947 | args.append(repodir) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
948 | # init is not possible with the command server |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
949 | dia = HgDialog( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
950 | self.trUtf8('Initializing new queue repository'), self.vcs) |
2815
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
951 | res = dia.startProcess(args) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
952 | if res: |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
953 | dia.exec_() |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
954 | |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
955 | def hgQueueStatus(self, name): |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
956 | """ |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
957 | Public method used to view the status of a queue repository. |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
958 | |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
959 | @param name directory name (string) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
960 | """ |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
961 | from ..HgStatusDialog import HgStatusDialog |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
962 | self.queueStatusDialog = HgStatusDialog(self.vcs, mq=True) |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
963 | self.queueStatusDialog.show() |
53c1d1f9ec86
Started to implement support for Mercurial queue repositories.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
964 | self.queueStatusDialog.start(name) |