Fossil

Check-in [ca574f81]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Given that both origname and newname are always provided when stashing a file, allow both a rename and an add by changing the PRIMARY KEY for stashfile. This does mean the schema for stashfile has changed and to take advantage it will be necessary to close and open the repository again (or update manually with SQL).
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stash-fixes
Files: files | file ages | folders
SHA1: ca574f818ac1efff9856acbb385c5c01c0d4cb19
User & Date: andybradford 2016-02-17 04:49:44
Context
2016-02-27
16:38
Bring in latest developments on trunk. check-in: eda22812 user: andybradford tags: stash-fixes
2016-02-17
04:49
Given that both origname and newname are always provided when stashing a file, allow both a rename and an add by changing the PRIMARY KEY for stashfile. This does mean the schema for stashfile has changed and to take advantage it will be necessary to close and open the repository again (or update manually with SQL). check-in: ca574f81 user: andybradford tags: stash-fixes
2016-02-13
06:57
Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7]. check-in: a9afb1f0 user: rberteig tags: stash-fixes
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
@   isAdded BOOLEAN,                   -- True if this is an added file
@   isRemoved BOOLEAN,                 -- True if this file is deleted
@   isExec BOOLEAN,                    -- True if file is executable
@   isLink BOOLEAN,                    -- True if file is a symlink
@   origname TEXT,                     -- Original filename
@   newname TEXT,                      -- New name for file at next check-in
@   delta BLOB,                        -- Delta from baseline. Content if rid=0
@   PRIMARY KEY(origname, stashid)
@ );
@ INSERT OR IGNORE INTO vvar(name, value) VALUES('stash-next', 1);
;

/*
** Add zFName to the stash given by stashid.  zFName might be the name of a
** file or a directory.  If a directory, add all changed files contained







|







37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
@   isAdded BOOLEAN,                   -- True if this is an added file
@   isRemoved BOOLEAN,                 -- True if this file is deleted
@   isExec BOOLEAN,                    -- True if file is executable
@   isLink BOOLEAN,                    -- True if file is a symlink
@   origname TEXT,                     -- Original filename
@   newname TEXT,                      -- New name for file at next check-in
@   delta BLOB,                        -- Delta from baseline. Content if rid=0
@   PRIMARY KEY(newname, stashid)
@ );
@ INSERT OR IGNORE INTO vvar(name, value) VALUES('stash-next', 1);
;

/*
** Add zFName to the stash given by stashid.  zFName might be the name of a
** file or a directory.  If a directory, add all changed files contained