equal
deleted
inserted
replaced
2131 b'please commit or shelve your changes first' |
2131 b'please commit or shelve your changes first' |
2132 ), |
2132 ), |
2133 ) |
2133 ) |
2134 |
2134 |
2135 revsprepull = len(repo) |
2135 revsprepull = len(repo) |
2136 origpostincoming = commands.postincoming |
2136 origpostincoming = cmdutil.postincoming |
2137 |
2137 |
2138 def _dummy(*args, **kwargs): |
2138 def _dummy(*args, **kwargs): |
2139 pass |
2139 pass |
2140 |
2140 |
2141 commands.postincoming = _dummy |
2141 cmdutil.postincoming = _dummy |
2142 try: |
2142 try: |
2143 ret = orig(ui, repo, *args, **opts) |
2143 ret = orig(ui, repo, *args, **opts) |
2144 finally: |
2144 finally: |
2145 commands.postincoming = origpostincoming |
2145 cmdutil.postincoming = origpostincoming |
2146 revspostpull = len(repo) |
2146 revspostpull = len(repo) |
2147 if revspostpull > revsprepull: |
2147 if revspostpull > revsprepull: |
2148 # --rev option from pull conflict with rebase own --rev |
2148 # --rev option from pull conflict with rebase own --rev |
2149 # dropping it |
2149 # dropping it |
2150 if 'rev' in opts: |
2150 if 'rev' in opts: |