Sat, 28 May 2011 11:20:25 +0200
Added support for the Mercurial fetch extension.
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the bookmarks extension interface. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import os |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
12 | from PyQt4.QtCore import QObject, QProcess |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | from PyQt4.QtGui import QDialog, QInputDialog |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | from ..HgDialog import HgDialog |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | from .HgBookmarksListDialog import HgBookmarksListDialog |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | from .HgBookmarkDialog import HgBookmarkDialog |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | from .HgBookmarkRenameDialog import HgBookmarkRenameDialog |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
20 | from .HgBookmarksInOutDialog import HgBookmarksInOutDialog |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
22 | import Preferences |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
23 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | class Bookmarks(QObject): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | Class implementing the bookmarks extension interface. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | def __init__(self, vcs): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | Constructor |
1066
a3dd41fd9ea8
Added support for the Mercurial fetch extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
32 | |
a3dd41fd9ea8
Added support for the Mercurial fetch extension.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1061
diff
changeset
|
33 | @param vcs reference to the Mercurial vcs object |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | QObject.__init__(self, vcs) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | self.vcs = vcs |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | self.bookmarksListDlg = None |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
40 | self.bookmarksInOutDlg = None |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | self.bookmarksList = [] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | def shutdown(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | Public method used to shutdown the bookmarks interface. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | if self.bookmarksListDlg is not None: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | self.bookmarksListDlg.close() |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
49 | if self.bookmarksInOutDlg is not None: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
50 | self.bookmarksInOutDlg.close() |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | def hgListBookmarks(self, path): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | Public method used to list the available bookmarks. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | @param path directory name of the project (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | self.bookmarksList = [] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | self.bookmarksListDlg = HgBookmarksListDialog(self.vcs) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | self.bookmarksListDlg.show() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | self.bookmarksListDlg.start(path, self.bookmarksList) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
64 | def hgGetBookmarksList(self, repodir): |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
65 | """ |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
66 | Public method to get the list of bookmarks. |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
67 | |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
68 | @param repodir directory name of the repository (string) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
69 | @return list of bookmarks (list of string) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | """ |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
71 | ioEncoding = Preferences.getSystem("IOEncoding") |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
72 | process = QProcess() |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
73 | args = [] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
74 | args.append('bookmarks') |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
75 | process.setWorkingDirectory(repodir) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
76 | process.start('hg', args) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
77 | procStarted = process.waitForStarted() |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
78 | if procStarted: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
79 | finished = process.waitForFinished(30000) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
80 | if finished and process.exitCode() == 0: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
81 | output = \ |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
82 | str(process.readAllStandardOutput(), ioEncoding, 'replace') |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
83 | self.bookmarksList = [] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
84 | for line in output.splitlines(): |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
85 | l = line.strip().split() |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
86 | if l[-1][0] in "1234567890": |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
87 | # last element is a rev:changeset |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
88 | del l[-1] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
89 | if l[0] == "*": |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
90 | del l[0] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
91 | name = " ".join(l) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
92 | self.bookmarksList.append(name) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | return self.bookmarksList[:] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | def hgBookmarkDefine(self, name): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | Public method to define a bookmark. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | @param name file/directory name (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | # find the root of the repo |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
103 | repodir = self.vcs.splitPath(name)[0] |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | repodir = os.path.dirname(repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | if repodir == os.sep: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | return |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1018
diff
changeset
|
109 | dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
110 | self.vcs.hgGetTagsList(repodir), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
111 | self.vcs.hgGetBranchesList(repodir), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
112 | self.hgGetBookmarksList(repodir)) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | if dlg.exec_() == QDialog.Accepted: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | rev, bookmark = dlg.getData() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | args = [] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | args.append("bookmarks") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | if rev: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | args.append("--rev") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | args.append(rev) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | args.append(bookmark) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | dia = HgDialog(self.trUtf8('Mercurial Bookmark')) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | res = dia.startProcess(args, repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | if res: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | dia.exec_() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | def hgBookmarkDelete(self, name): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | Public method to delete a bookmark. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | @param name file/directory name (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
134 | # find the root of the repo |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
135 | repodir = self.vcs.splitPath(name)[0] |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | repodir = os.path.dirname(repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | if repodir == os.sep: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | return |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | bookmark, ok = QInputDialog.getItem( |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | None, |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | self.trUtf8("Delete Bookmark"), |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | self.trUtf8("Select the bookmark to be deleted:"), |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
145 | [""] + sorted(self.hgGetBookmarksList(repodir)), |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | 0, True) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | if ok and bookmark: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | args = [] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
149 | args.append("bookmarks") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | args.append("--delete") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | args.append(bookmark) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
152 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
153 | dia = HgDialog(self.trUtf8('Delete Mercurial Bookmark')) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | res = dia.startProcess(args, repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | if res: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | dia.exec_() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | def hgBookmarkRename(self, name): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | Public method to rename a bookmark. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | @param name file/directory name (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | # find the root of the repo |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
165 | repodir = self.vcs.splitPath(name)[0] |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | repodir = os.path.dirname(repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | if repodir == os.sep: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | return |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
171 | dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir)) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | if dlg.exec_() == QDialog.Accepted: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | newName, oldName = dlg.getData() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | args = [] |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | args.append("bookmarks") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | args.append("--rename") |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | args.append(oldName) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | args.append(newName) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
181 | dia = HgDialog(self.trUtf8('Rename Mercurial Bookmark')) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | res = dia.startProcess(args, repodir) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | if res: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | dia.exec_() |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
185 | |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
186 | def hgBookmarkMove(self, name): |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
187 | """ |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
188 | Public method to move a bookmark. |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
189 | |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
190 | @param name file/directory name (string) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
191 | """ |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
192 | # find the root of the repo |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
193 | repodir = self.vcs.splitPath(name)[0] |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
194 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
195 | repodir = os.path.dirname(repodir) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
196 | if repodir == os.sep: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
197 | return |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
198 | |
1061
3e21869872e3
Fixed PEP-8 related issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1018
diff
changeset
|
199 | dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, |
1017
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
200 | self.vcs.hgGetTagsList(repodir), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
201 | self.vcs.hgGetBranchesList(repodir), |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
202 | self.hgGetBookmarksList(repodir)) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
203 | if dlg.exec_() == QDialog.Accepted: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
204 | rev, bookmark = dlg.getData() |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
205 | |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
206 | args = [] |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
207 | args.append("bookmarks") |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
208 | args.append("--force") |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
209 | if rev: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
210 | args.append("--rev") |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
211 | args.append(rev) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
212 | args.append(bookmark) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
213 | |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
214 | dia = HgDialog(self.trUtf8('Move Mercurial Bookmark')) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
215 | res = dia.startProcess(args, repodir) |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
216 | if res: |
919147f2b518
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1011
diff
changeset
|
217 | dia.exec_() |
1018
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
218 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
219 | def hgBookmarkIncoming(self, name): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
220 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
221 | Public method to show a list of incoming bookmarks. |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
222 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
223 | @param name file/directory name (string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
224 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
225 | self.bookmarksInOutDlg = HgBookmarksInOutDialog( |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
226 | self.vcs, HgBookmarksInOutDialog.INCOMING) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
227 | self.bookmarksInOutDlg.show() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
228 | self.bookmarksInOutDlg.start(name) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
229 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
230 | def hgBookmarkOutgoing(self, name): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
231 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
232 | Public method to show a list of outgoing bookmarks. |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
233 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
234 | @param name file/directory name (string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
235 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
236 | self.bookmarksInOutDlg = HgBookmarksInOutDialog( |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
237 | self.vcs, HgBookmarksInOutDialog.OUTGOING) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
238 | self.bookmarksInOutDlg.show() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
239 | self.bookmarksInOutDlg.start(name) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
240 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
241 | def __getInOutBookmarks(self, repodir, incoming): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
242 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
243 | Public method to get the list of incoming or outgoing bookmarks. |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
244 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
245 | @param repodir directory name of the repository (string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
246 | @param incoming flag indicating to get incoming bookmarks (boolean) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
247 | @return list of bookmarks (list of string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
248 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
249 | bookmarksList = [] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
250 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
251 | ioEncoding = Preferences.getSystem("IOEncoding") |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
252 | process = QProcess() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
253 | args = [] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
254 | if incoming: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
255 | args.append('incoming') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
256 | else: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
257 | args.append('outgoing') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
258 | args.append('--bookmarks') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
259 | process.setWorkingDirectory(repodir) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
260 | process.start('hg', args) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
261 | procStarted = process.waitForStarted() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
262 | if procStarted: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
263 | finished = process.waitForFinished(30000) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
264 | if finished and process.exitCode() == 0: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
265 | output = \ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
266 | str(process.readAllStandardOutput(), ioEncoding, 'replace') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
267 | for line in output.splitlines(): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
268 | if line.startswith(" "): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
269 | l = line.strip().split() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
270 | del l[-1] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
271 | name = " ".join(l) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
272 | bookmarksList.append(name) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
273 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
274 | return bookmarksList |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
275 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
276 | def hgBookmarkPull(self, name): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
277 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
278 | Public method to pull a bookmark from a remote repository. |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
279 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
280 | @param name file/directory name (string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
281 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
282 | # find the root of the repo |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
283 | repodir = self.vcs.splitPath(name)[0] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
284 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
285 | repodir = os.path.dirname(repodir) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
286 | if repodir == os.sep: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
287 | return |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
288 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
289 | bookmarks = self.__getInOutBookmarks(repodir, True) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
290 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
291 | bookmark, ok = QInputDialog.getItem( |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
292 | None, |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
293 | self.trUtf8("Pull Bookmark"), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
294 | self.trUtf8("Select the bookmark to be pulled:"), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
295 | [""] + sorted(bookmarks), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
296 | 0, True) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
297 | if ok and bookmark: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
298 | args = [] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
299 | args.append('pull') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
300 | args.append('--bookmark') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
301 | args.append(bookmark) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
302 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
303 | dia = HgDialog(self.trUtf8('Pulling bookmark from a remote Mercurial repository')) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
304 | res = dia.startProcess(args, repodir) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
305 | if res: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
306 | dia.exec_() |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
307 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
308 | def hgBookmarkPush(self, name): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
309 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
310 | Public method to push a bookmark to a remote repository. |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
311 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
312 | @param name file/directory name (string) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
313 | """ |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
314 | # find the root of the repo |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
315 | repodir = self.vcs.splitPath(name)[0] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
316 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
317 | repodir = os.path.dirname(repodir) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
318 | if repodir == os.sep: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
319 | return |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
320 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
321 | bookmarks = self.__getInOutBookmarks(repodir, False) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
322 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
323 | bookmark, ok = QInputDialog.getItem( |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
324 | None, |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
325 | self.trUtf8("Push Bookmark"), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
326 | self.trUtf8("Select the bookmark to be push:"), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
327 | [""] + sorted(bookmarks), |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
328 | 0, True) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
329 | if ok and bookmark: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
330 | args = [] |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
331 | args.append('push') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
332 | args.append('--bookmark') |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
333 | args.append(bookmark) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
334 | |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
335 | dia = HgDialog(self.trUtf8('Pushing bookmark to a remote Mercurial repository')) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
336 | res = dia.startProcess(args, repodir) |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
337 | if res: |
949812411ab8
Continued with Mercurial bookmark support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1017
diff
changeset
|
338 | dia.exec_() |