Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- changeset 3036
- 30c81c9e88b8
- parent 3034
- 7ce719013078
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3035:36e9f388958b | 3036:30c81c9e88b8 |
|---|---|
| 118 self.__hasAddOrDelete = False | 118 self.__hasAddOrDelete = False |
| 119 if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", | 119 if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", |
| 120 "transplant", "update", "import", "revert", | 120 "transplant", "update", "import", "revert", |
| 121 "graft"] or \ | 121 "graft"] or \ |
| 122 (args[0] in ["pull", "unbundle"] and | 122 (args[0] in ["pull", "unbundle"] and |
| 123 ("--update" in args[1:] or "--rebase" in args[1:])): | 123 ("--update" in args[1:] or "--rebase" in args[1:])): |
| 124 self.__updateCommand = True | 124 self.__updateCommand = True |
| 125 else: | 125 else: |
| 126 self.__updateCommand = False | 126 self.__updateCommand = False |
| 127 | 127 |
| 128 if showArgs: | 128 if showArgs: |
