New integration branch

[Joey Hess]

Adam Spiers wrote:
> OK, as discussed, here's a new 'for-joey' branch based off
> current upstream master:
> 
>   https://github.com/aspiers/kitenet-mr/commits/for-joey
> 
> All commits are self-contained, and hopefully non-contentious.  They
> are mostly minor bugfixes, but there are a few enhancements too - most
> notably lib/stow and lib/download.

37617a63ec993b128f77a945a2020ec894c58eb1
	loadconfig already uses %loaded to avoid reloading the same
	config twice, so this extra check is not necessary, I think.

a61c1450ff4b108af26e899a89a1d8ff49cab86c
	I picked the bugfix part.

	The warning message on missing chain files exposes an unclear
	thing in mr; it will try to chain to directories even when their
	repository has skip = true, which causes the warning to show
	up unexpectedly (ie, here). I think it needs to be changed to
	honor skip = true even if chain = true.

3d6acc19e4d029657f72bbf7200a48b5438a643a
	cherry-picked

2e350ca416572a37df3393d50c91a02b44d9137b
	cherry-picked

b3b68137988e61be1a0f7d90caf05eabf7850f44
	I developed a different fix this morning that shows correct
	line numbers for both the mrconfig and the position in the
	include, it's in my tree.

57386ef4bb07ebe1ea56c73c0fee86a51f417cda
	cherry-picked

135e0076c9a93cd0556b9b25ff355ad25546a78c
	This makes "mr fetch" do a git fetch, but nothing for
	the over DVCSes which can also do things like fetch, and
	no documentation of it

9c87f2352214175de307efedb8fd93889a26afbc
	Can you give an example of when this is needed?

417617be05404662caf3ea893bca61674eb5dbe1
	Already fixed in my tree.

d8d055572ca98ec92427265106ebf240990fa217
	cherry-picked

602f26714254f3c65389b7665d15d1d5d0e227a9
	mr is quite typically (I know, not by you) run
	inside the repository. Which would leave the user
	in an apparently empty directory after mr update if
	an mr update deleted and remade the whole repository.
	
	I don't like that; I don't think things in mr should be
	deleting repositories in general; mr doesn't even delete
	a repo that has deleted = true, it only warns the user about it.

650620d7b6661f9cc59b4adfb6a7d945240fe5c7
f16e51cea8595afc92f3ab9230e3c5a44baed904
	I've held off on these plugins since I think they
	depend on 602f26714254f3c65389b7665d15d1d5d0e227a9

cf3388f443b9d7afe6dc7d8a2159b45fb01ab4e4
	This is a slow way to make machine-parsable info available -- 
	the similar mr list takes 8 seconds here, since it has to run
	169 shells. That's ok when you're just running mr, but I would
	not like to use a command that depended on that information.

	If a machine-parseable list of repositories is needed,
	I think it'd be better to have a perl function that emits
	it in one go.

	(Also, the patch references a MR_NAME that is not present in my
	mr tree.)

4cd2b59d0c66d71316dfc1d411a3e3da439643bc
	I'm not quite sure of the point of this refactoring,
	since the factored out download function has a lot
	of bootstrap-specific stuff in it?

a64e990a37ceb5ce2b200645ebc0aabe67d3626e
	cherry-picked

aa3caf53a9cb35ee3d0e4173ed44e964c6b8b5ab
	cherry-picked. Nice feature!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 828 bytes
Desc: Digital signature
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20111204/89d7f618/attachment.pgp>