Mercurial > hg > gitweb
diff hg @ 227:f57519cddd3d
move repo.current to dirstate.parents()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
move repo.current to dirstate.parents()
dirstate now tracks the parents for the working dir
add a parents command to show them
manifest hash: cd69237838c3f69f7937723c4a6803d47cb27cfa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMGuywK+sNU5EO8RAg5UAKCVLUrsJtkoIOTM+e0BLqEVN3Ni3gCeNDyy
ZF8jD728cl9K7S4sIN4gX4Y=
=P4bu
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:46:38 -0800 |
parents | 1536ccac47e9 |
children | 00ea3613f82c |
line wrap: on
line diff
--- a/hg Fri Jun 03 12:45:04 2005 -0800 +++ b/hg Fri Jun 03 12:46:38 2005 -0800 @@ -66,9 +66,8 @@ else: date2 = time.asctime() if not node1: - node1 = repo.current + node1 = repo.dirstate.parents()[0] (c, a, d, u) = repo.diffdir(repo.root, node1) - a = [] # ignore unknown files in repo, by popular request def read(f): return file(os.path.join(repo.root, f)).read() change = repo.changelog.read(node1) @@ -139,9 +138,9 @@ elif cmd == "commit" or cmd == "checkin" or cmd == "ci": if 1: if len(args) > 0: - repo.commit(repo.current, args) + repo.commit(args) else: - repo.commit(repo.current) + repo.commit() elif cmd == "rawcommit": "raw commit interface" rc = {} @@ -204,7 +203,7 @@ if files: if os.system("patch -p%d < %s %s" % (strip, pf, quiet)): raise "patch failed!" - repo.commit(repo.current, files, text) + repo.commit(files, text) elif cmd == "diff": revs = []