Fri, 21 Feb 2014 19:01:23 +0100
Made the last change a bit more robust.
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 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> |
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 | |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
10 | import os |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
11 | |
3292
2feabde31912
Made the last change a bit more robust.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3291
diff
changeset
|
12 | ##from PyQt4.QtCore import QDateTime |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
13 | from PyQt4.QtGui import QDialog |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
14 | |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | 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
|
16 | from ..HgDialog import HgDialog |
3290
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | class Shelve(HgExtension): |
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 | Class implementing the shelve extension interface. |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | def __init__(self, vcs): |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | Constructor |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | @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
|
28 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | super().__init__(vcs) |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | def shutdown(self): |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
dbb53746813f
Continued implementing support for the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | 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
|
34 | """ |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
35 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
36 | def hgShelve(self, name): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
37 | """ |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
38 | 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
|
39 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
40 | @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
|
41 | 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
|
42 | @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
|
43 | """ |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
44 | if isinstance(name, list): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
45 | 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
|
46 | else: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
47 | 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
|
48 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
49 | # 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
|
50 | repodir = dname |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
51 | 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
|
52 | 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
|
53 | 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
|
54 | return False |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
55 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
56 | res = False |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
57 | from .HgShelveDataDialog import HgShelveDataDialog |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
58 | dlg = HgShelveDataDialog() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
59 | if dlg.exec_() == QDialog.Accepted: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
60 | shelveName, dateTime, message, addRemove = dlg.getData() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
61 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
62 | args = [] |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
63 | args.append("shelve") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
64 | if shelveName: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
65 | args.append("--name") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
66 | args.append(shelveName) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
67 | if message: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
68 | args.append("--message") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
69 | args.append(message) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
70 | if addRemove: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
71 | args.append("--addRemove") |
3292
2feabde31912
Made the last change a bit more robust.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3291
diff
changeset
|
72 | if dateTime.isValid(): |
3291
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
73 | args.append("--date") |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
74 | args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
75 | args.append("-v") |
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 | if isinstance(name, list): |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
78 | 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
|
79 | else: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
80 | args.append(name) |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
81 | |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
82 | 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
|
83 | 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
|
84 | if res: |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
85 | dia.exec_() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
86 | res = dia.hasAddOrDelete() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
87 | self.vcs.checkVCSStatus() |
58e95eea9b6d
Added the shelve function to the Mercurial Shelve extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3290
diff
changeset
|
88 | return res |