Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py
- branch
- eric7
- changeset 11082
- 58838580274e
- parent 11080
- 92cd5f094e7a
- child 11085
- fd00ad18a98d
equal
deleted
inserted
replaced
| 11081:7391035e7bc9 | 11082:58838580274e |
|---|---|
| 116 "shelve", | 116 "shelve", |
| 117 "unshelve", | 117 "unshelve", |
| 118 "strip", | 118 "strip", |
| 119 "histedit", | 119 "histedit", |
| 120 "uncommit", | 120 "uncommit", |
| 121 "unamend", | |
| 121 ] or ( | 122 ] or ( |
| 122 args[0] in ["pull", "unbundle"] | 123 args[0] in ["pull", "unbundle"] |
| 123 and ("--update" in args[1:] or "--rebase" in args[1:]) | 124 and ("--update" in args[1:] or "--rebase" in args[1:]) |
| 124 ): | 125 ): |
| 125 self.__updateCommand = True | 126 self.__updateCommand = True |
