Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch docker Excluding Merge-Ins
This is equivalent to a diff from f215075a47 to 12c54ad313
2015-03-18
| ||
16:45 | Differentiate merge check-ins from regular, linear check-ins check-in: 9d39c6dca7 user: jmoger tags: differentiate-timeline | |
2015-03-17
| ||
21:10 | Adjust submenu input margins in the blitz skin. check-in: a7e1101d71 user: drh tags: trunk | |
21:03 | Fix for "fossil new --docker" and for [http://www.mail-archive.com/fossil-users%40lists.fossil-scm.org/msg17644.html|Chisallapp: I have two trunks ?], while still guaranteeing the rid=1 initial empty commit. Closed-Leaf check-in: 12c54ad313 user: jan.nijtmans tags: docker | |
20:54 | Adjust submenu input margins Closed-Leaf check-in: 10779515b9 user: jmoger tags: skin-blitz | |
17:10 | Improvements to the HTML generated for the /xfersetup page. check-in: f215075a47 user: drh tags: trunk | |
17:07 | Fix over-length source code lines in src/xfersetup.c Closed-Leaf check-in: ae09eed3aa user: drh tags: xfer-tweaks | |
14:44 | Add the "dotfiles" setting. check-in: e1e0ec574b user: drh tags: trunk | |
Changes to src/checkin.c.
︙ | |||
1834 1835 1836 1837 1838 1839 1840 | 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 | - | || db_exists("SELECT 1 FROM tagxref" " WHERE tagid=%d AND rid=%d AND tagtype>0" " AND value=%Q", TAG_BRANCH, vid, sCiInfo.zBranch)) ){ fossil_fatal("cannot commit against a closed leaf"); } |
︙ | |||
1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 | 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | } } }else{ db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); db_end_transaction(0); db_begin_transaction(); } /* Step 0: If the repository does not have any artifacts yet ** and a non-empty commit is being prepared, create an additional ** empty check-in for compatibility with fossil<1.28. This ** section can be removed when Fossil 1.27 is not used any more. */ if( !db_exists("SELECT 1 FROM blob") && db_exists("SELECT 1 FROM vfile")){ int rid; const char *zDate; Blob hash; blob_zero(&manifest); blob_appendf(&manifest, "C initial\\sempty\\scheck-in\n"); zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); blob_appendf(&manifest, "D %s\n", zDate); md5sum_init(); /* The R-card is necessary here because without it * fossil versions earlier than versions 1.27 would * interpret this artifact as a "control". */ blob_appendf(&manifest, "R %s\n", md5sum_finish(0)); blob_appendf(&manifest, "T *branch * %F\n", sCiInfo.zBranch); blob_appendf(&manifest, "T *sym-%F *\n", sCiInfo.zBranch); blob_appendf(&manifest, "U %F\n", g.zLogin); md5sum_blob(&manifest, &hash); blob_appendf(&manifest, "Z %b\n", &hash); blob_reset(&hash); vid = content_put(&manifest); manifest_crosslink(vid, &manifest, MC_NONE); } /* Step 1: Insert records for all modified files into the blob ** table. If there were arguments passed to this command, only ** the identified files are inserted (if they have been modified). */ if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1); db_prepare(&q, "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile " "WHERE chnged==1 AND NOT deleted AND is_selected(id)", g.zLocalRoot, glob_expr("pathname", db_get("crnl-glob","")), glob_expr("pathname", db_get("binary-glob","")), glob_expr("pathname", db_get("encoding-glob","")) |
︙ |
Changes to src/db.c.
︙ | |||
1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 | 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 | + - - + + - - + + + | ** See also: clone */ void create_repository_cmd(void){ char *zPassword; const char *zTemplate; /* Repository from which to copy settings */ const char *zDate; /* Date of the initial check-in */ const char *zDefaultUser; /* Optional name of the default user */ int makeServerCodes = find_option("docker", 0, 0)==0 zTemplate = find_option("template",0,1); zDate = find_option("date-override",0,1); zDefaultUser = find_option("admin-user","A",1); /* We should be done with options.. */ verify_all_options(); if( g.argc!=3 ){ usage("REPOSITORY-NAME"); } if( -1 != file_size(g.argv[2]) ){ fossil_fatal("file already exists: %s", g.argv[2]); } db_create_repository(g.argv[2]); db_open_repository(g.argv[2]); db_open_config(0); if( zTemplate ) db_attach(zTemplate, "settingSrc"); db_begin_transaction(); |
︙ |