[darcs-users] [patch118] Resolve issue1712: darcs over-reports number of patches to pull [status=amend-requested]
volothamp at gmail.com
Mon Dec 14 22:56:51 UTC 2009
Don't worry, I was just joking. :D
I probably need sleep...
2009/12/14 Eric Kow <kowey at darcs.net>:
> On Mon, Dec 14, 2009 at 22:29:43 +0000, Luca Molteni wrote:
>> Mon Dec 14 23:04:59 CET 2009 Luca Molteni <volothamp at gmail.com>
>> * [issue1712] darcs over-reports number of patches to pull
> The patch looks good to me : rather than reporting the total number of
> patches retrieved from the remote repository (perhaps since the last
> shared inventory?), we report the number of patches they have that we
> Small request, Luca: please
> 1. darcs amend --edit the patch and change the title to
> 'Resolve issue1712: darcs over-reports number of patches to pull'
> 2. darcs send --subject '[patch118]'
> I know the patch tracker has been a real pain for you. Sorry for that!
> We're aiming for a tracker that works without patch submitters having to
> think about what they're doing. Mostly, we've got what we want; it's
> just that you managed to hit another corner case with your patch name
> I'm pretty sure that it's just you being unlucky recently, first with
> the not-yet-refined tracker during the sprint and now with this patch
> subject that confused the tracker.
> I hope you'll stay on and keep sending patches to see what we mean.
> It's normally not so tricky!
> [issue1712] darcs over-reports number of patches to pull
>> Luca Molteni <volothamp at gmail.com>**20091214220459
>> Ignore-this: cc850a480e916e230d2873d927de1947
>> ] hunk ./src/Darcs/Commands/Push.lhs 126
>> in putInfo opts $ text $ pushing++" to "++formatPath repodir++"..."
>> us <- read_repo repository
>> case get_common_and_uncommon (us, them) of
>> - (common, us' :\/: _) -> do
>> - prePushChatter opts common us us' them
>> + (common, us' :\/: them') -> do
>> + prePushChatter opts common us us' them them'
>> with_selected_changes "push" opts Nothing (reverseRL us') $ bundlePatches opts common
>> prePushChatter :: forall p a C(x y z t) . (ShowPatch a) =>
>> hunk ./src/Darcs/Commands/Push.lhs 132
>> [DarcsFlag] -> [PatchInfo] -> PatchSet p C(x) ->
>> - RL a C(y z) -> PatchSet p C(t) -> IO ()
>> -prePushChatter opts common us us' them = do
>> + RL a C(y z) -> PatchSet p C(t) -> RL a C(x y) -> IO ()
>> +prePushChatter opts common us us' them them' = do
>> checkUnrelatedRepos opts common us them
>> hunk ./src/Darcs/Commands/Push.lhs 135
>> - let num_to_pull = lengthRL them
>> + let num_to_pull = lengthRL them'
>> let pull_reminder = if num_to_pull > 0
>> then text $ "The remote repository has " ++ show num_to_pull
>> ++ " " ++ englishNum num_to_pull (Noun "patch") " to pull."
> Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
> PGP Key ID: 08AC04F9
More information about the darcs-users