On Sun, Feb 08, 2009 at 11:31:43AM +0100, Jonas Fonseca wrote:
> On Sat, Feb 7, 2009 at 08:10, Jeff King <peff@xxxxxxxx> wrote:
> > It would require a "reload and jump to this arbitrary line" function,
> > which I remember being problematic when I did my original patch a long
> > time ago. But I haven't looked at the new code to see if it is easier
> > now (it looks like you have been doing quite a bit of refactoring in
> > that area lately).
>
> Yes, support for restoring/jumping to an arbitrary line is possible by
> setting the view lineno and then call open_view with the OPEN_REFRESH
> flag.
I just tried out the version you pushed today (which has both the
cleaner version of my patch and the guesstimation patch). It behaves
exactly as I would expect. Thanks so much for looking into this.
I do have one more complaint, though. :)
If you parent-blame far enough, you will reach a point before the file
existed at all, in which case blame_read_file will die() with an error.
It would be nice to print an error and stay on the same screen. Below is
a patch which implements (I think) reasonably elegant solution.
-- >8 --
handle blaming beyond the creation of file more gracefully
Currently when you ask to re-blame from the parent of a
commit that created the file, blame_read_file will complain
that it cannot get the file contents ("No blame exist").
At the time we try to read the file, it is too late to abort
the operation, as we have already changed to the new blame
view. However, we can detect this situation early by
limiting the selection of the parent revision to the
particular path of interest: if it returns a parent even
with path-limiting, then we know the path exists; if not,
then we know it doesn't.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
tig.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tig.c b/tig.c
index 04a44db..28fae2c 100644
--- a/tig.c
+++ b/tig.c
@@ -3384,11 +3384,11 @@ select_commit_parent_handler(void *data, char *buf, int c)
}
static bool
-select_commit_parent(const char *id, char rev[SIZEOF_REV])
+select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path)
{
char buf[SIZEOF_STR * 4];
const char *revlist_argv[] = {
- "git", "rev-list", "-1", "--parents", id, NULL
+ "git", "rev-list", "-1", "--parents", id, "--", path, NULL
};
int parents;
@@ -3399,7 +3399,10 @@ select_commit_parent(const char *id, char rev[SIZEOF_REV])
return FALSE;
} else if (parents == 0) {
- report("The selected commit has no parents");
+ if (path)
+ report("path '%s' does not exist in the parent", path);
+ else
+ report("The selected commit has no parents");
return FALSE;
}
@@ -4468,7 +4471,8 @@ blame_request(struct view *view, enum request request, struct line *line)
case REQ_PARENT:
if (check_blame_commit(blame) &&
- select_commit_parent(blame->commit->id, opt_ref)) {
+ select_commit_parent(blame->commit->id, opt_ref,
+ blame->commit->filename)) {
string_copy(opt_file, blame->commit->filename);
setup_blame_parent_line(view, blame);
open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH);
--
1.6.1.2.553.gdd056.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
