builtins.fetchgit: Support importing a working tree
For example, you can write src = fetchgit ./.; and if ./. refers to an unclean working tree, that tree will be copied to the Nix store. This removes the need for "cleanSource".
This commit is contained in:
		
							parent
							
								
									197922ea4e
								
							
						
					
					
						commit
						72cd52c3cd
					
				
					 7 changed files with 54 additions and 17 deletions
				
			
		|  | @ -29,7 +29,7 @@ const std::string narVersionMagic1 = "nix-archive-1"; | |||
| 
 | ||||
| static string caseHackSuffix = "~nix~case~hack~"; | ||||
| 
 | ||||
| PathFilter defaultPathFilter; | ||||
| PathFilter defaultPathFilter = [](const Path &) { return true; }; | ||||
| 
 | ||||
| 
 | ||||
| static void dumpContents(const Path & path, size_t size, | ||||
|  |  | |||
|  | @ -44,13 +44,6 @@ namespace nix { | |||
| 
 | ||||
|      `+' denotes string concatenation. */ | ||||
| 
 | ||||
| struct PathFilter | ||||
| { | ||||
|     virtual ~PathFilter() { } | ||||
|     virtual bool operator () (const Path & path) { return true; } | ||||
| }; | ||||
| 
 | ||||
| extern PathFilter defaultPathFilter; | ||||
| 
 | ||||
| void dumpPath(const Path & path, Sink & sink, | ||||
|     PathFilter & filter = defaultPathFilter); | ||||
|  |  | |||
|  | @ -93,8 +93,6 @@ Hash hashFile(HashType ht, const Path & path); | |||
| 
 | ||||
| /* Compute the hash of the given path.  The hash is defined as
 | ||||
|    (essentially) hashString(ht, dumpPath(path)). */ | ||||
| struct PathFilter; | ||||
| extern PathFilter defaultPathFilter; | ||||
| typedef std::pair<Hash, unsigned long long> HashResult; | ||||
| HashResult hashPath(HashType ht, const Path & path, | ||||
|     PathFilter & filter = defaultPathFilter); | ||||
|  |  | |||
|  | @ -481,4 +481,10 @@ struct MaintainCount | |||
| std::pair<unsigned short, unsigned short> getWindowSize(); | ||||
| 
 | ||||
| 
 | ||||
| /* Used in various places. */ | ||||
| typedef std::function<bool(const Path & path)> PathFilter; | ||||
| 
 | ||||
| extern PathFilter defaultPathFilter; | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue