Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3242
- a7e006073658
- parent 3231
- a7c9914d1c41
- child 3256
- 1a43351889d5
equal
deleted
inserted
replaced
| 3238:fa28dab59a9e | 3242:a7e006073658 |
|---|---|
| 50 @param parent parent widget (QWidget) | 50 @param parent parent widget (QWidget) |
| 51 @param name name of this object (string) | 51 @param name name of this object (string) |
| 52 """ | 52 """ |
| 53 VersionControl.__init__(self, parent, name) | 53 VersionControl.__init__(self, parent, name) |
| 54 self.defaultOptions = { | 54 self.defaultOptions = { |
| 55 'global': [''], | 55 'global': [''], |
| 56 'commit': [''], | 56 'commit': [''], |
| 57 'checkout': [''], | 57 'checkout': [''], |
| 58 'update': [''], | 58 'update': [''], |
| 59 'add': [''], | 59 'add': [''], |
| 60 'remove': [''], | 60 'remove': [''], |
| 61 'diff': [''], | 61 'diff': [''], |
| 62 'log': [''], | 62 'log': [''], |
| 63 'history': [''], | 63 'history': [''], |
| 64 'status': [''], | 64 'status': [''], |
| 65 'tag': [''], | 65 'tag': [''], |
| 66 'export': [''] | 66 'export': [''] |
| 67 } | 67 } |
| 68 | 68 |
| 69 self.__plugin = plugin | 69 self.__plugin = plugin |
| 70 self.__ui = parent | 70 self.__ui = parent |
| 71 | 71 |
| 1938 dia = HgDialog(title, self) | 1938 dia = HgDialog(title, self) |
| 1939 res = dia.startProcess(args, repodir) | 1939 res = dia.startProcess(args, repodir) |
| 1940 if res: | 1940 if res: |
| 1941 dia.exec_() | 1941 dia.exec_() |
| 1942 res = dia.hasAddOrDelete() | 1942 res = dia.hasAddOrDelete() |
| 1943 if command == "unbundle": | 1943 if self.bundleFile and \ |
| 1944 os.path.exists(self.bundleFile): | |
| 1944 os.remove(self.bundleFile) | 1945 os.remove(self.bundleFile) |
| 1945 self.bundleFile = None | 1946 self.bundleFile = None |
| 1946 self.checkVCSStatus() | 1947 self.checkVCSStatus() |
| 1947 return res | 1948 return res |
| 1948 | 1949 |
