| pulkit |
| hg-reviewers |
Summary can perform some incoming/outgoing queries (that should be common to the
other command with the same needs, but that is another story).
We now use the new APIs to do so. The current code behavior is a bit fishy,
relying to the fact "default" will be picked as the destination in last resort.
I did not altered that, but left various comment to highlight the issue.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (28 lines) |
| if i: | if i: | ||||
| needsincoming = True | needsincoming = True | ||||
| if o: | if o: | ||||
| needsoutgoing = True | needsoutgoing = True | ||||
| if not needsincoming and not needsoutgoing: | if not needsincoming and not needsoutgoing: | ||||
| return | return | ||||
| def getincoming(): | def getincoming(): | ||||
| source, branches = urlutil.parseurl(ui.expandpath(b'default')) | # XXX We should actually skip this if no default is specified, instead | ||||
| # of passing "default" which will resolve as "./default/" if no default | |||||
| # path is defined. | |||||
| source, branches = urlutil.get_unique_pull_path( | |||||
| b'summary', repo, ui, b'default' | |||||
| ) | |||||
| sbranch = branches[0] | sbranch = branches[0] | ||||
| try: | try: | ||||
| other = hg.peer(repo, {}, source) | other = hg.peer(repo, {}, source) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| if opts.get(b'remote'): | if opts.get(b'remote'): | ||||
| raise | raise | ||||
| return source, sbranch, None, None, None | return source, sbranch, None, None, None | ||||
| revs, checkout = hg.addbranchrevs(repo, other, branches, None) | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | ||||
| if revs: | if revs: | ||||
| revs = [other.lookup(rev) for rev in revs] | revs = [other.lookup(rev) for rev in revs] | ||||
| ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source)) | ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source)) | ||||
| repo.ui.pushbuffer() | repo.ui.pushbuffer() | ||||
| commoninc = discovery.findcommonincoming(repo, other, heads=revs) | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | ||||
| repo.ui.popbuffer() | repo.ui.popbuffer() | ||||
| return source, sbranch, other, commoninc, commoninc[1] | return source, sbranch, other, commoninc, commoninc[1] | ||||
| if needsincoming: | if needsincoming: | ||||
| source, sbranch, sother, commoninc, incoming = getincoming() | source, sbranch, sother, commoninc, incoming = getincoming() | ||||
| else: | else: | ||||
| source = sbranch = sother = commoninc = incoming = None | source = sbranch = sother = commoninc = incoming = None | ||||
| def getoutgoing(): | def getoutgoing(): | ||||
| dest, branches = urlutil.parseurl( | # XXX We should actually skip this if no default is specified, instead | ||||
| ui.expandpath(b'default-push', b'default') | # of passing "default" which will resolve as "./default/" if no default | ||||
| ) | # path is defined. | ||||
| dbranch = branches[0] | d = None | ||||
| revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | if b'default-push' in ui.paths: | ||||
| d = b'default-push' | |||||
| elif b'default' in ui.paths: | |||||
| d = b'default' | |||||
| if d is not None: | |||||
| path = urlutil.get_unique_push_path(b'summary', repo, ui, d) | |||||
| dest = path.pushloc or path.loc | |||||
| dbranch = path.branch | |||||
| else: | |||||
| dest = b'default' | |||||
| dbranch = None | |||||
| revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None) | |||||
| if source != dest: | if source != dest: | ||||
| try: | try: | ||||
| dother = hg.peer(repo, {}, dest) | dother = hg.peer(repo, {}, dest) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| if opts.get(b'remote'): | if opts.get(b'remote'): | ||||
| raise | raise | ||||
| return dest, dbranch, None, None | return dest, dbranch, None, None | ||||
| ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest)) | ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest)) | ||||