Show More
@@ -7252,23 +7252,22 b' def summary(ui, repo, **opts):' | |||||
7252 | # XXX We should actually skip this if no default is specified, instead |
|
7252 | # XXX We should actually skip this if no default is specified, instead | |
7253 | # of passing "default" which will resolve as "./default/" if no default |
|
7253 | # of passing "default" which will resolve as "./default/" if no default | |
7254 | # path is defined. |
|
7254 | # path is defined. | |
7255 |
|
|
7255 | path = urlutil.get_unique_pull_path_obj(b'summary', ui, b'default') | |
7256 | b'summary', repo, ui, b'default' |
|
7256 | sbranch = path.branch | |
7257 | ) |
|
|||
7258 | sbranch = branches[0] |
|
|||
7259 | try: |
|
7257 | try: | |
7260 |
other = hg.peer(repo, {}, |
|
7258 | other = hg.peer(repo, {}, path) | |
7261 | except error.RepoError: |
|
7259 | except error.RepoError: | |
7262 | if opts.get(b'remote'): |
|
7260 | if opts.get(b'remote'): | |
7263 | raise |
|
7261 | raise | |
7264 |
return |
|
7262 | return path.loc, sbranch, None, None, None | |
|
7263 | branches = (path.branch, []) | |||
7265 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
7264 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
7266 | if revs: |
|
7265 | if revs: | |
7267 | revs = [other.lookup(rev) for rev in revs] |
|
7266 | revs = [other.lookup(rev) for rev in revs] | |
7268 |
ui.debug(b'comparing with %s\n' % urlutil.hidepassword( |
|
7267 | ui.debug(b'comparing with %s\n' % urlutil.hidepassword(path.loc)) | |
7269 | with repo.ui.silent(): |
|
7268 | with repo.ui.silent(): | |
7270 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
7269 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
7271 |
return |
|
7270 | return path.loc, sbranch, other, commoninc, commoninc[1] | |
7272 |
|
7271 | |||
7273 | if needsincoming: |
|
7272 | if needsincoming: | |
7274 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
7273 | source, sbranch, sother, commoninc, incoming = getincoming() |
General Comments 0
You need to be logged in to leave comments.
Login now