Show More
@@ -1180,11 +1180,20 b' def walkchangerevs(repo, match, opts, pr' | |||||
1180 |
|
1180 | |||
1181 | # iterate from latest to oldest revision |
|
1181 | # iterate from latest to oldest revision | |
1182 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): |
|
1182 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): | |
1183 | if rev > maxrev or rev not in ancestors: |
|
1183 | if not follow: | |
1184 |
|
|
1184 | if rev > maxrev: | |
1185 | # XXX insert 1327 fix here |
|
1185 | continue | |
1186 |
|
|
1186 | else: | |
1187 | ancestors.update(flparentlinkrevs) |
|
1187 | # Note that last might not be the first interesting | |
|
1188 | # rev to us: | |||
|
1189 | # if the file has been changed after maxrev, we'll | |||
|
1190 | # have linkrev(last) > maxrev, and we still need | |||
|
1191 | # to explore the file graph | |||
|
1192 | if rev not in ancestors: | |||
|
1193 | continue | |||
|
1194 | # XXX insert 1327 fix here | |||
|
1195 | if flparentlinkrevs: | |||
|
1196 | ancestors.update(flparentlinkrevs) | |||
1188 |
|
1197 | |||
1189 | fncache.setdefault(rev, []).append(file_) |
|
1198 | fncache.setdefault(rev, []).append(file_) | |
1190 | wanted.add(rev) |
|
1199 | wanted.add(rev) |
@@ -1020,6 +1020,15 b' log -p -R repo' | |||||
1020 | summary: add foo, related |
|
1020 | summary: add foo, related | |
1021 |
|
1021 | |||
1022 |
|
1022 | |||
|
1023 | Also check when maxrev < lastrevfilelog | |||
|
1024 | ||||
|
1025 | $ hg --traceback log -f -r4 foo | |||
|
1026 | changeset: 4:88176d361b69 | |||
|
1027 | user: test | |||
|
1028 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1029 | summary: add foo, related | |||
|
1030 | ||||
|
1031 | ||||
1023 | Issue2383: hg log showing _less_ differences than hg diff |
|
1032 | Issue2383: hg log showing _less_ differences than hg diff | |
1024 |
|
1033 | |||
1025 | $ hg init issue2383 |
|
1034 | $ hg init issue2383 | |
@@ -1092,3 +1101,19 b' Diff here should be the same:' | |||||
1092 | +b |
|
1101 | +b | |
1093 |
|
1102 | |||
1094 | $ cd .. |
|
1103 | $ cd .. | |
|
1104 | ||||
|
1105 | 'hg log -r rev fn' when last(filelog(fn)) != rev | |||
|
1106 | ||||
|
1107 | $ hg init simplelog; cd simplelog | |||
|
1108 | $ echo f > a | |||
|
1109 | $ hg ci -Am'a' -d '0 0' | |||
|
1110 | adding a | |||
|
1111 | $ echo f >> a | |||
|
1112 | $ hg ci -Am'a bis' -d '1 0' | |||
|
1113 | ||||
|
1114 | $ hg log -r0 a | |||
|
1115 | changeset: 0:9f758d63dcde | |||
|
1116 | user: test | |||
|
1117 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1118 | summary: a | |||
|
1119 |
General Comments 0
You need to be logged in to leave comments.
Login now