Skip to content

Commit bc7cfd6

Browse files
committed
remove filtering of changesets when finding original name of renamed file in given revision
workaround for #970
1 parent d305482 commit bc7cfd6

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/org/opensolaris/opengrok/history/MercurialRepository.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,15 @@ private String findOriginalName(String fullpath, String full_rev_to_find)
286286
argv.add(ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK));
287287
argv.add("log");
288288
argv.add("-f");
289-
argv.add("-r");
290-
argv.add("reverse(" + rev_to_find + ":)");
289+
/*
290+
* hg log -f -r behavior has changed since Mercurial 3.4 so filtering
291+
* the changesets of a file no longer works with -f.
292+
* This is tracked by https://bz.mercurial-scm.org/show_bug.cgi?id=4959
293+
* Once this is fixed and Mercurial versions with the fix are prevalent,
294+
* we can revert to the old behavior.
295+
*/
296+
// argv.add("-r");
297+
// argv.add("reverse(" + rev_to_find + ":)");
291298
argv.add("--template");
292299
argv.add("{rev}:{file_copies}\\n");
293300
argv.add(fullpath);

0 commit comments

Comments
 (0)