| hg-reviewers |
This makes the direction much clearer, IMO.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bookmarks.py (2 lines) | |||
| M | mercurial/context.py (4 lines) | |||
| M | mercurial/copies.py (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| elif not old: | elif not old: | ||||
| # old is nullrev, anything is valid. | # old is nullrev, anything is valid. | ||||
| # (new != nullrev has been excluded by the previous check) | # (new != nullrev has been excluded by the previous check) | ||||
| return True | return True | ||||
| elif repo.obsstore: | elif repo.obsstore: | ||||
| return new.node() in obsutil.foreground(repo, [old.node()]) | return new.node() in obsutil.foreground(repo, [old.node()]) | ||||
| else: | else: | ||||
| # still an independent clause as it is lazier (and therefore faster) | # still an independent clause as it is lazier (and therefore faster) | ||||
| return old.descendant(new) | return old.isancestorof(new) | ||||
| def checkformat(repo, mark): | def checkformat(repo, mark): | ||||
| """return a valid version of a potential bookmark name | """return a valid version of a potential bookmark name | ||||
| Raises an abort error if the bookmark name is not valid. | Raises an abort error if the bookmark name is not valid. | ||||
| """ | """ | ||||
| mark = mark.strip() | mark = mark.strip() | ||||
| if not mark: | if not mark: | ||||
| self._repo.ui.status( | self._repo.ui.status( | ||||
| (_("note: using %s as ancestor of %s and %s\n") % | (_("note: using %s as ancestor of %s and %s\n") % | ||||
| (short(anc), short(self._node), short(n2))) + | (short(anc), short(self._node), short(n2))) + | ||||
| ''.join(_(" alternatively, use --config " | ''.join(_(" alternatively, use --config " | ||||
| "merge.preferancestor=%s\n") % | "merge.preferancestor=%s\n") % | ||||
| short(n) for n in sorted(cahs) if n != anc)) | short(n) for n in sorted(cahs) if n != anc)) | ||||
| return changectx(self._repo, anc) | return changectx(self._repo, anc) | ||||
| def descendant(self, other): | def isancestorof(self, other): | ||||
| """True if other is descendant of this changeset""" | """True if this changeset is an ancestor of other""" | ||||
| return self._repo.changelog.isancestorrev(self._rev, other._rev) | return self._repo.changelog.isancestorrev(self._rev, other._rev) | ||||
| def walk(self, match): | def walk(self, match): | ||||
| '''Generates matching file names.''' | '''Generates matching file names.''' | ||||
| # Wrap match.bad method to have message with nodeid | # Wrap match.bad method to have message with nodeid | ||||
| def bad(fn, msg): | def bad(fn, msg): | ||||
| # The manifest doesn't know about subrepos, so don't complain about | # The manifest doesn't know about subrepos, so don't complain about | ||||
| # In certain scenarios (e.g. graft, update or rebase), base can be | # In certain scenarios (e.g. graft, update or rebase), base can be | ||||
| # overridden We still need to know a real common ancestor in this case We | # overridden We still need to know a real common ancestor in this case We | ||||
| # can't just compute _c1.ancestor(_c2) and compare it to ca, because there | # can't just compute _c1.ancestor(_c2) and compare it to ca, because there | ||||
| # can be multiple common ancestors, e.g. in case of bidmerge. Because our | # can be multiple common ancestors, e.g. in case of bidmerge. Because our | ||||
| # caller may not know if the revision passed in lieu of the CA is a genuine | # caller may not know if the revision passed in lieu of the CA is a genuine | ||||
| # common ancestor or not without explicitly checking it, it's better to | # common ancestor or not without explicitly checking it, it's better to | ||||
| # determine that here. | # determine that here. | ||||
| # | # | ||||
| # base.descendant(wc) is False, work around that | # base.isancestorof(wc) is False, work around that | ||||
| _c1 = c1.p1() if c1.rev() is None else c1 | _c1 = c1.p1() if c1.rev() is None else c1 | ||||
| _c2 = c2.p1() if c2.rev() is None else c2 | _c2 = c2.p1() if c2.rev() is None else c2 | ||||
| # an endpoint is "dirty" if it isn't a descendant of the merge base | # an endpoint is "dirty" if it isn't a descendant of the merge base | ||||
| # if we have a dirty endpoint, we need to trigger graft logic, and also | # if we have a dirty endpoint, we need to trigger graft logic, and also | ||||
| # keep track of which endpoint is dirty | # keep track of which endpoint is dirty | ||||
| dirtyc1 = not base.descendant(_c1) | dirtyc1 = not base.isancestorof(_c1) | ||||
| dirtyc2 = not base.descendant(_c2) | dirtyc2 = not base.isancestorof(_c2) | ||||
| graft = dirtyc1 or dirtyc2 | graft = dirtyc1 or dirtyc2 | ||||
| tca = base | tca = base | ||||
| if graft: | if graft: | ||||
| tca = _c1.ancestor(_c2) | tca = _c1.ancestor(_c2) | ||||
| limit = _findlimit(repo, c1.rev(), c2.rev()) | limit = _findlimit(repo, c1.rev(), c2.rev()) | ||||
| if limit is None: | if limit is None: | ||||
| # no common ancestor, no copies | # no common ancestor, no copies | ||||