Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- changeset 1283
- 5766284d4393
- parent 1260
- 9488a3aceb0e
- child 1311
- 95685f9ad9f8
equal
deleted
inserted
replaced
| 1282:c5b7b444942d | 1283:5766284d4393 |
|---|---|
| 114 self.intercept = False | 114 self.intercept = False |
| 115 | 115 |
| 116 self.__hasAddOrDelete = False | 116 self.__hasAddOrDelete = False |
| 117 if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", | 117 if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", |
| 118 "update"] or \ | 118 "update"] or \ |
| 119 (args[0] == "pull" and \ | 119 (args[0] in ["pull", "unbundle"] and \ |
| 120 ("--update" in args[1:] or "--rebase" in args[1:])): | 120 ("--update" in args[1:] or "--rebase" in args[1:])): |
| 121 self.__updateCommand = True | 121 self.__updateCommand = True |
| 122 else: | 122 else: |
| 123 self.__updateCommand = False | 123 self.__updateCommand = False |
| 124 | 124 |
