Show More
@@ -7115,7 +7115,6 b' def summary(ui, repo, **opts):' | |||||
7115 | Returns 0 on success. |
|
7115 | Returns 0 on success. | |
7116 | """ |
|
7116 | """ | |
7117 |
|
7117 | |||
7118 | opts = pycompat.byteskwargs(opts) |
|
|||
7119 | ui.pager(b'summary') |
|
7118 | ui.pager(b'summary') | |
7120 | ctx = repo[None] |
|
7119 | ctx = repo[None] | |
7121 | parents = ctx.parents() |
|
7120 | parents = ctx.parents() | |
@@ -7304,11 +7303,13 b' def summary(ui, repo, **opts):' | |||||
7304 |
|
7303 | |||
7305 | cmdutil.summaryhooks(ui, repo) |
|
7304 | cmdutil.summaryhooks(ui, repo) | |
7306 |
|
7305 | |||
7307 |
if opts.get( |
|
7306 | if opts.get('remote'): | |
7308 | needsincoming, needsoutgoing = True, True |
|
7307 | needsincoming, needsoutgoing = True, True | |
7309 | else: |
|
7308 | else: | |
7310 | needsincoming, needsoutgoing = False, False |
|
7309 | needsincoming, needsoutgoing = False, False | |
7311 |
for i, o in cmdutil.summaryremotehooks( |
|
7310 | for i, o in cmdutil.summaryremotehooks( | |
|
7311 | ui, repo, pycompat.byteskwargs(opts), None | |||
|
7312 | ): | |||
7312 | if i: |
|
7313 | if i: | |
7313 | needsincoming = True |
|
7314 | needsincoming = True | |
7314 | if o: |
|
7315 | if o: | |
@@ -7325,7 +7326,7 b' def summary(ui, repo, **opts):' | |||||
7325 | try: |
|
7326 | try: | |
7326 | other = hg.peer(repo, {}, path) |
|
7327 | other = hg.peer(repo, {}, path) | |
7327 | except error.RepoError: |
|
7328 | except error.RepoError: | |
7328 |
if opts.get( |
|
7329 | if opts.get('remote'): | |
7329 | raise |
|
7330 | raise | |
7330 | return path.loc, sbranch, None, None, None |
|
7331 | return path.loc, sbranch, None, None, None | |
7331 | branches = (path.branch, []) |
|
7332 | branches = (path.branch, []) | |
@@ -7364,7 +7365,7 b' def summary(ui, repo, **opts):' | |||||
7364 | try: |
|
7365 | try: | |
7365 | dother = hg.peer(repo, {}, path if path is not None else dest) |
|
7366 | dother = hg.peer(repo, {}, path if path is not None else dest) | |
7366 | except error.RepoError: |
|
7367 | except error.RepoError: | |
7367 |
if opts.get( |
|
7368 | if opts.get('remote'): | |
7368 | raise |
|
7369 | raise | |
7369 | return dest, dbranch, None, None |
|
7370 | return dest, dbranch, None, None | |
7370 | ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest)) |
|
7371 | ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest)) | |
@@ -7390,7 +7391,7 b' def summary(ui, repo, **opts):' | |||||
7390 | else: |
|
7391 | else: | |
7391 | dest = dbranch = dother = outgoing = None |
|
7392 | dest = dbranch = dother = outgoing = None | |
7392 |
|
7393 | |||
7393 |
if opts.get( |
|
7394 | if opts.get('remote'): | |
7394 | # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`. |
|
7395 | # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`. | |
7395 | # The former always sets `sother` (or raises an exception if it can't); |
|
7396 | # The former always sets `sother` (or raises an exception if it can't); | |
7396 | # the latter always sets `outgoing`. |
|
7397 | # the latter always sets `outgoing`. | |
@@ -7421,7 +7422,7 b' def summary(ui, repo, **opts):' | |||||
7421 | cmdutil.summaryremotehooks( |
|
7422 | cmdutil.summaryremotehooks( | |
7422 | ui, |
|
7423 | ui, | |
7423 | repo, |
|
7424 | repo, | |
7424 | opts, |
|
7425 | pycompat.byteskwargs(opts), | |
7425 | ( |
|
7426 | ( | |
7426 | (source, sbranch, sother, commoninc), |
|
7427 | (source, sbranch, sother, commoninc), | |
7427 | (dest, dbranch, dother, outgoing), |
|
7428 | (dest, dbranch, dother, outgoing), |
General Comments 0
You need to be logged in to leave comments.
Login now