Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- changeset 1093
- 47bc4ef30315
- parent 1078
- aeee8401e2ce
- child 1131
- 7781e396c903
equal
deleted
inserted
replaced
| 1092:1b149c2d9ae1 | 1093:47bc4ef30315 |
|---|---|
| 104 self.errorGroup.hide() | 104 self.errorGroup.hide() |
| 105 self.normal = False | 105 self.normal = False |
| 106 self.intercept = False | 106 self.intercept = False |
| 107 | 107 |
| 108 self.__hasAddOrDelete = False | 108 self.__hasAddOrDelete = False |
| 109 if args[0] in ["update", "fetch", "qpush", "qpop", "qgoto", "transplant"] or \ | 109 if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", |
| 110 (args[0] == "pull" and "--update" in args[1:]): | 110 "update"] or \ |
| 111 (args[0] == "pull" and \ | |
| 112 ("--update" in args[1:] or "--rebase" in args[1:])): | |
| 111 self.__updateCommand = True | 113 self.__updateCommand = True |
| 112 else: | 114 else: |
| 113 self.__updateCommand = False | 115 self.__updateCommand = False |
| 114 | 116 |
| 115 self.proc = QProcess() | 117 self.proc = QProcess() |
