Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 230:00ea3613f82c
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 |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jun 03 12:54:54 2005 -0800 +++ b/mercurial/commands.py Fri Jun 03 12:55:56 2005 -0800 @@ -70,7 +70,7 @@ def checkout(ui, repo, changeset=None): '''checkout a given changeset or the current tip''' - (c, a, d, u) = repo.diffdir(repo.root, repo.current) + (c, a, d, u) = repo.diffdir(repo.root) if c or a or d: ui.warn("aborting (outstanding changes in working directory)\n") sys.exit(1) @@ -160,7 +160,7 @@ A = added R = removed ? = not tracked''' - (c, a, d, u) = repo.diffdir(repo.root, repo.current) + (c, a, d, u) = repo.diffdir(repo.root) (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) for f in c: print "C", f