Sat, 21 May 2011 16:17:31 +0200
Continued with support for Mercurial queues extension.
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 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> |
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 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | import os |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | from PyQt4.QtCore import QObject, QProcess |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | from PyQt4.QtGui import QDialog, QApplication, QInputDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | from E5Gui import E5MessageBox |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | from ..HgDialog import HgDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | from ..HgDiffDialog import HgDiffDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | from .HgQueuesListDialog import HgQueuesListDialog |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
21 | from .HgQueuesRenamePatchDialog import HgQueuesRenamePatchDialog |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
22 | from .HgQueuesFoldDialog import HgQueuesFoldDialog |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
23 | from .HgQueuesHeaderDialog import HgQueuesHeaderDialog |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
24 | from .HgQueuesListGuardsDialog import HgQueuesListGuardsDialog |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
25 | from .HgQueuesListAllGuardsDialog import HgQueuesListAllGuardsDialog |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
26 | from .HgQueuesDefineGuardsDialog import HgQueuesDefineGuardsDialog |
1034
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 | import Preferences |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
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 Queues(QObject): |
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 | Class implementing the queues extension interface. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | APPLIED_LIST = 0 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | UNAPPLIED_LIST = 1 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | SERIES_LIST = 2 |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
39 | POP = 0 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
40 | PUSH = 1 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
41 | GOTO = 2 |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
42 | |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | def __init__(self, vcs): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | Constructor |
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 | QObject.__init__(self, vcs) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | self.vcs = vcs |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | self.qdiffDialog = None |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
52 | self.qheaderDialog = None |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
53 | self.queuesListDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
54 | self.queuesListGuardsDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
55 | self.queuesListAllGuardsDialog = None |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
56 | self.queuesDefineGuardsDialog = None |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | def shutdown(self): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | 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
|
61 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | if self.qdiffDialog is not None: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.qdiffDialog.close() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
64 | if self.qheaderDialog is not None: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
65 | self.qheaderDialog.close() |
1046
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
66 | if self.queuesListDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
67 | self.queuesListDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
68 | if self.queuesListGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
69 | self.queuesListGuardsDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
70 | if self.queuesListAllGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
71 | self.queuesListAllGuardsDialog.close() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
72 | if self.queuesDefineGuardsDialog is not None: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
73 | self.queuesDefineGuardsDialog.close() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
74 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
75 | 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
|
76 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
77 | 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
|
78 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
79 | @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
|
80 | @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
|
81 | (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
|
82 | @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
|
83 | @return list of patches (list of string) |
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 | patchesList = [] |
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 | ioEncoding = Preferences.getSystem("IOEncoding") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
88 | process = QProcess() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
89 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
90 | if listType == Queues.APPLIED_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
91 | args.append("qapplied") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
92 | elif listType == Queues.UNAPPLIED_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
93 | args.append("qunapplied") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
94 | elif listType == Queues.SERIES_LIST: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
95 | args.append("qseries") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
96 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
97 | raise ValueError("illegal value for listType") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
98 | if withSummary: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
99 | args.append("--summary") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
100 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
101 | process.setWorkingDirectory(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
102 | process.start('hg', args) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
103 | procStarted = process.waitForStarted() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
104 | if procStarted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
105 | finished = process.waitForFinished(30000) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
106 | if finished and process.exitCode() == 0: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
107 | output = \ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
108 | str(process.readAllStandardOutput(), ioEncoding, 'replace') |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
109 | for line in output.splitlines(): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
110 | if withSummary: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
111 | l = line.strip().split(": ") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
112 | if len(l) == 1: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
113 | patch, summary = l[0][:-1], "" |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
114 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
115 | patch, summary = l[0], l[1] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
116 | patchesList.append("{0}@@{1}".format(patch, summary)) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
117 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
118 | patchesList.append(line.strip()) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
119 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
120 | return patchesList |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
121 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
122 | def __getCurrentPatch(self, repodir): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
123 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
124 | 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
|
125 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
126 | @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
|
127 | @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
|
128 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
129 | currentPatch = "" |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
130 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
131 | ioEncoding = Preferences.getSystem("IOEncoding") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
132 | process = QProcess() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
133 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
134 | args.append("qtop") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
135 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
136 | process.setWorkingDirectory(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
137 | process.start('hg', args) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
138 | procStarted = process.waitForStarted() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
139 | if procStarted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
140 | finished = process.waitForFinished(30000) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
141 | if finished and process.exitCode() == 0: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
142 | currentPatch = str( |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
143 | process.readAllStandardOutput(), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
144 | ioEncoding, 'replace').strip() |
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 | return currentPatch |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
147 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
148 | def __getCommitMessage(self, repodir): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
149 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
150 | 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
|
151 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
152 | @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
|
153 | @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
|
154 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
155 | message = "" |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
156 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
157 | ioEncoding = Preferences.getSystem("IOEncoding") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
158 | process = QProcess() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
159 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
160 | args.append("qheader") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
161 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
162 | process.setWorkingDirectory(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
163 | process.start('hg', args) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
164 | procStarted = process.waitForStarted() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
165 | if procStarted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
166 | finished = process.waitForFinished(30000) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
167 | if finished and process.exitCode() == 0: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
168 | message = str( |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
169 | process.readAllStandardOutput(), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
170 | ioEncoding, 'replace') |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
171 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
172 | return message |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | def hgQueueNewPatch(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | 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
|
177 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | 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
|
183 | repodir = os.path.dirname(repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | if repodir == os.sep: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
187 | dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | if dlg.exec_() == QDialog.Accepted: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | name, message, (userData, currentUser, userName), \ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | (dateData, currentDate, dateStr) = dlg.getData() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | args.append("qnew") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | if message != "": |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | args.append("--message") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | args.append(message) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | if userData: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | if currentUser: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | args.append("--currentuser") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | args.append("--user") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | args.append(userName) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | if dateData: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | if currentDate: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | args.append("--currentdate") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | args.append("--date") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | args.append(dateStr) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | args.append(name) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | dia = HgDialog(self.trUtf8('New Patch')) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | self.vcs.checkVCSStatus() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
217 | def hgQueueRefreshPatch(self, name, editMessage=False): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
219 | 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
|
220 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | @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
|
222 | @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
|
223 | commit message (boolean) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | 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
|
228 | repodir = os.path.dirname(repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | if repodir == os.sep: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
232 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | args.append("qrefresh") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
235 | if editMessage: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
236 | currentMessage = self.__getCommitMessage(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
237 | dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
238 | currentMessage) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
239 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
240 | name, message, (userData, currentUser, userName), \ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
241 | (dateData, currentDate, dateStr) = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
242 | if message != "" and message != currentMessage: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
243 | args.append("--message") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
244 | args.append(message) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
245 | if userData: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
246 | if currentUser: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
247 | args.append("--currentuser") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
248 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
249 | args.append("--user") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
250 | args.append(userName) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
251 | if dateData: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
252 | if currentDate: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
253 | args.append("--currentdate") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
254 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
255 | args.append("--date") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
256 | args.append(dateStr) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
257 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
258 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
259 | |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | dia = HgDialog(self.trUtf8('Update Current Patch')) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | self.vcs.checkVCSStatus() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | def hgQueueShowPatch(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
268 | 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
|
269 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | self.qdiffDialog = HgDiffDialog(self.vcs) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | self.qdiffDialog.show() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | QApplication.processEvents() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | self.qdiffDialog.start(name, qdiff=True) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
277 | def hgQueueShowHeader(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
278 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
279 | 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
|
280 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
281 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
282 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
283 | self.qheaderDialog = HgQueuesHeaderDialog(self.vcs) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
284 | self.qheaderDialog.show() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
285 | QApplication.processEvents() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
286 | self.qheaderDialog.start(name) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
287 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
288 | def hgQueuePushPopPatches(self, name, operation, all=False, named=False, force=False): |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | Public method to push patches onto the stack or pop patches off the stack. |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | @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
|
293 | @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
|
294 | Queues.PUSH, Queues.GOTO) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | @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
|
296 | @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
|
297 | 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
|
298 | @keyparam force flag indicating a forceful pop (boolean) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | 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
|
303 | repodir = os.path.dirname(repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | if repodir == os.sep: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | args = [] |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
308 | if operation == Queues.POP: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | args.append("qpop") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
310 | title = self.trUtf8("Pop Patches") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
311 | listType = Queues.APPLIED_LIST |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
312 | elif operation == Queues.PUSH: |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
313 | args.append("qpush") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
314 | title = self.trUtf8("Push Patches") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
315 | listType = Queues.UNAPPLIED_LIST |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
316 | elif operation == Queues.GOTO: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
317 | args.append("qgoto") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
318 | title = self.trUtf8("Go to Patch") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
319 | listType = Queues.SERIES_LIST |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
320 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
321 | raise ValueError("illegal value for operation") |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | if force: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | args.append("--force") |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
324 | 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
|
325 | args.append("--all") |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
326 | elif named or operation == Queues.GOTO: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
327 | patchnames = self.__getPatchesList(repodir, listType) |
1034
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | if patchnames: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
329 | patch, ok = QInputDialog.getItem( |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | None, |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
331 | self.trUtf8("Select Patch"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
332 | self.trUtf8("Select the target patch name:"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | patchnames, |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | 0, False) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
335 | if ok and patch: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
336 | args.append(patch) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
337 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
339 | else: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | E5MessageBox.information(None, |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | self.trUtf8("Select Patch"), |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | self.trUtf8("""No patches to select from.""")) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
343 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
344 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | dia = HgDialog(title) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
348 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | self.vcs.checkVCSStatus() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | def hgQueueListPatches(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
352 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
353 | 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
|
354 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
355 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
356 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | self.queuesListDialog = HgQueuesListDialog(self.vcs) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
358 | self.queuesListDialog.show() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | self.queuesListDialog.start(name) |
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 | def hgQueueFinishAppliedPatches(self, name): |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
362 | """ |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
363 | 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
|
364 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
365 | @param name file/directory name (string) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | """ |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | # find the root of the repo |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | repodir = self.vcs.splitPath(name)[0] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
369 | 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
|
370 | repodir = os.path.dirname(repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
371 | if repodir == os.sep: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
372 | return |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
374 | args = [] |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
375 | args.append("qfinish") |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
376 | args.append("--applied") |
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 | dia = HgDialog(self.trUtf8('Finish Applied Patches')) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
379 | res = dia.startProcess(args, repodir) |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
380 | if res: |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | dia.exec_() |
8a7fa049e9d3
Started with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
382 | self.vcs.checkVCSStatus() |
1035
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
383 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
384 | def hgQueueRenamePatch(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
385 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
386 | 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
|
387 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
388 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
389 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
390 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
391 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
392 | 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
|
393 | repodir = os.path.dirname(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
394 | if repodir == os.sep: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
395 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
396 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
397 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
398 | args.append("qrename") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
399 | 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
|
400 | if patchnames: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
401 | currentPatch = self.__getCurrentPatch(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
402 | if currentPatch: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
403 | dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
404 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
405 | newName, selectedPatch = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
406 | if selectedPatch: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
407 | args.append(selectedPatch) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
408 | args.append(newName) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
409 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
410 | dia = HgDialog(self.trUtf8("Rename Patch")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
411 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
412 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
413 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
414 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
415 | def hgQueueDeletePatch(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
416 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
417 | 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
|
418 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
419 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
420 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
421 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
422 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
423 | 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
|
424 | repodir = os.path.dirname(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
425 | if repodir == os.sep: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
426 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
427 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
428 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
429 | args.append("qdelete") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
430 | patchnames = sorted(self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST)) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
431 | if patchnames: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
432 | patch, ok = QInputDialog.getItem( |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
433 | None, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
434 | self.trUtf8("Select Patch"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
435 | 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
|
436 | patchnames, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
437 | 0, False) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
438 | if ok and patch: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
439 | args.append(patch) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
440 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
441 | dia = HgDialog(self.trUtf8("Delete Patch")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
442 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
443 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
444 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
445 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
446 | E5MessageBox.information(None, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
447 | self.trUtf8("Select Patch"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
448 | 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
|
449 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
450 | def hgQueueFoldUnappliedPatches(self, name): |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
451 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
452 | 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
|
453 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
454 | @param name file/directory name (string) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
455 | """ |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
456 | # find the root of the repo |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
457 | repodir = self.vcs.splitPath(name)[0] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
458 | 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
|
459 | repodir = os.path.dirname(repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
460 | if repodir == os.sep: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
461 | return |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
462 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
463 | args = [] |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
464 | args.append("qfold") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
465 | patchnames = sorted( |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
466 | self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST, withSummary=True)) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
467 | if patchnames: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
468 | dlg = HgQueuesFoldDialog(patchnames) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
469 | if dlg.exec_() == QDialog.Accepted: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
470 | message, patchesList = dlg.getData() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
471 | if message: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
472 | args.append("--message") |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
473 | args.append(message) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
474 | if patchesList: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
475 | args.extend(patchesList) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
476 | |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
477 | dia = HgDialog(self.trUtf8("Fold Patches")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
478 | res = dia.startProcess(args, repodir) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
479 | if res: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
480 | dia.exec_() |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
481 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
482 | E5MessageBox.information(None, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
483 | self.trUtf8("Fold Patches"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
484 | self.trUtf8("""No patches selected.""")) |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
485 | else: |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
486 | E5MessageBox.information(None, |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
487 | self.trUtf8("Fold Patches"), |
2cd7817ac659
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1034
diff
changeset
|
488 | 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
|
489 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
490 | def hgQueueGuardsList(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
491 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
492 | 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
|
493 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
494 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
495 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
496 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
497 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
498 | 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
|
499 | repodir = os.path.dirname(repodir) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
500 | if repodir == os.sep: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
501 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
502 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
503 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
504 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
505 | if patchnames: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
506 | self.queuesListGuardsDialog = HgQueuesListGuardsDialog(self.vcs, patchnames) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
507 | self.queuesListGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
508 | self.queuesListGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
509 | else: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
510 | E5MessageBox.information(None, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
511 | self.trUtf8("List Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
512 | 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
|
513 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
514 | def hgQueueGuardsListAll(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
515 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
516 | 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
|
517 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
518 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
519 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
520 | self.queuesListAllGuardsDialog = HgQueuesListAllGuardsDialog(self.vcs) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
521 | self.queuesListAllGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
522 | self.queuesListAllGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
523 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
524 | def hgQueueGuardsDefine(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
525 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
526 | 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
|
527 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
528 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
529 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
530 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
531 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
532 | 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
|
533 | repodir = os.path.dirname(repodir) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
534 | if repodir == os.sep: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
535 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
536 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
537 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
538 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
539 | if patchnames: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
540 | self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
541 | self.vcs, patchnames) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
542 | self.queuesDefineGuardsDialog.show() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
543 | self.queuesDefineGuardsDialog.start(name) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
544 | else: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
545 | E5MessageBox.information(None, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
546 | self.trUtf8("Define Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
547 | 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
|
548 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
549 | def hgQueueGuardsDropAll(self, name): |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
550 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
551 | 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
|
552 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
553 | @param name file/directory name (string) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
554 | """ |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
555 | # find the root of the repo |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
556 | repodir = self.vcs.splitPath(name)[0] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
557 | 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
|
558 | repodir = os.path.dirname(repodir) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
559 | if repodir == os.sep: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
560 | return |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
561 | |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
562 | patchnames = sorted( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
563 | self.__getPatchesList(repodir, Queues.SERIES_LIST)) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
564 | if patchnames: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
565 | patch, ok = QInputDialog.getItem( |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
566 | None, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
567 | self.trUtf8("Drop All Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
568 | 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
|
569 | " (leave empty for the current patch):"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
570 | [""] + patchnames, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
571 | 0, False) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
572 | if ok: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
573 | process = QProcess() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
574 | args = [] |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
575 | args.append("qguard") |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
576 | if patch: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
577 | args.append(patch) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
578 | args.append("--none") |
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 | process.setWorkingDirectory(repodir) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
581 | process.start('hg', args) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
582 | procStarted = process.waitForStarted() |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
583 | if procStarted: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
584 | process.waitForFinished(30000) |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
585 | else: |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
586 | E5MessageBox.information(None, |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
587 | self.trUtf8("Drop All Guards"), |
5dd14be5d6a1
Continued with support for Mercurial queues extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1035
diff
changeset
|
588 | self.trUtf8("""No patches available to define guards for.""")) |