Mercurial > hg > gitserve
diff mercurial/localrepo.py @ 1959:d53a18f592be
add -f/--force to pull, incoming, outgoing, to work on unrelated repo.
before this, push would not push from e.g. "hg" repo to "kernel" repo
but other commands worked. this was bad idea, could merge unrelated
projects by accident. i did this tonight.
now, all commands still work with unrelated repo but need
--force/-f. abort is default. this is safer.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 14 Mar 2006 22:58:14 -0800 |
| parents | 65aff2ed61ae |
| children | 72f7a335b955 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Mar 14 22:02:41 2006 -0800 +++ b/mercurial/localrepo.py Tue Mar 14 22:58:14 2006 -0800 @@ -785,7 +785,7 @@ return r - def findincoming(self, remote, base=None, heads=None): + def findincoming(self, remote, base=None, heads=None, force=False): m = self.changelog.nodemap search = [] fetch = {} @@ -898,7 +898,10 @@ raise repo.RepoError(_("already have changeset ") + short(f[:4])) if base.keys() == [nullid]: - self.ui.warn(_("warning: pulling from an unrelated repository!\n")) + if force: + self.ui.warn(_("warning: repository is unrelated\n")) + else: + raise util.Abort(_("repository is unrelated")) self.ui.note(_("found new changesets starting at ") + " ".join([short(f) for f in fetch]) + "\n") @@ -907,10 +910,10 @@ return fetch.keys() - def findoutgoing(self, remote, base=None, heads=None): + def findoutgoing(self, remote, base=None, heads=None, force=False): if base == None: base = {} - self.findincoming(remote, base, heads) + self.findincoming(remote, base, heads, force=force) self.ui.debug(_("common changesets up to ") + " ".join(map(short, base.keys())) + "\n") @@ -937,7 +940,7 @@ # this is the set of all roots we have to push return subset - def pull(self, remote, heads=None): + def pull(self, remote, heads=None, force=False): l = self.lock() # if we have an empty repo, fetch everything @@ -945,7 +948,7 @@ self.ui.status(_("requesting all changes\n")) fetch = [nullid] else: - fetch = self.findincoming(remote) + fetch = self.findincoming(remote, force=force) if not fetch: self.ui.status(_("no changes found\n")) @@ -962,7 +965,7 @@ base = {} heads = remote.heads() - inc = self.findincoming(remote, base, heads) + inc = self.findincoming(remote, base, heads, force=force) if not force and inc: self.ui.warn(_("abort: unsynced remote changes!\n")) self.ui.status(_("(did you forget to sync? use push -f to force)\n"))