26
lf;
27
commit_msg ::= data;
28
29
- file_change ::= file_clr | file_del | file_obm | file_inm;
29
+ file_change ::= file_clr | file_del | file_rnm | file_obm | file_inm;
30
file_clr ::= 'deleteall' lf;
31
file_del ::= 'D' sp path_str lf;
32
+ file_rnm ::= 'R' sp path_str sp path_str lf;
33
file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
34
file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
35
data;
1155
struct tree_entry *root,
1156
const char *p,
1157
const unsigned char *sha1,
1157
- const uint16_t mode)
1158
+ const uint16_t mode,
1159
+ struct tree_content *subtree)
1160
{
1161
struct tree_content *t = root->tree;
1162
const char *slash1;
1170
n = strlen(p);
1171
if (!n)
1172
die("Empty path component found in input");
1173
+ if (!slash1 && !S_ISDIR(mode) && subtree)
1174
+ die("Non-directories cannot have subtrees");
1175
1176
for (i = 0; i < t->entry_count; i++) {
1177
e = t->entries[i];
1178
if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1179
if (!slash1) {
1176
- if (e->versions[1].mode == mode
1180
+ if (!S_ISDIR(mode)
1181
+ && e->versions[1].mode == mode
1182
&& !hashcmp(e->versions[1].sha1, sha1))
1183
return 0;
1184
e->versions[1].mode = mode;
1185
hashcpy(e->versions[1].sha1, sha1);
1181
- if (e->tree) {
1186
+ if (e->tree)
1187
release_tree_content_recursive(e->tree);
1183
- e->tree = NULL;
1184
- }
1188
+ e->tree = subtree;
1189
hashclr(root->versions[1].sha1);
1190
return 1;
1191
}
1195
}
1196
if (!e->tree)
1197
load_tree(e);
1194
- if (tree_content_set(e, slash1 + 1, sha1, mode)) {
1198
+ if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1199
hashclr(root->versions[1].sha1);
1200
return 1;
1201
}
1213
if (slash1) {
1214
e->tree = new_tree_content(8);
1215
e->versions[1].mode = S_IFDIR;
1212
- tree_content_set(e, slash1 + 1, sha1, mode);
1216
+ tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1217
} else {
1214
- e->tree = NULL;
1218
+ e->tree = subtree;
1219
e->versions[1].mode = mode;
1220
hashcpy(e->versions[1].sha1, sha1);
1221
}
1223
return 1;
1224
}
1225
1222
-static int tree_content_remove(struct tree_entry *root, const char *p)
1226
+static int tree_content_remove(
1227
+ struct tree_entry *root,
1228
+ const char *p,
1229
+ struct tree_entry *backup_leaf)
1230
{
1231
struct tree_content *t = root->tree;
1232
const char *slash1;
1246
goto del_entry;
1247
if (!e->tree)
1248
load_tree(e);
1242
- if (tree_content_remove(e, slash1 + 1)) {
1249
+ if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1250
for (n = 0; n < e->tree->entry_count; n++) {
1251
if (e->tree->entries[n]->versions[1].mode) {
1252
hashclr(root->versions[1].sha1);
1253
return 1;
1254
}
1255
}
1256
+ backup_leaf = NULL;
1257
goto del_entry;
1258
}
1259
return 0;
1262
return 0;
1263
1264
del_entry:
1257
- if (e->tree) {
1265
+ if (backup_leaf)
1266
+ memcpy(backup_leaf, e, sizeof(*backup_leaf));
1267
+ else if (e->tree)
1268
release_tree_content_recursive(e->tree);
1259
- e->tree = NULL;
1260
- }
1269
+ e->tree = NULL;
1270
e->versions[1].mode = 0;
1271
hashclr(e->versions[1].sha1);
1272
hashclr(root->versions[1].sha1);
1638
typename(type), command_buf.buf);
1639
}
1640
1632
- tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);
1641
+ tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1642
free(p_uq);
1643
}
1644
1654
die("Garbage after path in: %s", command_buf.buf);
1655
p = p_uq;
1656
}
1648
- tree_content_remove(&b->branch_tree, p);
1657
+ tree_content_remove(&b->branch_tree, p, NULL);
1658
free(p_uq);
1659
}
1660
1661
+static void file_change_r(struct branch *b)
1662
+{
1663
+ const char *s, *d;
1664
+ char *s_uq, *d_uq;
1665
+ const char *endp;
1666
+ struct tree_entry leaf;
1667
+
1668
+ s = command_buf.buf + 2;
1669
+ s_uq = unquote_c_style(s, &endp);
1670
+ if (s_uq) {
1671
+ if (*endp != ' ')
1672
+ die("Missing space after source: %s", command_buf.buf);
1673
+ }
1674
+ else {
1675
+ endp = strchr(s, ' ');
1676
+ if (!endp)
1677
+ die("Missing space after source: %s", command_buf.buf);
1678
+ s_uq = xmalloc(endp - s + 1);
1679
+ memcpy(s_uq, s, endp - s);
1680
+ s_uq[endp - s] = 0;
1681
+ }
1682
+ s = s_uq;
1683
+
1684
+ endp++;
1685
+ if (!*endp)
1686
+ die("Missing dest: %s", command_buf.buf);
1687
+
1688
+ d = endp;
1689
+ d_uq = unquote_c_style(d, &endp);
1690
+ if (d_uq) {
1691
+ if (*endp)
1692
+ die("Garbage after dest in: %s", command_buf.buf);
1693
+ d = d_uq;
1694
+ }
1695
+
1696
+ memset(&leaf, 0, sizeof(leaf));
1697
+ tree_content_remove(&b->branch_tree, s, &leaf);
1698
+ if (!leaf.versions[1].mode)
1699
+ die("Path %s not in branch", s);
1700
+ tree_content_set(&b->branch_tree, d,
1701
+ leaf.versions[1].sha1,
1702
+ leaf.versions[1].mode,
1703
+ leaf.tree);
1704
+
1705
+ free(s_uq);
1706
+ free(d_uq);
1707
+}
1708
+
1709
static void file_change_deleteall(struct branch *b)
1710
{
1711
release_tree_content_recursive(b->branch_tree.tree);
1873
file_change_m(b);
1874
else if (!prefixcmp(command_buf.buf, "D "))
1875
file_change_d(b);
1876
+ else if (!prefixcmp(command_buf.buf, "R "))
1877
+ file_change_r(b);
1878
else if (!strcmp("deleteall", command_buf.buf))
1879
file_change_deleteall(b);
1880
else