Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 561:cdddf4652aec
Fix dodiff/changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix dodiff/changes
dodiff was failing to pass both nodes to changes
changes was comparing things backwards, resulting in added/deleted confusion
in dodiff
changes was deleting things from cached manifests, use copy()
changes now sorts output lists
manifest hash: 6ad972b0895b9d855e246efef49c2ebd943946b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxZhZywK+sNU5EO8RApZWAJ9mYv1zc7IjXPIMwbVsfroQs8jfBACgn7R7
rTqLTTyIkM1OpL/ebnMtCOY=
=VcIr
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 01 Jul 2005 11:24:09 -0800 |
parents | bf9d55ed67f6 |
children | be6233a2bfdd |
comparison
equal
deleted
inserted
replaced
560:f9ad1a2c72eb | 561:cdddf4652aec |
---|---|
35 | 35 |
36 def dodiff(ui, repo, files = None, node1 = None, node2 = None): | 36 def dodiff(ui, repo, files = None, node1 = None, node2 = None): |
37 def date(c): | 37 def date(c): |
38 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | 38 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
39 | 39 |
40 (c, a, d, u) = repo.changes(None, node1, files) | 40 (c, a, d, u) = repo.changes(node1, node2, files) |
41 if files: | 41 if files: |
42 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | 42 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) |
43 | 43 |
44 if not c and not a and not d: | 44 if not c and not a and not d: |
45 return | 45 return |