Tue, 10 Sep 2019 19:30:07 +0200
Removed obsolete "from __future__ import ..." statements.
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
6645
ad476851d7e0
Updated copyright for 2019.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
3 | # Copyright (c) 2014 - 2019 Detlev Offenbach <detlev@die-offenbachs.de> |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the shelve extension interface. |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
3484
645c12de6b0c
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3302
diff
changeset
|
10 | |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
11 | import os |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
12 | |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
13 | from PyQt5.QtCore import QProcess |
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
14 | from PyQt5.QtWidgets import QDialog |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
15 | |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
16 | from E5Gui import E5MessageBox |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
17 | |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | from ..HgExtension import HgExtension |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
19 | from ..HgDialog import HgDialog |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | class Shelve(HgExtension): |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | Class implementing the shelve extension interface. |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | def __init__(self, vcs): |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | Constructor |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | @param vcs reference to the Mercurial vcs object |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | """ |
3484
645c12de6b0c
Merge with default branch.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3302
diff
changeset
|
32 | super(Shelve, self).__init__(vcs) |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
33 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
34 | self.__unshelveKeep = False |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
35 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
36 | self.__shelveBrowserDialog = None |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | def shutdown(self): |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | Public method used to shutdown the shelve interface. |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | """ |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
42 | if self.__shelveBrowserDialog is not None: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
43 | self.__shelveBrowserDialog.close() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
44 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
45 | def __hgGetShelveNamesList(self, repodir): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
46 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
47 | Private method to get the list of shelved changes. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
48 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
49 | @param repodir directory name of the repository (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
50 | @return list of shelved changes (list of string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
51 | """ |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
52 | args = self.vcs.initCommand("shelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
53 | args.append('--list') |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
54 | args.append('--quiet') |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
55 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
56 | client = self.vcs.getClient() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
57 | output = "" |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
58 | if client: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
59 | output = client.runcommand(args)[0] |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
60 | else: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
61 | process = QProcess() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
62 | process.setWorkingDirectory(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
63 | process.start('hg', args) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
64 | procStarted = process.waitForStarted(5000) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
65 | if procStarted: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
66 | finished = process.waitForFinished(30000) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
67 | if finished and process.exitCode() == 0: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
68 | output = str(process.readAllStandardOutput(), |
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
69 | self.vcs.getEncoding(), 'replace') |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
70 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
71 | shelveNamesList = [] |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
72 | for line in output.splitlines(): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
73 | shelveNamesList.append(line.strip()) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
74 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
75 | return shelveNamesList[:] |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
76 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
77 | def hgShelve(self, name): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
78 | """ |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
79 | Public method to shelve current changes of files or directories. |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
80 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
81 | @param name directory or file name (string) or list of directory |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
82 | or file names (list of string) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
83 | @return flag indicating that the project should be reread (boolean) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
84 | """ |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
85 | if isinstance(name, list): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
86 | dname = self.vcs.splitPathList(name)[0] |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
87 | else: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
88 | dname = self.vcs.splitPath(name)[0] |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
89 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
90 | # find the root of the repo |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
91 | repodir = dname |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
92 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
93 | repodir = os.path.dirname(repodir) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
94 | if os.path.splitdrive(repodir)[1] == os.sep: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
95 | return False |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
96 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
97 | res = False |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
98 | from .HgShelveDataDialog import HgShelveDataDialog |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
99 | dlg = HgShelveDataDialog(self.vcs.version) |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
100 | if dlg.exec_() == QDialog.Accepted: |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
101 | shelveName, dateTime, message, addRemove, keep = dlg.getData() |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
102 | |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
103 | args = self.vcs.initCommand("shelve") |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
104 | if shelveName: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
105 | args.append("--name") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
106 | args.append(shelveName) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
107 | if message: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
108 | args.append("--message") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
109 | args.append(message) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
110 | if addRemove: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
111 | args.append("--addRemove") |
3292
2feabde31912
Made the last change a bit more robust.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3291
diff
changeset
|
112 | if dateTime.isValid(): |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
113 | args.append("--date") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
114 | args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) |
7010
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
115 | if self.vcs.version >= (5, 0, 0) and keep: |
5d6f5a69a952
Mercurial Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
116 | args.append("--keep") |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
117 | args.append("-v") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
118 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
119 | if isinstance(name, list): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
120 | self.vcs.addArguments(args, name) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
121 | else: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
122 | args.append(name) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
123 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
124 | dia = HgDialog(self.tr('Shelve current changes'), self.vcs) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
125 | res = dia.startProcess(args, repodir) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
126 | if res: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
127 | dia.exec_() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
128 | res = dia.hasAddOrDelete() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
129 | self.vcs.checkVCSStatus() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
130 | return res |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
131 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
132 | def hgShelveBrowser(self, projectDir): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
133 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
134 | Public method to show the shelve browser dialog. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
135 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
136 | @param projectDir name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
137 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
138 | if self.__shelveBrowserDialog is None: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
139 | from .HgShelveBrowserDialog import HgShelveBrowserDialog |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
140 | self.__shelveBrowserDialog = HgShelveBrowserDialog( |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
141 | self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
142 | self.__shelveBrowserDialog.show() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
143 | self.__shelveBrowserDialog.start(projectDir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
144 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
145 | def hgUnshelve(self, name, shelveName=""): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
146 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
147 | Public method to restore shelved changes to the project directory. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
148 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
149 | @param name name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
150 | @keyparam shelveName name of the shelve to restore (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
151 | @return flag indicating that the project should be reread (boolean) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
152 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
153 | # find the root of the repo |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
154 | repodir = name |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
155 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
156 | repodir = os.path.dirname(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
157 | if os.path.splitdrive(repodir)[1] == os.sep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
158 | return False |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
159 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
160 | res = False |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
161 | from .HgUnshelveDataDialog import HgUnshelveDataDialog |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
162 | dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(repodir), |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
163 | shelveName=shelveName) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
164 | if dlg.exec_() == QDialog.Accepted: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
165 | shelveName, keep = dlg.getData() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
166 | self.__unshelveKeep = keep # store for potential continue |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
167 | |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
168 | args = self.vcs.initCommand("unshelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
169 | if keep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
170 | args.append("--keep") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
171 | if shelveName: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
172 | args.append(shelveName) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
173 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
174 | dia = HgDialog(self.tr('Restore shelved changes'), self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
175 | res = dia.startProcess(args, repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
176 | if res: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
177 | dia.exec_() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
178 | res = dia.hasAddOrDelete() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
179 | self.vcs.checkVCSStatus() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
180 | return res |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
181 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
182 | def hgUnshelveAbort(self, name): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
183 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
184 | Public method to abort the ongoing restore operation. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
185 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
186 | @param name name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
187 | @return flag indicating that the project should be reread (boolean) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
188 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
189 | # find the root of the repo |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
190 | repodir = name |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
191 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
192 | repodir = os.path.dirname(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
193 | if os.path.splitdrive(repodir)[1] == os.sep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
194 | return False |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
195 | |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
196 | args = self.vcs.initCommand("unshelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
197 | args.append("--abort") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
198 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
199 | dia = HgDialog(self.tr('Abort restore operation'), self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
200 | res = dia.startProcess(args, repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
201 | if res: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
202 | dia.exec_() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
203 | res = dia.hasAddOrDelete() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
204 | self.vcs.checkVCSStatus() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
205 | return res |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
206 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
207 | def hgUnshelveContinue(self, name): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
208 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
209 | Public method to continue the ongoing restore operation. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
210 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
211 | @param name name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
212 | @return flag indicating that the project should be reread (boolean) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
213 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
214 | # find the root of the repo |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
215 | repodir = name |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
216 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
217 | repodir = os.path.dirname(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
218 | if os.path.splitdrive(repodir)[1] == os.sep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
219 | return False |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
220 | |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
221 | args = self.vcs.initCommand("unshelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
222 | if self.__unshelveKeep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
223 | args.append("--keep") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
224 | args.append("--continue") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
225 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
226 | dia = HgDialog(self.tr('Continue restore operation'), self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
227 | res = dia.startProcess(args, repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
228 | if res: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
229 | dia.exec_() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
230 | res = dia.hasAddOrDelete() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
231 | self.vcs.checkVCSStatus() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
232 | return res |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
233 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
234 | def hgDeleteShelves(self, name, shelveNames=None): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
235 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
236 | Public method to delete named shelves. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
237 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
238 | @param name name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
239 | @param shelveNames name of shelves to delete (list of string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
240 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
241 | # find the root of the repo |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
242 | repodir = name |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
243 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
244 | repodir = os.path.dirname(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
245 | if os.path.splitdrive(repodir)[1] == os.sep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
246 | return |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
247 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
248 | if not shelveNames: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
249 | from .HgShelvesSelectionDialog import HgShelvesSelectionDialog |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
250 | dlg = HgShelvesSelectionDialog( |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
251 | self.tr("Select the shelves to be deleted:"), |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
252 | self.__hgGetShelveNamesList(repodir)) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
253 | if dlg.exec_() == QDialog.Accepted: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
254 | shelveNames = dlg.getSelectedShelves() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
255 | else: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
256 | return |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
257 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
258 | from UI.DeleteFilesConfirmationDialog import \ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
259 | DeleteFilesConfirmationDialog |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
260 | dlg = DeleteFilesConfirmationDialog( |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
261 | None, |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
262 | self.tr("Delete shelves"), |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
263 | self.tr("Do you really want to delete these shelves?"), |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
264 | shelveNames) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
265 | if dlg.exec_() == QDialog.Accepted: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
266 | args = self.vcs.initCommand("shelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
267 | args.append("--delete") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
268 | args.extend(shelveNames) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
269 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
270 | dia = HgDialog(self.tr('Delete shelves'), self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
271 | res = dia.startProcess(args, repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
272 | if res: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
273 | dia.exec_() |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
274 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
275 | def hgCleanupShelves(self, name): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
276 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
277 | Public method to delete all shelves. |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
278 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
279 | @param name name of the project directory (string) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
280 | """ |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
281 | # find the root of the repo |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
282 | repodir = name |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
283 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
284 | repodir = os.path.dirname(repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
285 | if os.path.splitdrive(repodir)[1] == os.sep: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
286 | return |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
287 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
288 | res = E5MessageBox.yesNo( |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
289 | None, |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
290 | self.tr("Delete all shelves"), |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
291 | self.tr("""Do you really want to delete all shelved changes?""")) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
292 | if res: |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3297
diff
changeset
|
293 | args = self.vcs.initCommand("shelve") |
3297
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
294 | args.append("--cleanup") |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
295 | |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
296 | dia = HgDialog(self.tr('Delete all shelves'), self.vcs) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
297 | res = dia.startProcess(args, repodir) |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
298 | if res: |
7b7e8124fb51
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3292
diff
changeset
|
299 | dia.exec_() |