Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 230:00ea3613f82c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make diffdir default to dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make diffdir default to dirstate.parents() update various diffdir users to use default manifest hash: aeca2b9da1aca278dd5e3f27cc2906667803577d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMPcywK+sNU5EO8RAkY8AJ90UHQXnJnkG9PJKG7IsgPeOZ2WZACgiarS HhS2zX3TRM9WdZHo5nLvZGw= =7YyP -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:55:56 -0800
parents f57519cddd3d
children fc4a6e5b5812
comparison
equal deleted inserted replaced
229:1b11da6ee69e 230:00ea3613f82c
68 # this should eventually support remote repos 68 # this should eventually support remote repos
69 os.system("cp -al %s/.hg .hg" % path) 69 os.system("cp -al %s/.hg .hg" % path)
70 70
71 def checkout(ui, repo, changeset=None): 71 def checkout(ui, repo, changeset=None):
72 '''checkout a given changeset or the current tip''' 72 '''checkout a given changeset or the current tip'''
73 (c, a, d, u) = repo.diffdir(repo.root, repo.current) 73 (c, a, d, u) = repo.diffdir(repo.root)
74 if c or a or d: 74 if c or a or d:
75 ui.warn("aborting (outstanding changes in working directory)\n") 75 ui.warn("aborting (outstanding changes in working directory)\n")
76 sys.exit(1) 76 sys.exit(1)
77 77
78 node = repo.changelog.tip() 78 node = repo.changelog.tip()
158 158
159 C = changed 159 C = changed
160 A = added 160 A = added
161 R = removed 161 R = removed
162 ? = not tracked''' 162 ? = not tracked'''
163 (c, a, d, u) = repo.diffdir(repo.root, repo.current) 163 (c, a, d, u) = repo.diffdir(repo.root)
164 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) 164 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
165 165
166 for f in c: print "C", f 166 for f in c: print "C", f
167 for f in a: print "A", f 167 for f in a: print "A", f
168 for f in d: print "R", f 168 for f in d: print "R", f