Show More
@@ -1468,6 +1468,9 b' def parents(repo, subset, x):' | |||||
1468 | ps = set() |
|
1468 | ps = set() | |
1469 | cl = repo.changelog |
|
1469 | cl = repo.changelog | |
1470 | for r in getset(repo, fullreposet(repo), x): |
|
1470 | for r in getset(repo, fullreposet(repo), x): | |
|
1471 | if r is None: | |||
|
1472 | ps.update(p.rev() for p in repo[r].parents()) | |||
|
1473 | else: | |||
1471 | ps.update(cl.parentrevs(r)) |
|
1474 | ps.update(cl.parentrevs(r)) | |
1472 | ps -= set([node.nullrev]) |
|
1475 | ps -= set([node.nullrev]) | |
1473 | return subset & ps |
|
1476 | return subset & ps |
@@ -75,6 +75,13 b' should fail' | |||||
75 |
|
75 | |||
76 | $ hg ci -m 0 --traceback |
|
76 | $ hg ci -m 0 --traceback | |
77 |
|
77 | |||
|
78 | $ hg log -r "heads(. or wdir() & file('**'))" | |||
|
79 | changeset: 0:* (glob) | |||
|
80 | tag: tip | |||
|
81 | user: test | |||
|
82 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
83 | summary: 0 | |||
|
84 | ||||
78 | should fail |
|
85 | should fail | |
79 |
|
86 | |||
80 | $ hg add a |
|
87 | $ hg add a | |
@@ -99,6 +106,15 b' should fail' | |||||
99 | M a |
|
106 | M a | |
100 | ? a.orig |
|
107 | ? a.orig | |
101 |
|
108 | |||
|
109 | wdir doesn't cause a crash, and can be dynamically selected if dirty | |||
|
110 | ||||
|
111 | $ hg log -r "heads(. or wdir() & file('**'))" | |||
|
112 | changeset: 2:*+ (glob) | |||
|
113 | parent: 2:* (glob) | |||
|
114 | parent: 1:* (glob) | |||
|
115 | user: test | |||
|
116 | date: * (glob) | |||
|
117 | ||||
102 | should fail |
|
118 | should fail | |
103 |
|
119 | |||
104 | $ hg add a |
|
120 | $ hg add a |
General Comments 0
You need to be logged in to leave comments.
Login now