Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 514:874e577e332e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change unrelated repository error to a warning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change unrelated repository error to a warning manifest hash: 7c1481639c7e7ba91fd391a9fa6eb17e838f894e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZ+xywK+sNU5EO8RAnnjAJ494NZfAdMVP48VegHQ+WeZ05DPogCbBEWC d3N47FYG87x1CJOh9VzwVCQ= =lrGp -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 11:06:25 -0800
parents 9f67222186bd
children 03f27b1381f9
comparison
equal deleted inserted replaced
513:2ab152e45de4 514:874e577e332e
916 for f in fetch: 916 for f in fetch:
917 if f in m: 917 if f in m:
918 raise RepoError("already have changeset " + short(f[:4])) 918 raise RepoError("already have changeset " + short(f[:4]))
919 919
920 if fetch == [nullid]: 920 if fetch == [nullid]:
921 raise RepoError("unrelated repository") 921 self.ui.warn("warning: pulling from an unrelated repository!\n")
922 922
923 self.ui.note("adding new changesets starting at " + 923 self.ui.note("adding new changesets starting at " +
924 " ".join([short(f) for f in fetch]) + "\n") 924 " ".join([short(f) for f in fetch]) + "\n")
925 925
926 self.ui.debug("%d total queries\n" % reqcnt) 926 self.ui.debug("%d total queries\n" % reqcnt)