GVFS serialize status updates#6
Conversation
Fix "git status --deserialize" to correctly report both pathnames
for renames. Add a test case to verify.
A change was made upstream that added an additional "rename_status"
field to the "struct wt_status_change_data" structure. It is used
during the various print routines to decide if 2 pathnames need to
be printed.
5134ccd
wt-status.c: rename rename-related fields in wt_status_change_data
The fix here is to add that field to the status cache data.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
The "ahead_behind_flags" field of "struct wt_status" does not need to be stored in the serialization cache file, since it is a display property. Update the code comments in both serialize and deserialize to reflect that. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
dscho
left a comment
There was a problem hiding this comment.
I'll leave it to you to decide whether a serialized v1 status without the renames settings could possibly cause problems or not, and would warrant an increase of the "v1" to "v2".
|
|
||
| trace_printf_key(&trace_serialize, | ||
| "change: %d %d %d %d %o %o %o %d %d %s %s '%s' '%s'", | ||
| "change: %d %d %d %d %d %o %o %o %d %d %s %s '%s' '%s'", |
There was a problem hiding this comment.
Do we have to increase v1 to v2 so that existing serialized statuses will be ignored?
There was a problem hiding this comment.
i guess we should. maybe. technically, the v1 code has been in gvfs/master for months, but i don't think it has been used by anybody yet, because we're still waiting on gvfs server support, so i don't think it would hurt to leave it at v1 (this time).
Opinions??
There was a problem hiding this comment.
TODO Note to self. Verify if the design doc needs updating.
There was a problem hiding this comment.
technically, yes. However, It has not been advertised, and none of our features are using this, so my opinion is to not bump the version number (and treat this feature as something we have not released yet).
There was a problem hiding this comment.
i'm going to keep the version number at 1 and go ahead and merge this.
…us-rename GVFS serialize status updates
GVFS serialize status updates
GVFS serialize status updates
GVFS serialize status updates
GVFS serialize status updates
GVFS serialize status updates
GVFS serialize status updates
Update the status serialization cache to contain the new rename_status field.
This allows "git status --deserialize" to correctly report renames.
Also include minor commit to update comments around the ahead_behind_flags
in the status cache header record.